Merge pull request #6482 from mheon/split_inspect

Ensure that image/container inspect are specialized

3 files changed, 55 insertions, 3 deletions

diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go
index 4549a4ef6..8556ebe83 100644
--- a/cmd/podman/containers/inspect.go
+++ b/cmd/podman/containers/inspect.go
@@ -26,9 +26,15 @@ func init() {
 		Command: inspectCmd,
 		Parent:  containerCmd,
 	})
-	inspectOpts = inspect.AddInspectFlagSet(inspectCmd)
+	inspectOpts = new(entities.InspectOptions)
+	flags := inspectCmd.Flags()
+	flags.BoolVarP(&inspectOpts.Size, "size", "s", false, "Display total file size")
+	flags.StringVarP(&inspectOpts.Format, "format", "f", "json", "Format the output to a Go template or json")
+	flags.BoolVarP(&inspectOpts.Latest, "latest", "l", false, "Act on the latest container Podman is aware of")
 }
 
 func inspectExec(cmd *cobra.Command, args []string) error {
+	// Force container type
+	inspectOpts.Type = inspect.ContainerType
 	return inspect.Inspect(args, *inspectOpts)
 }
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index 8c727eb07..f6a10ba44 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -27,11 +27,12 @@ func init() {
 		Command: inspectCmd,
 		Parent:  imageCmd,
 	})
-	inspectOpts = inspect.AddInspectFlagSet(inspectCmd)
+	inspectOpts = new(entities.InspectOptions)
 	flags := inspectCmd.Flags()
-	_ = flags.MarkHidden("latest") // Shared with container-inspect but not wanted here.
+	flags.StringVarP(&inspectOpts.Format, "format", "f", "json", "Format the output to a Go template or json")
 }
 
 func inspectExec(cmd *cobra.Command, args []string) error {
+	inspectOpts.Type = inspect.ImageType
 	return inspect.Inspect(args, *inspectOpts)
 }
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 342b3d69f..62f69f1c1 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -178,4 +178,49 @@ var _ = Describe("Podman inspect", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Not(Equal(0)))
 	})
+
+	It("podman [image,container] inspect on image", func() {
+		baseInspect := podmanTest.Podman([]string{"inspect", ALPINE})
+		baseInspect.WaitWithDefaultTimeout()
+		Expect(baseInspect.ExitCode()).To(Equal(0))
+		baseJSON := baseInspect.InspectImageJSON()
+		Expect(len(baseJSON)).To(Equal(1))
+
+		ctrInspect := podmanTest.Podman([]string{"container", "inspect", ALPINE})
+		ctrInspect.WaitWithDefaultTimeout()
+		Expect(ctrInspect.ExitCode()).To(Not(Equal(0)))
+
+		imageInspect := podmanTest.Podman([]string{"image", "inspect", ALPINE})
+		imageInspect.WaitWithDefaultTimeout()
+		Expect(imageInspect.ExitCode()).To(Equal(0))
+		imageJSON := imageInspect.InspectImageJSON()
+		Expect(len(imageJSON)).To(Equal(1))
+
+		Expect(baseJSON[0].ID).To(Equal(imageJSON[0].ID))
+	})
+
+	It("podman [image, container] inspect on container", func() {
+		ctrName := "testCtr"
+		create := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE, "sh"})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		baseInspect := podmanTest.Podman([]string{"inspect", ctrName})
+		baseInspect.WaitWithDefaultTimeout()
+		Expect(baseInspect.ExitCode()).To(Equal(0))
+		baseJSON := baseInspect.InspectContainerToJSON()
+		Expect(len(baseJSON)).To(Equal(1))
+
+		ctrInspect := podmanTest.Podman([]string{"container", "inspect", ctrName})
+		ctrInspect.WaitWithDefaultTimeout()
+		Expect(ctrInspect.ExitCode()).To(Equal(0))
+		ctrJSON := ctrInspect.InspectContainerToJSON()
+		Expect(len(ctrJSON)).To(Equal(1))
+
+		imageInspect := podmanTest.Podman([]string{"image", "inspect", ctrName})
+		imageInspect.WaitWithDefaultTimeout()
+		Expect(imageInspect.ExitCode()).To(Not(Equal(0)))
+
+		Expect(baseJSON[0].ID).To(Equal(ctrJSON[0].ID))
+	})
 })