cli: podman manifest annotate --annotation use StringArray()

This option accepts arbitrary input so we should allow commas in it. Signed-off-by: Paul Holzinger <[email protected]>
containers · Dec 11, 2023 · 0f02e43 · 0f02e43
1 parent d8c3e5b
commit 0f02e43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go
@@ -31,7 +31,7 @@ func init() {
 	flags := annotateCmd.Flags()
 
 	annotationFlagName := "annotation"
-	flags.StringSliceVar(&manifestAnnotateOpts.Annotation, annotationFlagName, nil, "set an `annotation` for the specified image")
+	flags.StringArrayVar(&manifestAnnotateOpts.Annotation, annotationFlagName, nil, "set an `annotation` for the specified image")
 	_ = annotateCmd.RegisterFlagCompletionFunc(annotationFlagName, completion.AutocompleteNone)
 
 	archFlagName := "arch"

diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
@@ -347,15 +347,15 @@ add_compression = ["zstd"]`), 0o644)
 		session = podmanTest.Podman([]string{"manifest", "add", "foo", imageListInstance})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
-		session = podmanTest.Podman([]string{"manifest", "annotate", "--annotation", "hello=world", "--arch", "bar", "foo", imageListARM64InstanceDigest})
+		session = podmanTest.Podman([]string{"manifest", "annotate", "--annotation", "hello=world,withcomma", "--arch", "bar", "foo", imageListARM64InstanceDigest})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 		session = podmanTest.Podman([]string{"manifest", "inspect", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 		Expect(session.OutputToString()).To(ContainSubstring(`"architecture": "bar"`))
 		// Check added annotation
-		Expect(session.OutputToString()).To(ContainSubstring(`"hello": "world"`))
+		Expect(session.OutputToString()).To(ContainSubstring(`"hello": "world,withcomma"`))
 	})
 
 	It("remove digest", func() {