feat(resource/node): impl update

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
       -
         name: Import GPG key
         id: import_gpg

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Set up Go
       uses: actions/[email protected]
       with:
-        go-version: '1.16'
+        go-version: '1.18'
       id: go
 
     - name: Check out code into the Go module directory

sspanel/resource_node.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/IndexDoge/terraform-provider-sspanel/sspanel/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -111,11 +112,16 @@ func resourceNode() *schema.Resource {
 	}
 }
 
-func resourceNodeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) (diags diag.Diagnostics) {
-	// use the meta value to retrieve your client from the provider configure method
+type createNodeResponse struct {
+	types.ApiResponse
+	NodeId int64 `json:"node_id"`
+}
+
+func generatePostNodeResourceData(d *schema.ResourceData) map[string]interface{} {
 	body := map[string]interface{}{
 		"name":                    d.Get("name"),
 		"server":                  d.Get("server"),
+		"node_ip":                 d.Get("node_ip"),
 		"mu_only":                 d.Get("mu_only"),
 		"rate":                    d.Get("rate"),
 		"info":                    d.Get("info"),
@@ -129,6 +135,13 @@ func resourceNodeCreate(ctx context.Context, d *schema.ResourceData, meta interf
 		"bandwidthlimit_resetday": d.Get("bandwidth_reset_day"),
 	}
 
+	return body
+}
+
+func resourceNodeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) (diags diag.Diagnostics) {
+	// use the meta value to retrieve your client from the provider configure method
+	body := generatePostNodeResourceData(d)
+
 	client := meta.(*apiClient)
 	res, err := client.http.R().
 		SetBody(body).
@@ -138,21 +151,21 @@ func resourceNodeCreate(ctx context.Context, d *schema.ResourceData, meta interf
 		return diag.FromErr(err)
 	}
 
-	responseJson := make(map[string]interface{}, 0)
+	responseJson := createNodeResponse{}
 
 	err = json.NewDecoder(strings.NewReader(res.String())).Decode(&responseJson)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if responseJson["ret"].(float64) != 1 {
-		return diag.Errorf("Create node failure: %s", responseJson["msg"].(string))
+	if responseJson.StatusCode != types.StatusOk {
+		return diag.Errorf("Create node failure: %s", responseJson.Msg)
 	}
 	tflog.Trace(ctx, "created a resource")
 
-	d.SetId(strconv.FormatInt(int64(responseJson["node_id"].(float64)), 10))
+	d.SetId(strconv.FormatInt(responseJson.NodeId, 10))
 
-	return
+	return resourceNodeRead(ctx, d, meta)
 }
 
 func resourceNodeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -166,31 +179,57 @@ func resourceNodeRead(ctx context.Context, d *schema.ResourceData, meta interfac
 		return diag.FromErr(err)
 	}
 
-	responseJson := make(map[string]interface{}, 0)
+	responseJson := types.ReadNodeInfoResponse{}
 
 	err = json.NewDecoder(strings.NewReader(res.String())).Decode(&responseJson)
 
-	if responseJson["ret"].(float64) != 1 {
-		return diag.Errorf("Read node info failure: %s", responseJson["msg"].(string))
+	if responseJson.StatusCode != types.StatusOk {
+		return diag.Errorf("Read node info failure: %s", responseJson.Msg)
 	}
 
-	node := responseJson["node"].(map[string]interface{})
+	node := responseJson.Node
 
 	// Set Node Id
-	d.SetId(strconv.FormatInt(int64(node["id"].(float64)), 10))
+	d.SetId(strconv.FormatInt(node.Id, 10))
+
+	d.Set("name", node.Name)
+	d.Set("server", node.Server)
+	d.Set("mu_only", node.MuType)
+	d.Set("rate", node.TrafficRate)
+	d.Set("info", node.Info)
+	d.Set("type", node.Type)
+	d.Set("speedlimit", node.SpeedLimit)
+	d.Set("sort", node.Sort)
+	d.Set("node_ip", node.IP)
+	d.Set("status", node.Status)
+	d.Set("class", node.Class)
+	d.Set("bandwidth_limit", node.BandwidthLimit)
+	d.Set("bandwidth_reset_day", node.BandwidthResetDay)
 
-	d.Set("server", node["server"])
-	d.Set("name", node["name"])
-	d.Set("status", node["status"])
-
 	return nil
 }
 
 func resourceNodeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	// use the meta value to retrieve your client from the provider configure method
 	// client := meta.(*apiClient)
+	body := generatePostNodeResourceData(d)
+	client := meta.(*apiClient)
+	res, err := client.http.R().
+		SetBody(body).
+		Put(fmt.Sprintf("node/%s", d.Id()))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	responseJson := types.ApiResponse{}
+
+	err = json.NewDecoder(strings.NewReader(res.String())).Decode(&responseJson)
+
+	if responseJson.StatusCode != types.StatusOk {
+		return diag.Errorf("Update node failure: %s", responseJson.Msg)
+	}
 
-	return diag.Errorf("not implemented")
+	return resourceNodeRead(ctx, d, meta)
 }
 
 func resourceNodeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -204,12 +243,12 @@ func resourceNodeDelete(ctx context.Context, d *schema.ResourceData, meta interf
 		return diag.FromErr(err)
 	}
 
-	responseJson := make(map[string]interface{}, 0)
+	responseJson := types.ApiResponse{}
 
 	err = json.NewDecoder(strings.NewReader(res.String())).Decode(&responseJson)
 
-	if responseJson["ret"].(float64) != 1 {
-		return diag.Errorf("Delete node failure: %s", responseJson["msg"].(string))
+	if responseJson.StatusCode != types.StatusOk {
+		return diag.Errorf("Delete node failure: %s", responseJson.Msg)
 	}
 
 	return nil

sspanel/resource_node_test.go

@@ -19,14 +19,29 @@ func TestAccResourceNode(t *testing.T) {
 						"sspanel_node.foo", "id", regexp.MustCompile("^[0-9]*")),
 				),
 			},
+			{
+				Config: testAccResourceNodeUpdateNodeIp,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("sspanel_node.foo", "node_ip", "1.1.1.1")),
+			},
 		},
 	})
 }
 
 const testAccResourceNode = `
 resource "sspanel_node" "foo" {
   name = "Test node"
-  server = "test.trojan.one;port=443"
+  server = "1.1.1.1.nip.io;port=443"
+  node_ip = "127.0.0.1"
+  sort = 14
+}
+`
+
+const testAccResourceNodeUpdateNodeIp = `
+resource "sspanel_node" "foo" {
+  name = "Test node"
+  server = "1.1.1.1.nip.io;port=443"
+  node_ip = "1.1.1.1"
   sort = 14
 }
 `

sspanel/types/node.go

@@ -0,0 +1,27 @@
+package types
+
+type NodeModal struct {
+	Id                int64   `json:"id"`
+	Name              string  `json:"name"`
+	Type              bool    `json:"type"`
+	Server            string  `json:"server"`
+	Info              string  `json:"info"`
+	Status            string  `json:"status"`
+	Sort              int     `json:"sort"`
+	TrafficRate       float64 `json:"traffic_rate"`
+	Class             int64   `json:"node_class"`
+	SpeedLimit        int64   `json:"node_speedlimit"`
+	Connector         int64   `json:"node_connector"`
+	Bandwidth         int64   `json:"node_bandwidth"`
+	BandwidthLimit    int64   `json:"node_bandwidth_limit"`
+	BandwidthResetDay int     `json:"bandwidthlimit_resetday"`
+	Heartbeat         int     `json:"node_heartbeat"`
+	IP                string  `json:"node_ip"`
+	Group             int64   `json:"node_group"`
+	MuType            int     `json:"mu_only"`
+	Online            int     `json:"online"`
+	GFWBlock          int     `json:"gfw_block"`
+
+	// String stored JSON
+	CustomConfig string `json:"custom_config"`
+}

sspanel/types/sspanel.go

@@ -0,0 +1,16 @@
+package types
+
+const (
+	StatusFailure int = 0
+	StatusOk          = 1
+)
+
+type ApiResponse struct {
+	StatusCode int    `json:"ret"`
+	Msg        string `json:"msg"`
+}
+
+type ReadNodeInfoResponse struct {
+	ApiResponse
+	Node NodeModal `json:"node"`
+}