add fallback mechanism go version decoding

Author: Eslam-Nawara

node-registrar/client/zos_version.go

@@ -2,9 +2,12 @@ package client
 
 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
+	"io"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -59,6 +62,27 @@ func (c *RegistrarClient) getZosVersion() (version ZosVersion, err error) {
 		return version, err
 	}
 
+	err = json.Unmarshal(bodyBytes, &version)
+	if err != nil {
+		// try decoding base64 version
+		var versionString string
+		err = json.Unmarshal(bodyBytes, &versionString)
+		if err != nil {
+			return version, err
+		}
+
+		decodedVersion, err := base64.StdEncoding.DecodeString(versionString)
+		if err != nil {
+			return version, err
+		}
+
+		correctedJSON := strings.ReplaceAll(string(decodedVersion), "'", "\"")
+
+		err = json.Unmarshal([]byte(correctedJSON), &version)
+
+		return version, err
+	}
+
 	return
 }
 

node-registrar/pkg/server/handlers.go

@@ -720,8 +720,6 @@ type ZOSVersionRequest struct {
 	SafeToUpgrade bool   `json:"safe_to_upgrade" binding:"required"`
 }
 
-var versionRegex = regexp.MustCompile(`^v\d+\.\d+\.\d+$`)
-
 // @Summary Set ZOS Version
 // @Description Sets the ZOS version
 // @Tags ZOS
@@ -837,8 +835,10 @@ func validateTimestampHint(timestampHint int64) error {
 	return nil
 }
 
+// addVersionValidato registers a custom validator for version
 func addVersionValidator() error {
-	// Register the custom validation
+	versionRegex := regexp.MustCompile(`^v\d+\.\d+\.\d+$`)
+
 	if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
 		if err := v.RegisterValidation("versionfmt", func(fl validator.FieldLevel) bool {
 			version := fl.Field().String()