fix: managed images annotation whitespace handling (#186) (#188)

shini4i · Sep 15, 2023 · 8e132d5 · 8e132d5
1 parent 1ec21d1
commit 8e132d5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/internal/models/argo.go b/internal/models/argo.go
@@ -276,7 +276,7 @@ func extractManagedImages(annotations map[string]string) (map[string]string, err
 				if !strings.Contains(image, "=") {
 					return nil, fmt.Errorf("invalid format for %s annotation", managedImagesAnnotation)
 				}
-				managedImage := strings.Split(image, "=")
+				managedImage := strings.Split(strings.TrimSpace(image), "=")
 				managedImages[managedImage[0]] = managedImage[1]
 			}
 		}

diff --git a/internal/models/argo_test.go b/internal/models/argo_test.go
@@ -275,6 +275,36 @@ func TestExtractManagedImages(t *testing.T) {
 				"alias2": "image2",
 			},
 		},
+		{
+			name: "Extracts multiple managed images with whitespace in alias",
+			annotation: map[string]string{
+				managedImagesAnnotation: "alias1=image1, alias2=image2",
+			},
+			expected: map[string]string{
+				"alias1": "image1",
+				"alias2": "image2",
+			},
+		},
+		{
+			name: "Extracts multiple managed images with whitespace in image",
+			annotation: map[string]string{
+				managedImagesAnnotation: "alias1=image1 ,alias2=image2",
+			},
+			expected: map[string]string{
+				"alias1": "image1",
+				"alias2": "image2",
+			},
+		},
+		{
+			name: "Extracts multiple managed images with whitespace in alias and image",
+			annotation: map[string]string{
+				managedImagesAnnotation: "alias1=image1 , alias2=image2",
+			},
+			expected: map[string]string{
+				"alias1": "image1",
+				"alias2": "image2",
+			},
+		},
 		{
 			name: "Extracts single managed image",
 			annotation: map[string]string{