refactor: replace utils.Marshal/Unmarshal with json.Marshal/json.Unma…

…rshal

Signed-off-by: devhindo <[email protected]>

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           args:  --timeout=5m

meshsync/exec.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"strings"
 	"time"
+	"encoding/json"
 
 	"github.com/google/uuid"
 	"github.com/layer5io/meshkit/broker"
@@ -46,7 +47,7 @@ func (h *Handler) processExecRequest(obj interface{}, cfg config.ListenerConfig)
 		return err
 	}
 
-	err = utils.Unmarshal(d, &reqs)
+	err = json.Unmarshal([]byte(d), &reqs)
 	if err != nil {
 		return err
 	}

meshsync/handlers.go

@@ -3,6 +3,7 @@ package meshsync
 import (
 	"fmt"
 	"time"
+	"encoding/json"
 
 	"github.com/layer5io/meshkit/broker"
 	"github.com/layer5io/meshkit/utils"
@@ -98,14 +99,14 @@ func (h *Handler) ListenToRequests() {
 
 			// TODO: Add this to the broker pkg
 		case "informer-store":
-			d, err := utils.Marshal(request.Request.Payload)
+			d, err := json.Marshal(request.Request.Payload)
 			// TODO: Update broker pkg in Meshkit to include Reply types
 			var payload struct{ Reply string }
 			if err != nil {
 				h.Log.Error(err)
 				continue
 			}
-			err = utils.Unmarshal(d, &payload)
+			err = json.Unmarshal(d, &payload)
 			if err != nil {
 				h.Log.Error(err)
 				continue
@@ -188,13 +189,13 @@ func (h *Handler) WatchCRDs() {
 	for event := range crdWatcher.ResultChan() {
 
 		crd := &kubernetes.CRDItem{}
-		byt, err := utils.Marshal(event.Object)
+		byt, err := json.Marshal(event.Object)
 		if err != nil {
 			h.Log.Error(err)
 			continue
 		}
 
-		err = utils.Unmarshal(byt, crd)
+		err = json.Unmarshal(byt, crd)
 		if err != nil {
 			h.Log.Error(err)
 			continue

meshsync/logstream.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"encoding/json"
 
 	"github.com/layer5io/meshkit/broker"
-	"github.com/layer5io/meshkit/utils"
 	"github.com/layer5io/meshsync/internal/channels"
 	"github.com/layer5io/meshsync/internal/config"
 	"github.com/layer5io/meshsync/pkg/model"
@@ -15,12 +15,12 @@ import (
 
 func (h *Handler) processLogRequest(obj interface{}, cfg config.ListenerConfig) error {
 	reqs := make(model.LogRequests)
-	d, err := utils.Marshal(obj)
+	d, err := json.Marshal(obj)
 	if err != nil {
 		return err
 	}
 
-	err = utils.Unmarshal(d, &reqs)
+	err = json.Unmarshal(d, &reqs)
 	if err != nil {
 		return err
 	}

pkg/model/model_converter.go

@@ -2,21 +2,21 @@ package model
 
 import (
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 
 	"github.com/buger/jsonparser"
 	"github.com/google/uuid"
 	"github.com/layer5io/meshkit/broker"
 	"github.com/layer5io/meshkit/orchestration"
-	"github.com/layer5io/meshkit/utils"
 	iutils "github.com/layer5io/meshsync/pkg/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 func ParseList(object unstructured.Unstructured, eventType broker.EventType) KubernetesResource {
 	data, _ := object.MarshalJSON()
 	result := KubernetesResource{}
-	_ = utils.Unmarshal(string(data), &result)
+	_ = json.Unmarshal(data, &result)
 
 	processorInstance := GetProcessorInstance(result.Kind)
 	// ObjectMeta internal models

pkg/model/process.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-
+	"encoding/json"
+
 	"github.com/layer5io/meshkit/broker"
-	"github.com/layer5io/meshkit/utils"
 	"github.com/layer5io/meshkit/utils/kubernetes"
 	v1 "k8s.io/api/core/v1"
 )
@@ -21,7 +21,7 @@ func (s *K8SService) Process(data []byte, k8sresource *KubernetesResource, evtyp
 
 	k8sservice := &v1.Service{}
 
-	err := utils.Unmarshal(string(data), k8sservice)
+	err := json.Unmarshal(data, k8sservice)
 	if err != nil {
 		return err
 	}