Fix meshery#575: Replaced deprecated utils.Unmarshal and removed unus…

…ed variables
ShivanshuGupta07 · Aug 25, 2024 · 3535b9b · 3535b9b
1 parent 9c6bfaf
commit 3535b9b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/config/provider/inmem.go b/config/provider/inmem.go
@@ -16,7 +16,7 @@ package provider
 
 import (
 	"sync"
-
+	"encoding/json"
 	"github.com/layer5io/meshkit/config"
 	"github.com/layer5io/meshkit/utils"
 )
@@ -54,7 +54,8 @@ func (l *InMem) GetKey(key string) string {
 func (l *InMem) GetObject(key string, result interface{}) error {
 	l.mutex.Lock()
 	defer l.mutex.Unlock()
-	return utils.Unmarshal(l.store[key], result)
+	//return utils.Unmarshal(l.store[key], result)
+	return json.Unmarshal([]byte(l.store[key]), result)
 }
 
 // SetObject sets an object value for the key

diff --git a/utils/kubernetes/crd.go b/utils/kubernetes/crd.go
@@ -2,8 +2,8 @@ package kubernetes
 
 import (
 	"context"
+	"encoding/json"
 
-	"github.com/layer5io/meshkit/utils"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
 )
@@ -35,7 +35,8 @@ func GetAllCustomResourcesInCluster(ctx context.Context, client rest.Interface)
 	}
 	var xcrd CRD
 	gvks := []*schema.GroupVersionResource{}
-	err = utils.Unmarshal(string(crdresult), &xcrd)
+	//err = utils.Unmarshal(string(crdresult), &xcrd)
+	err = json.Unmarshal(crdresult, &xcrd)
 	if err != nil {
 		return nil, err
 	}

diff --git a/validator/validate.go b/validator/validate.go
@@ -14,7 +14,6 @@ import (
 
 var (
 	ErrValidateCode = ""
-	schemaPath      = "components.schemas"
 	cueschema       cue.Value
 	mx              sync.Mutex
 	isSchemaLoaded  bool