minor revise data structure

projecteru2 · Feb 3, 2023 · 816b66d · 816b66d
1 parent 87caf1c
commit 816b66d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/resource3/plugins/binary/types/node.go b/resource3/plugins/binary/types/node.go
@@ -41,7 +41,7 @@ type GetNodeResourceInfoRequest struct {
 
 // SetNodeResourceInfoRequest .
 type SetNodeResourceInfoRequest struct {
-	Nodename string                    `json:"node" mapstructure:"node"`
+	Nodename string                    `json:"nodename" mapstructure:"nodename"`
 	Capacity *plugintypes.NodeResource `json:"capacity" mapstructure:"capacity"`
 	Usage    *plugintypes.NodeResource `json:"usage" mapstructure:"usage"`
 }

diff --git a/types/resource.go b/types/resource.go
@@ -75,11 +75,11 @@ func (r RawParams) Bool(key string) bool {
 
 // RawParams .
 func (r RawParams) RawParams(key string) *RawParams {
-	n := &RawParams{}
+	var n *RawParams
 	if r.IsSet(key) {
 		if m, ok := r[key].(map[string]interface{}); ok {
+			n = &RawParams{}
 			_ = mapstructure.Decode(m, n)
-			return n
 		}
 	}
 	return n
@@ -105,11 +105,14 @@ func sliceHelper[T any](r RawParams, key string) []T {
 	if s, ok := r[key].([]T); ok {
 		return s
 	}
-	res := []T{}
+	var res []T
 	if s, ok := r[key].([]interface{}); ok {
-		for _, v := range s {
+		res = make([]T, len(s))
+		for i, v := range s {
 			if r, ok := v.(T); ok {
-				res = append(res, r)
+				res[i] = r
+			} else {
+				return nil
 			}
 		}
 	}