Fix panic in manifest annotate --index

When the --index flag is used, `manifest annotate` shouldn't be expecting a second non-flag argument. Signed-off-by: Nalin Dahyabhai <[email protected]>
containers · Dec 5, 2024 · 03eea16 · 03eea16
1 parent 8ff491b
commit 03eea16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go
@@ -119,7 +119,7 @@ func annotate(cmd *cobra.Command, args []string) error {
 	} else {
 		opts.Annotations = annotations
 	}
-	id, err := registry.ImageEngine().ManifestAnnotate(registry.Context(), args[0], args[1], opts)
+	id, err := registry.ImageEngine().ManifestAnnotate(registry.Context(), listImageSpec, instanceSpec, opts)
 	if err != nil {
 		return err
 	}

diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
@@ -377,12 +377,16 @@ add_compression = ["zstd"]`), 0o644)
 		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", "annotate", "--index", "--annotation", "left=right", "foo"})
+		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
+		// Check added annotations
 		Expect(session.OutputToString()).To(ContainSubstring(`"hello": "world,withcomma"`))
+		Expect(session.OutputToString()).To(ContainSubstring(`"left": "right"`))
 	})
 
 	It("remove digest", func() {