base64 encode compressed data

Author: prakash100198

env_gen.json

@@ -287,10 +287,10 @@
  | DASHBOARD_PORT | string |3000 | Port for dashboard micro-service |  | false |
  | DEX_HOST | string |http://localhost |  |  | false |
  | DEX_PORT | string |5556 |  |  | false |
- | GIT_SENSOR_PROTOCOL | string |REST | Protocol to connect with git-sensor micro-service |  | false |
+ | GIT_SENSOR_PROTOCOL | string |GRPC | Protocol to connect with git-sensor micro-service |  | false |
  | GIT_SENSOR_SERVICE_CONFIG | string |{"loadBalancingPolicy":"pick_first"} | git-sensor grpc service config |  | false |
  | GIT_SENSOR_TIMEOUT | int |0 | Timeout for getting response from the git-sensor |  | false |
- | GIT_SENSOR_URL | string |127.0.0.1:7070 | git-sensor micro-service url  |  | false |
+ | GIT_SENSOR_URL | string |127.0.0.1:7071 | git-sensor micro-service url  |  | false |
  | HELM_CLIENT_URL | string |127.0.0.1:50051 | Kubelink micro-service url  |  | false |
  | KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE | int |20 |  |  | false |
  | KUBELINK_GRPC_MAX_SEND_MSG_SIZE | int |4 |  |  | false |

env_gen.md

@@ -19,14 +19,15 @@ package helper
 import (
 	"bytes"
 	"compress/gzip"
+	"encoding/base64"
 	"encoding/json"
 	"io"
 )
 
-// CompressJSON marshals and compresses JSON data
-func CompressJSON(data interface{}) (string, error) {
+// CompressWorkflowRequest compresses WorkflowRequest to bytes
+func CompressWorkflowRequest(workflowRequest interface{}) (string, error) {
 	// Marshal to JSON
-	jsonData, err := json.Marshal(data)
+	jsonData, err := json.Marshal(workflowRequest)
 	if err != nil {
 		return "", err
 	}
@@ -45,86 +46,32 @@ func CompressJSON(data interface{}) (string, error) {
 		return "", err
 	}
 
-	return string(buf.Bytes()), nil
+	// Encode compressed binary data to Base64 to avoid UTF-8 encoding issues
+	return base64.StdEncoding.EncodeToString(buf.Bytes()), nil
 }
 
-// DecompressJSON decompresses and unmarshals JSON data
-func DecompressJSON(compressedData []byte, target interface{}) error {
-	// Decompress
-	reader, err := gzip.NewReader(bytes.NewReader(compressedData))
+// DecompressWorkflowRequest decompresses bytes to WorkflowRequest
+// This function handles both Base64 encoded and legacy raw binary data for backward compatibility
+func DecompressWorkflowRequest(compressedData string, target interface{}) error {
+	// Try Base64 decoding first (new format)
+	decodedData, err := base64.StdEncoding.DecodeString(compressedData)
 	if err != nil {
 		return err
 	}
-	defer reader.Close()
 
-	// Read decompressed data
-	decompressedData, err := io.ReadAll(reader)
+	// Use decoded data for decompression
+	reader, err := gzip.NewReader(bytes.NewReader(decodedData))
 	if err != nil {
 		return err
 	}
-
-	// Unmarshal JSON
-	return json.Unmarshal(decompressedData, target)
-}
-
-// CompressString compresses string data
-func CompressString(data string) ([]byte, error) {
-	var buf bytes.Buffer
-	gzipWriter := gzip.NewWriter(&buf)
-
-	_, err := gzipWriter.Write([]byte(data))
-	if err != nil {
-		return nil, err
-	}
-
-	err = gzipWriter.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-// DecompressString decompresses string data
-func DecompressString(compressedData []byte) (string, error) {
-	reader, err := gzip.NewReader(bytes.NewReader(compressedData))
-	if err != nil {
-		return "", err
-	}
 	defer reader.Close()
 
+	// Read decompressed data
 	decompressedData, err := io.ReadAll(reader)
 	if err != nil {
-		return "", err
+		return err
 	}
 
-	return string(decompressedData), nil
-}
-
-// Utility functions for backward compatibility
-
-// CompressWorkflowRequest compresses WorkflowRequest to bytes
-func CompressWorkflowRequest(workflowRequest interface{}) (string, error) {
-	return CompressJSON(workflowRequest)
-}
-
-// DecompressWorkflowRequest decompresses bytes to WorkflowRequest
-func DecompressWorkflowRequest(compressedData string, target interface{}) error {
-	return DecompressJSON([]byte(compressedData), target)
-}
-
-// Example usage:
-/*
-// Compress before saving
-compressedData, err := CompressWorkflowRequest(workflowRequest)
-if err != nil {
-    return err
-}
-snapshot.WorkflowRequestJson = compressedData
-// Decompress when reading
-var workflowRequest types.WorkflowRequest
-err = DecompressWorkflowRequest(snapshot.WorkflowRequestJson, &workflowRequest)
-if err != nil {
-    return err
+	// Unmarshal JSON
+	return json.Unmarshal(decompressedData, target)
 }
-*/