added json field to helm manager

Author: okankoAMZ

test/e2e/envutils.go

@@ -43,23 +43,27 @@ func ApplyResources(k8ctl *utils.K8CtlManager, helm *utils.HelmManager, env *env
 	//}
 
 	// Install Helm chart
-	values := map[string]any{
-		"clusterName":                              env.EKSClusterName,
-		"region":                                   env.Region,
-		"agent.image.repository":                   env.CloudwatchAgentRepository,
-		"agent.image.tag":                          env.CloudwatchAgentTag,
-		"agent.image.repositoryDomainMap.public":   env.CloudwatchAgentRepositoryURL,
-		"manager.image.repository":                 env.CloudwatchAgentOperatorRepository,
-		"manager.image.tag":                        env.CloudwatchAgentOperatorTag,
-		"manager.image.repositoryDomainMap.public": env.CloudwatchAgentOperatorRepositoryURL,
+	values := map[string]utils.HelmValue{
+		"clusterName":                              utils.NewHelmValue(env.EKSClusterName),
+		"region":                                   utils.NewHelmValue(env.Region),
+		"agent.image.repository":                   utils.NewHelmValue(env.CloudwatchAgentRepository),
+		"agent.image.tag":                          utils.NewHelmValue(env.CloudwatchAgentTag),
+		"agent.image.repositoryDomainMap.public":   utils.NewHelmValue(env.CloudwatchAgentRepositoryURL),
+		"manager.image.repository":                 utils.NewHelmValue(env.CloudwatchAgentOperatorRepository),
+		"manager.image.tag":                        utils.NewHelmValue(env.CloudwatchAgentOperatorTag),
+		"manager.image.repositoryDomainMap.public": utils.NewHelmValue(env.CloudwatchAgentOperatorRepositoryURL),
 	}
+
 	if env.ComputeType == computetype.ROSA {
-		values["k8sMode"] = string(computetype.ROSA)
+		values["k8sMode"] = utils.NewHelmValue(string(computetype.ROSA))
 	}
 
 	if env.AgentConfig != "" {
 		if agentConfigContent, err := os.ReadFile(env.AgentConfig); err == nil {
-			values["agent.config"] = string(agentConfigContent)
+			values["agent.config"] = utils.HelmValue{
+				Value: string(agentConfigContent),
+				Type:  utils.HelmValueJSON,
+			}
 		} else {
 			return fmt.Errorf("failed to read agent config file: %w", err)
 		}

test/e2e/testutils.go

@@ -25,8 +25,8 @@ import (
 //------------------------------------------------------------------------------
 
 const (
-	Wait                    = 10 * time.Minute
-	WaitForResourceCreation = 2 * time.Minute
+	Wait                    = 10 * time.Second
+	WaitForResourceCreation = 2 * time.Second
 	interval                = 30 * time.Second
 )
 

test/e2e/utils/helm_manager.go

@@ -7,6 +7,25 @@ import (
 	"strings"
 )
 
+// HelmValueType is a string-based enum for Helm value types
+type HelmValueType string
+
+// Enum values for HelmValueType
+const (
+	HelmValueText HelmValueType = "text" // Default
+	HelmValueJSON HelmValueType = "json"
+)
+
+// IsValid checks if the HelmValueType is a valid enum value
+func (hvt HelmValueType) IsValid() bool {
+	switch hvt {
+	case HelmValueText, HelmValueJSON:
+		return true
+	default:
+		return false
+	}
+}
+
 // HelmManager handles Helm operations.
 type HelmManager struct{}
 
@@ -15,16 +34,37 @@ func NewHelmManager() *HelmManager {
 	return &HelmManager{}
 }
 
+// HelmValue represents a Helm chart value with a type
+type HelmValue struct {
+	Value string        `json:"value"`
+	Type  HelmValueType `json:"type,omitempty"`
+}
+
+// NewHelmValue creates a new HelmValue with the given value and default text type
+func NewHelmValue(value string) HelmValue {
+	return HelmValue{
+		Value: value,
+		Type:  HelmValueText,
+	}
+}
+
 // InstallOrUpdate installs or upgrades a Helm release.
-func (h *HelmManager) InstallOrUpdate(releaseName, chartPath string, values map[string]any, namespace string) error {
+func (h *HelmManager) InstallOrUpdate(releaseName, chartPath string, values map[string]HelmValue, namespace string) error {
 	args := []string{"upgrade", "--install", releaseName, chartPath, "--namespace", namespace, "--create-namespace"}
 
 	// Convert values map to --set flags
 	for key, value := range values {
-		if value.(string) == "" {
+		if !value.Type.IsValid() {
+			return fmt.Errorf("invalid helm value type: %s for %s", value.Type, key)
+		}
+		if value.Value == "" {
 			continue
 		}
-		args = append(args, "--set", fmt.Sprintf("%s=%v", key, value))
+		setFlag := "--set"
+		if value.Type == HelmValueJSON {
+			setFlag = "--set-json"
+		}
+		args = append(args, setFlag, fmt.Sprintf("%s=%v", key, value.Value))
 	}
 
 	helmCmd := exec.Command("helm", args...)