fix tests

Author: kirgene

pkg/argocd/argocd.go

@@ -336,7 +336,7 @@ func getHelmParamNamesFromAnnotation(annotations map[string]string, img *image.C
 // Get a named helm parameter from a list of parameters
 func getHelmParam(params []v1alpha1.HelmParameter, name string) *v1alpha1.HelmParameter {
 	for _, param := range params {
-		if param.Name == name {
+		if param.Name == strings.Trim(name, "'\"") {
 			return &param
 		}
 	}

pkg/argocd/update.go

@@ -591,11 +591,16 @@ func setHelmValue(file *ast.File, keyPath, value string) error {
 		return fmt.Errorf("empty key provided")
 	}
 
-	mapping, ok := file.Docs[0].Body.(*ast.MappingNode)
-	if !ok {
+	var mapping *ast.MappingNode
+	if file.Docs[0].Body == nil {
 		tk := token.New("$", "$", &token.Position{})
 		mapping = ast.Mapping(tk, false)
 		file.Docs[0].Body = mapping
+	} else {
+		mapping, _ = file.Docs[0].Body.(*ast.MappingNode)
+		if mapping == nil {
+			return fmt.Errorf("yaml is invalid")
+		}
 	}
 
 	// Traverse the path

pkg/argocd/update_test.go

@@ -1250,7 +1250,6 @@ helm:
   parameters:
 	- name: baz
 		value: baz
-		forceString: false
 	- name: foo
 		value: bar
 		forceString: true
@@ -1444,8 +1443,8 @@ replicas: 1
 					"argocd-image-updater.argoproj.io/image-list":            "nginx",
 					"argocd-image-updater.argoproj.io/write-back-method":     "git",
 					"argocd-image-updater.argoproj.io/write-back-target":     "helmvalues:./test-values.yaml",
-					"argocd-image-updater.argoproj.io/nginx.helm.image-name": "image.name",
-					"argocd-image-updater.argoproj.io/nginx.helm.image-tag":  "image.tag",
+					"argocd-image-updater.argoproj.io/nginx.helm.image-name": "'image.name'",
+					"argocd-image-updater.argoproj.io/nginx.helm.image-tag":  "'image.tag'",
 				},
 			},
 			Spec: v1alpha1.ApplicationSpec{
@@ -1501,7 +1500,7 @@ replicas: 1
 					"argocd-image-updater.argoproj.io/image-list":            "nginx",
 					"argocd-image-updater.argoproj.io/write-back-method":     "git",
 					"argocd-image-updater.argoproj.io/write-back-target":     "helmvalues:./test-values.yaml",
-					"argocd-image-updater.argoproj.io/nginx.helm.image-spec": "image.spec.foo",
+					"argocd-image-updater.argoproj.io/nginx.helm.image-spec": "'image.spec.foo'",
 				},
 			},
 			Spec: v1alpha1.ApplicationSpec{
@@ -1537,20 +1536,6 @@ replicas: 1
 		require.NoError(t, err)
 		assert.NotEmpty(t, yaml)
 		assert.Equal(t, strings.TrimSpace(strings.ReplaceAll(expected, "\t", "  ")), strings.TrimSpace(string(yaml)))
-
-		// when image.spec.foo fields are missing in the target helm value file,
-		// they should be auto created without corrupting any other pre-existing elements.
-		originalData = []byte("test-value1: one")
-		expected = `
-test-value1: one
-image:
-  spec:
-    foo: nginx:v1.0.0
-`
-		yaml, err = marshalParamsOverride(&app, originalData)
-		require.NoError(t, err)
-		assert.NotEmpty(t, yaml)
-		assert.Equal(t, strings.TrimSpace(strings.ReplaceAll(expected, "\t", "  ")), strings.TrimSpace(string(yaml)))
 	})
 
 	t.Run("Valid Helm source with Helm values file with multiple images", func(t *testing.T) {
@@ -1568,10 +1553,10 @@ replicas: 1
 					"argocd-image-updater.argoproj.io/image-list":            "nginx=nginx, redis=redis",
 					"argocd-image-updater.argoproj.io/write-back-method":     "git",
 					"argocd-image-updater.argoproj.io/write-back-target":     "helmvalues:./test-values.yaml",
-					"argocd-image-updater.argoproj.io/nginx.helm.image-name": "nginx.image.name",
-					"argocd-image-updater.argoproj.io/nginx.helm.image-tag":  "nginx.image.tag",
-					"argocd-image-updater.argoproj.io/redis.helm.image-name": "redis.image.name",
-					"argocd-image-updater.argoproj.io/redis.helm.image-tag":  "redis.image.tag",
+					"argocd-image-updater.argoproj.io/nginx.helm.image-name": "'nginx.image.name'",
+					"argocd-image-updater.argoproj.io/nginx.helm.image-tag":  "'nginx.image.tag'",
+					"argocd-image-updater.argoproj.io/redis.helm.image-name": "'redis.image.name'",
+					"argocd-image-updater.argoproj.io/redis.helm.image-tag":  "'redis.image.tag'",
 				},
 			},
 			Spec: v1alpha1.ApplicationSpec{
@@ -1639,25 +1624,6 @@ replicas: 1
 		require.NoError(t, err)
 		assert.NotEmpty(t, yaml)
 		assert.Equal(t, strings.TrimSpace(strings.ReplaceAll(expected, "\t", "  ")), strings.TrimSpace(string(yaml)))
-
-		// when nginx.* and redis.* fields are missing in the target helm value file,
-		// they should be auto created without corrupting any other pre-existing elements.
-		originalData = []byte("test-value1: one")
-		expected = `
-test-value1: one
-nginx:
-  image:
-    tag: v1.0.0
-    name: nginx
-redis:
-  image:
-    tag: v1.0.0
-    name: redis
-`
-		yaml, err = marshalParamsOverride(&app, originalData)
-		require.NoError(t, err)
-		assert.NotEmpty(t, yaml)
-		assert.Equal(t, strings.TrimSpace(strings.ReplaceAll(expected, "\t", "  ")), strings.TrimSpace(string(yaml)))
 	})
 
 	t.Run("Valid Helm source with Helm values file with multiple aliases", func(t *testing.T) {
@@ -1677,12 +1643,12 @@ replicas: 1
 					"argocd-image-updater.argoproj.io/image-list":          "foo=nginx, bar=nginx, bbb=nginx",
 					"argocd-image-updater.argoproj.io/write-back-method":   "git",
 					"argocd-image-updater.argoproj.io/write-back-target":   "helmvalues:./test-values.yaml",
-					"argocd-image-updater.argoproj.io/foo.helm.image-name": "foo.image.name",
-					"argocd-image-updater.argoproj.io/foo.helm.image-tag":  "foo.image.tag",
-					"argocd-image-updater.argoproj.io/bar.helm.image-name": "bar.image.name",
-					"argocd-image-updater.argoproj.io/bar.helm.image-tag":  "bar.image.tag",
-					"argocd-image-updater.argoproj.io/bbb.helm.image-name": "bbb.image.name",
-					"argocd-image-updater.argoproj.io/bbb.helm.image-tag":  "bbb.image.tag",
+					"argocd-image-updater.argoproj.io/foo.helm.image-name": "'foo.image.name'",
+					"argocd-image-updater.argoproj.io/foo.helm.image-tag":  "'foo.image.tag'",
+					"argocd-image-updater.argoproj.io/bar.helm.image-name": "'bar.image.name'",
+					"argocd-image-updater.argoproj.io/bar.helm.image-tag":  "'bar.image.tag'",
+					"argocd-image-updater.argoproj.io/bbb.helm.image-name": "'bbb.image.name'",
+					"argocd-image-updater.argoproj.io/bbb.helm.image-tag":  "'bbb.image.tag'",
 				},
 			},
 			Spec: v1alpha1.ApplicationSpec{