test: handle case if several comma are written in a row

Author: Tchoupinax

pkg/argocd/argocd.go

@@ -431,8 +431,10 @@ func SetHelmImage(app *v1alpha1.Application, newImage *image.ContainerImage) err
 			if strings.Contains(hpImageName, ",") {
 				var parameters = strings.Split(strings.ReplaceAll(hpImageName, " ", ""), ",")
 				for _, parameterName := range parameters {
-					p := v1alpha1.HelmParameter{Name: parameterName, Value: newImage.GetFullNameWithoutTag(), ForceString: true}
-					mergeParams = append(mergeParams, p)
+					if parameterName != "" {
+						p := v1alpha1.HelmParameter{Name: parameterName, Value: newImage.GetFullNameWithoutTag(), ForceString: true}
+						mergeParams = append(mergeParams, p)
+					}
 				}
 			} else {
 				p := v1alpha1.HelmParameter{Name: hpImageName, Value: newImage.GetFullNameWithoutTag(), ForceString: true}
@@ -444,8 +446,10 @@ func SetHelmImage(app *v1alpha1.Application, newImage *image.ContainerImage) err
 			if strings.Contains(hpImageTag, ",") {
 				var parameters = strings.Split(strings.ReplaceAll(hpImageTag, " ", ""), ",")
 				for _, parameterName := range parameters {
-					p := v1alpha1.HelmParameter{Name: parameterName, Value: newImage.GetTagWithDigest(), ForceString: true}
-					mergeParams = append(mergeParams, p)
+					if parameterName != "" {
+						p := v1alpha1.HelmParameter{Name: parameterName, Value: newImage.GetTagWithDigest(), ForceString: true}
+						mergeParams = append(mergeParams, p)
+					}
 				}
 			} else {
 				p := v1alpha1.HelmParameter{Name: hpImageTag, Value: newImage.GetTagWithDigest(), ForceString: true}

pkg/argocd/argocd_test.go

@@ -1011,8 +1011,8 @@ func Test_SetHelmImage(t *testing.T) {
 				Name:      "test-app",
 				Namespace: "testns",
 				Annotations: map[string]string{
-					fmt.Sprintf(common.HelmParamImageNameAnnotation, "foobar"): "foobar.image.name,foobar2.image.name",
-					fmt.Sprintf(common.HelmParamImageTagAnnotation, "foobar"):  "foobar.image.tag, foobar2.image.tag", // Space is expected
+					fmt.Sprintf(common.HelmParamImageNameAnnotation, "foobar"): "foobar.image.name,,, foobar2.image.name",
+					fmt.Sprintf(common.HelmParamImageTagAnnotation, "foobar"):  "foobar.image.tag,,, foobar2.image.tag", // Space and comma are expected
 				},
 			},
 			Spec: v1alpha1.ApplicationSpec{