refactored

Signed-off-by: Aleksandr Petrov <burnb83@gmail.com>

Author: burnb

pkg/argocd/argocd.go

@@ -481,29 +481,20 @@ func SetKustomizeImage(app *v1alpha1.Application, newImage *image.ContainerImage
 	return nil
 }
 
-// ImageIsAllowed checks whether img is declared in image-list annotation
-func ImageIsAllowed(img *image.ContainerImage, list *image.ContainerImageList) bool {
-	for _, i := range *list {
-		if i.ImageName == img.ImageName {
-			return true
-		}
-	}
-	return false
-}
-
 // GetImagesFromApplication returns the list of known images for the given application
 func GetImagesFromApplication(app *v1alpha1.Application) image.ContainerImageList {
 	images := make(image.ContainerImageList, 0)
 	annotations := app.Annotations
 	imagesFromAnnotations := parseImageList(annotations)
 
-	appImgs := make(image.ContainerImageList, 0, len(app.Status.Summary.Images))
+	appImgs := make(map[string]struct{}, len(app.Status.Summary.Images))
 	for _, imageStr := range app.Status.Summary.Images {
-		appImgs = append(appImgs, image.NewFromIdentifier(imageStr))
+		img := image.NewFromIdentifier(imageStr)
+		appImgs[img.ImageName] = struct{}{}
 	}
 
 	for _, img := range *imagesFromAnnotations {
-		if ImageIsAllowed(img, &appImgs) {
+		if _, ok := appImgs[img.ImageName]; ok {
 			images = append(images, img)
 		}
 	}

pkg/argocd/update.go

@@ -415,12 +415,13 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 		}
 
 		if strings.HasPrefix(app.Annotations[common.WriteBackTargetAnnotation], common.HelmPrefix) {
-			params := make(map[interface{}]interface{})
-			err = yaml.Unmarshal(originalData, &params)
+			values := make(map[interface{}]interface{})
+			err = yaml.Unmarshal(originalData, &values)
 			if err != nil {
 				return nil, err
 			}
 
+			newValues := make(map[string]string)
 			images := GetImagesFromApplication(app)
 			for _, c := range images {
 				image := c.ImageAlias
@@ -439,17 +440,17 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 				if helmParamName == nil {
 					return nil, fmt.Errorf("%s parameter not found", helmAnnotationParamName)
 				}
+				newValues[helmAnnotationParamName] = helmParamName.Value
 
 				helmParamVersion := getHelmParam(appSource.Helm.Parameters, helmAnnotationParamVersion)
 				if helmParamVersion == nil {
 					return nil, fmt.Errorf("%s parameter not found", helmAnnotationParamVersion)
 				}
-
-				setNestedField(params, helmAnnotationParamName, helmParamName.Value)
-				setNestedField(params, helmAnnotationParamVersion, helmParamVersion.Value)
+				newValues[helmAnnotationParamVersion] = helmParamVersion.Value
 			}
+			mergeHelmValues(values, newValues)
 
-			override, err = yaml.Marshal(params)
+			override, err = yaml.Marshal(values)
 		} else {
 			var params helmOverride
 			newParams := helmOverride{
@@ -483,18 +484,6 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 	return override, nil
 }
 
-func setNestedField(data map[interface{}]interface{}, fieldPath string, newValue string) {
-	fields := strings.Split(fieldPath, ".")
-	lastFieldIndex := len(fields) - 1
-	for i, name := range fields {
-		if i == lastFieldIndex {
-			data[name] = newValue
-		} else {
-			data = data[name].(map[interface{}]interface{})
-		}
-	}
-}
-
 func mergeHelmOverride(t *helmOverride, o *helmOverride) {
 	for _, param := range o.Helm.Parameters {
 		idx := slices.IndexFunc(t.Helm.Parameters, func(tp v1alpha1.HelmParameter) bool { return tp.Name == param.Name })
@@ -506,6 +495,20 @@ func mergeHelmOverride(t *helmOverride, o *helmOverride) {
 	}
 }
 
+func mergeHelmValues(values map[interface{}]interface{}, newValues map[string]string) {
+	for fieldPath, newValue := range newValues {
+		fields := strings.Split(fieldPath, ".")
+		lastFieldIndex := len(fields) - 1
+		for i, name := range fields {
+			if i == lastFieldIndex {
+				values[name] = newValue
+			} else {
+				values = values[name].(map[interface{}]interface{})
+			}
+		}
+	}
+}
+
 func mergeKustomizeOverride(t *kustomizeOverride, o *kustomizeOverride) {
 	for _, image := range *o.Kustomize.Images {
 		idx := t.Kustomize.Images.Find(image)