update registrar client to expect ZosVersion instead of encoded string

Author: Eslam-Nawara

node-registrar/client/zos_version.go

@@ -2,11 +2,9 @@ package client
 
 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -40,20 +38,7 @@ func (c *RegistrarClient) getZosVersion() (version ZosVersion, err error) {
 
 	defer resp.Body.Close()
 
-	var versionString string
-	err = json.NewDecoder(resp.Body).Decode(&versionString)
-	if err != nil {
-		return version, err
-	}
-
-	versionBytes, err := base64.StdEncoding.DecodeString(versionString)
-	if err != nil {
-		return version, err
-	}
-
-	correctedJSON := strings.ReplaceAll(string(versionBytes), "'", "\"")
-
-	err = json.NewDecoder(strings.NewReader(correctedJSON)).Decode(&version)
+	err = json.NewDecoder(resp.Body).Decode(&version)
 	if err != nil {
 		return version, err
 	}
@@ -77,23 +62,13 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error
 		SafeToUpgrade: safeToUpgrade,
 	}
 
-	jsonData, err := json.Marshal(version)
-	if err != nil {
-		return errors.Wrap(err, "failed to marshal zos version")
-	}
-
-	encodedVersion := struct {
-		Version string `json:"version"`
-	}{
-		Version: base64.StdEncoding.EncodeToString(jsonData),
-	}
-
-	jsonData, err = json.Marshal(encodedVersion)
+	var body bytes.Buffer
+	err = json.NewEncoder(&body).Encode(version)
 	if err != nil {
-		return errors.Wrap(err, "failed to marshal zos version in hex format")
+		return errors.Wrap(err, "failed to encode request body")
 	}
 
-	req, err := http.NewRequest("PUT", url, bytes.NewReader(jsonData))
+	req, err := http.NewRequest("PUT", url, &body)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct http request to the registrar")
 	}