remove useless code

projecteru2 · Oct 6, 2022 · 399905a · 399905a
1 parent bb6f2c9
commit 399905a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 61 deletions.
diff --git a/engine/transform.go b/engine/transform.go
@@ -1,21 +1,14 @@
 package engine
 
 import (
-	"encoding/json"
-
-	"github.com/sirupsen/logrus"
-
+	"github.com/mitchellh/mapstructure"
 	"github.com/projecteru2/core/engine/types"
 )
 
+// MakeVirtualizationResource .
 func MakeVirtualizationResource(engineArgs map[string]interface{}) (types.VirtualizationResource, error) {
 	var res types.VirtualizationResource
-	body, err := json.Marshal(engineArgs)
-	if err != nil {
-		return res, err
-	}
-	if err = json.Unmarshal(body, &res); err != nil {
-		logrus.Errorf("[MakeVirtualizationResource] failed to unmarshal from engine args %v, err: %v", string(body), err)
+	if err := mapstructure.Decode(engineArgs, &res); err != nil {
 		return res, err
 	}
 	res.EngineArgs = engineArgs

diff --git a/resources/cpumem/types/resource.go b/resources/cpumem/types/resource.go
@@ -1,7 +1,6 @@
 package types
 
 import (
-	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
@@ -72,11 +71,7 @@ type WorkloadResourceArgs struct {
 
 // ParseFromRawParams .
 func (r *WorkloadResourceArgs) ParseFromRawParams(rawParams coretypes.RawParams) error {
-	body, err := json.Marshal(rawParams)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, r)
+	return mapstructure.Decode(rawParams, r)
 }
 
 // DeepCopy .
@@ -466,9 +461,5 @@ type WorkloadResourceArgsMap map[string]*WorkloadResourceArgs
 
 // ParseFromRawParamsMap .
 func (w *WorkloadResourceArgsMap) ParseFromRawParamsMap(rawParamsMap map[string]coretypes.RawParams) error {
-	body, err := json.Marshal(rawParamsMap)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, w)
+	return mapstructure.Decode(rawParamsMap, w)
 }
diff --git a/resources/volume/types/resource.go b/resources/volume/types/resource.go
@@ -1,11 +1,11 @@
 package types
 
 import (
-	"encoding/json"
 	"sort"
 	"strings"
 	"sync"
 
+	"github.com/mitchellh/mapstructure"
 	coretypes "github.com/projecteru2/core/types"
 	coreutils "github.com/projecteru2/core/utils"
 
@@ -155,11 +155,7 @@ type WorkloadResourceArgs struct {
 
 // ParseFromRawParams .
 func (w *WorkloadResourceArgs) ParseFromRawParams(rawParams coretypes.RawParams) (err error) {
-	body, err := json.Marshal(rawParams)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, w)
+	return mapstructure.Decode(rawParams, w)
 }
 
 // NodeResourceOpts .
@@ -242,11 +238,7 @@ type NodeResourceArgs struct {
 
 // ParseFromRawParams .
 func (n *NodeResourceArgs) ParseFromRawParams(rawParams coretypes.RawParams) error {
-	body, err := json.Marshal(rawParams)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, n)
+	return mapstructure.Decode(rawParams, n)
 }
 
 // DeepCopy .
@@ -421,12 +413,3 @@ type EngineArgs struct {
 
 // WorkloadResourceArgsMap .
 type WorkloadResourceArgsMap map[string]*WorkloadResourceArgs
-
-// ParseFromRawParamsMap .
-func (w *WorkloadResourceArgsMap) ParseFromRawParamsMap(rawParamsMap map[string]coretypes.RawParams) error {
-	body, err := json.Marshal(rawParamsMap)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, w)
-}
diff --git a/types/node.go b/types/node.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 
 	engine "github.com/projecteru2/core/engine"
@@ -23,11 +24,7 @@ type NodeMeta struct {
 
 // DeepCopy returns a deepcopy of nodemeta
 func (n NodeMeta) DeepCopy() (nn NodeMeta, err error) {
-	b, err := json.Marshal(n)
-	if err != nil {
-		return nn, errors.WithStack(err)
-	}
-	return nn, errors.WithStack(json.Unmarshal(b, &nn))
+	return nn, errors.WithStack(mapstructure.Decode(n, &nn))
 }
 
 // NodeResource for resource

diff --git a/types/resource.go b/types/resource.go
@@ -1,7 +1,6 @@
 package types
 
 import (
-	"encoding/json"
 	"fmt"
 	"strconv"
 )
@@ -97,14 +96,6 @@ func (r RawParams) RawParams(key string) map[string]interface{} {
 	return map[string]interface{}{}
 }
 
-// ConvertRawParamsToMap .
-func ConvertRawParamsToMap[V any](r RawParams) map[string]V {
-	res := map[string]V{}
-	body, _ := json.Marshal(r)
-	_ = json.Unmarshal(body, &res)
-	return res
-}
-
 // NodeResourceOpts .
 type NodeResourceOpts RawParams
 

diff --git a/types/resource_test.go b/types/resource_test.go
@@ -52,9 +52,3 @@ func TestRawParams(t *testing.T) {
 	assert.Equal(t, r.RawParams("raw-params")["int64"], 1)
 	assert.Equal(t, r.IsSet("?"), false)
 }
-
-func TestCovertRawToMap(t *testing.T) {
-	r := RawParams{}
-	res := ConvertRawParamsToMap[int64](r)
-	assert.NotNil(t, res)
-}