阶段性提交

internal/web/actions/default/nodes/create.go

@@ -40,6 +40,9 @@ func (this *CreateAction) RunGet(params struct{}) {
 func (this *CreateAction) RunPost(params struct {
 	Name      string
 	ClusterId int64
+	GrantId   int64
+	SshHost   string
+	SshPort   int
 
 	Must *actions.Must
 }) {
@@ -52,12 +55,23 @@ func (this *CreateAction) RunPost(params struct {
 		this.Fail("请选择所在集群")
 	}
 
-	// TODO 检查SSH授权
+	// TODO 检查登录授权
+	loginInfo := &pb.NodeLogin{
+		Id:   0,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
+	}
 
 	// 保存
 	_, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
 		Name:      params.Name,
 		ClusterId: params.ClusterId,
+		Login:     loginInfo,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/nodes/delete.go

@@ -0,0 +1,22 @@
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	NodeId int64
+}) {
+	_, err := this.RPC().NodeRPC().DisableNode(this.AdminContext(), &pb.DisableNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/nodes/grants/createPopup.go

@@ -0,0 +1,74 @@
+package grants
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct{}) {
+	this.Data["methods"] = grantutils.AllGrantMethods()
+
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	Name        string
+	Method      string
+	Username    string
+	Password    string
+	PrivateKey  string
+	Description string
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入名称")
+
+	switch params.Method {
+	case "user":
+		if len(params.Username) == 0 {
+			this.FailField("username", "请输入SSH登录用户名")
+		}
+	case "privateKey":
+		if len(params.PrivateKey) == 0 {
+			this.FailField("privateKey", "请输入RSA私钥")
+		}
+	default:
+		this.Fail("请选择正确的认证方式")
+	}
+
+	createResp, err := this.RPC().NodeGrantRPC().CreateNodeGrant(this.AdminContext(), &pb.CreateNodeGrantRequest{
+		Name:        params.Name,
+		Method:      params.Method,
+		Username:    params.Username,
+		Password:    params.Password,
+		PrivateKey:  params.PrivateKey,
+		Description: params.Description,
+		NodeId:      0,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["grant"] = maps.Map{
+		"id":         createResp.GrantId,
+		"name":       params.Name,
+		"method":     params.Method,
+		"methodName": grantutils.FindGrantMethodName(params.Method),
+	}
+
+	this.Success()
+}

internal/web/actions/default/nodes/grants/selectPopup.go

@@ -0,0 +1,72 @@
+package grants
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *SelectPopupAction) RunGet(params struct{}) {
+	// 所有的认证
+	grantsResp, err := this.RPC().NodeGrantRPC().FindAllEnabledNodeGrants(this.AdminContext(), &pb.FindAllEnabledNodeGrantsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	grants := grantsResp.Grants
+	grantMaps := []maps.Map{}
+	for _, grant := range grants {
+		grantMaps = append(grantMaps, maps.Map{
+			"id":         grant.Id,
+			"name":       grant.Name,
+			"method":     grant.Method,
+			"methodName": grantutils.FindGrantMethodName(grant.Method),
+		})
+	}
+	this.Data["grants"] = grantMaps
+
+	this.Show()
+}
+
+func (this *SelectPopupAction) RunPost(params struct {
+	GrantId int64
+	Must    *actions.Must
+}) {
+	if params.GrantId <= 0 {
+		this.Data["grant"] = maps.Map{
+			"id":         params.GrantId,
+			"name":       "",
+			"method":     "",
+			"methodName": "",
+		}
+		this.Success()
+	}
+
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	grant := grantResp.Grant
+	if grant == nil {
+		this.Fail("找不到要使用的认证")
+	}
+	this.Data["grant"] = maps.Map{
+		"id":         grant.Id,
+		"name":       grant.Name,
+		"method":     grant.Method,
+		"methodName": grantutils.FindGrantMethodName(grant.Method),
+	}
+
+	this.Success()
+}

internal/web/actions/default/nodes/init.go

@@ -14,6 +14,9 @@ func init() {
 			Prefix("/nodes").
 			Get("", new(IndexAction)).
 			GetPost("/create", new(CreateAction)).
+			Post("/delete", new(DeleteAction)).
+			GetPost("/update", new(UpdateAction)).
+			Get("/node", new(NodeAction)).
 
 			// 授权管理
 			Get("/grants", new(grants.IndexAction)).
@@ -21,6 +24,8 @@ func init() {
 			GetPost("/grants/update", new(grants.UpdateAction)).
 			Post("/grants/delete", new(grants.DeleteAction)).
 			Get("/grants/grant", new(grants.GrantAction)).
+			GetPost("/grants/selectPopup", new(grants.SelectPopupAction)).
+			GetPost("/grants/createPopup", new(grants.CreatePopupAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/nodes/node.go

@@ -0,0 +1,89 @@
+package nodes
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodeAction) Init() {
+	this.Nav("", "node", "index")
+}
+
+func (this *NodeAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	var clusterMap maps.Map = nil
+	if node.Cluster != nil {
+		clusterMap = maps.Map{
+			"id":   node.Cluster.Id,
+			"name": node.Cluster.Name,
+		}
+	}
+
+	var loginMap maps.Map = nil
+	if node.Login != nil {
+		loginParams := maps.Map{}
+		if len(node.Login.Params) > 0 {
+			err = json.Unmarshal(node.Login.Params, &loginParams)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
+		grantMap := maps.Map{}
+		grantId := loginParams.GetInt64("grantId")
+		if grantId > 0 {
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if grantResp.Grant != nil {
+				grantMap = maps.Map{
+					"id":         grantResp.Grant.Id,
+					"name":       grantResp.Grant.Name,
+					"method":     grantResp.Grant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+				}
+			}
+		}
+
+		loginMap = maps.Map{
+			"id":     node.Login.Id,
+			"name":   node.Login.Name,
+			"type":   node.Login.Type,
+			"params": loginParams,
+			"grant":  grantMap,
+		}
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":      node.Id,
+		"name":    node.Name,
+		"cluster": clusterMap,
+		"login":   loginMap,
+	}
+
+	this.Show()
+}

internal/web/actions/default/nodes/update.go

@@ -0,0 +1,159 @@
+package nodes
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) Init() {
+	this.Nav("", "node", "index")
+}
+
+func (this *UpdateAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	var clusterMap maps.Map = nil
+	if node.Cluster != nil {
+		clusterMap = maps.Map{
+			"id":   node.Cluster.Id,
+			"name": node.Cluster.Name,
+		}
+	}
+
+	var loginMap maps.Map = nil
+	if node.Login != nil {
+		loginParams := maps.Map{}
+		if len(node.Login.Params) > 0 {
+			err = json.Unmarshal(node.Login.Params, &loginParams)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
+		grantMap := maps.Map{}
+		grantId := loginParams.GetInt64("grantId")
+		if grantId > 0 {
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if grantResp.Grant != nil {
+				grantMap = maps.Map{
+					"id":         grantResp.Grant.Id,
+					"name":       grantResp.Grant.Name,
+					"method":     grantResp.Grant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+				}
+			}
+		}
+
+		loginMap = maps.Map{
+			"id":     node.Login.Id,
+			"name":   node.Login.Name,
+			"type":   node.Login.Type,
+			"params": loginParams,
+			"grant":  grantMap,
+		}
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":      node.Id,
+		"name":    node.Name,
+		"cluster": clusterMap,
+		"login":   loginMap,
+	}
+
+	// 所有集群
+	resp, err := this.RPC().NodeClusterRPC().FindAllEnabledClusters(this.AdminContext(), &pb.FindAllEnabledNodeClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	clusterMaps := []maps.Map{}
+	for _, cluster := range resp.Clusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
+	this.Show()
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	LoginId   int64
+	NodeId    int64
+	Name      string
+	ClusterId int64
+	GrantId   int64
+	SshHost   string
+	SshPort   int
+
+	Must *actions.Must
+}) {
+	if params.NodeId <= 0 {
+		this.Fail("要操作的节点不存在")
+	}
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入节点名称")
+
+	// TODO 检查cluster
+	if params.ClusterId <= 0 {
+		this.Fail("请选择所在集群")
+	}
+
+	// TODO 检查登录授权
+	loginInfo := &pb.NodeLogin{
+		Id:   params.LoginId,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
+	}
+
+	// 保存
+	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
+		NodeId:    params.NodeId,
+		Name:      params.Name,
+		ClusterId: params.ClusterId,
+		Login:     loginInfo,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}