Merge pull request #5645 from jwhonce/wip/inspect

V2 podman inspect

5 files changed, 26 insertions, 28 deletions

diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 3389e4db5..b7f1cd812 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -98,12 +98,6 @@ type RmReport struct {
 	Id  string
 }
 
-type ContainerInspectOptions struct {
-	Format string
-	Latest bool
-	Size   bool
-}
-
 type ContainerInspectReport struct {
 	*define.InspectContainerData
 }
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index 0907a89af..c5f46ccfc 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -9,32 +9,30 @@ import (
 type ContainerEngine interface {
 	ContainerCommit(ctx context.Context, nameOrId string, options CommitOptions) (*CommitReport, error)
 	ContainerExists(ctx context.Context, nameOrId string) (*BoolReport, error)
-	ContainerInspect(ctx context.Context, namesOrIds []string, options ContainerInspectOptions) ([]*ContainerInspectReport, error)
+	ContainerInspect(ctx context.Context, namesOrIds []string, options InspectOptions) ([]*ContainerInspectReport, error)
 	ContainerKill(ctx context.Context, namesOrIds []string, options KillOptions) ([]*KillReport, error)
 	ContainerPause(ctx context.Context, namesOrIds []string, options PauseUnPauseOptions) ([]*PauseUnpauseReport, error)
 	ContainerRestart(ctx context.Context, namesOrIds []string, options RestartOptions) ([]*RestartReport, error)
 	ContainerRm(ctx context.Context, namesOrIds []string, options RmOptions) ([]*RmReport, error)
-	ContainerUnpause(ctx context.Context, namesOrIds []string, options PauseUnPauseOptions) ([]*PauseUnpauseReport, error)
 	ContainerStop(ctx context.Context, namesOrIds []string, options StopOptions) ([]*StopReport, error)
-	ContainerWait(ctx context.Context, namesOrIds []string, options WaitOptions) ([]WaitReport, error)
 	ContainerTop(ctx context.Context, options TopOptions) (*StringSliceReport, error)
+	ContainerUnpause(ctx context.Context, namesOrIds []string, options PauseUnPauseOptions) ([]*PauseUnpauseReport, error)
+	ContainerWait(ctx context.Context, namesOrIds []string, options WaitOptions) ([]WaitReport, error)
+	HealthCheckRun(ctx context.Context, nameOrId string, options HealthCheckOptions) (*define.HealthCheckResults, error)
 	PodCreate(ctx context.Context, opts PodCreateOptions) (*PodCreateReport, error)
 	PodExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	PodKill(ctx context.Context, namesOrIds []string, options PodKillOptions) ([]*PodKillReport, error)
 	PodPause(ctx context.Context, namesOrIds []string, options PodPauseOptions) ([]*PodPauseReport, error)
 	PodPs(ctx context.Context, options PodPSOptions) ([]*ListPodsReport, error)
 	PodRestart(ctx context.Context, namesOrIds []string, options PodRestartOptions) ([]*PodRestartReport, error)
+	PodRm(ctx context.Context, namesOrIds []string, options PodRmOptions) ([]*PodRmReport, error)
 	PodStart(ctx context.Context, namesOrIds []string, options PodStartOptions) ([]*PodStartReport, error)
 	PodStop(ctx context.Context, namesOrIds []string, options PodStopOptions) ([]*PodStopReport, error)
-	PodRm(ctx context.Context, namesOrIds []string, options PodRmOptions) ([]*PodRmReport, error)
-	PodUnpause(ctx context.Context, namesOrIds []string, options PodunpauseOptions) ([]*PodUnpauseReport, error)
 	PodTop(ctx context.Context, options PodTopOptions) (*StringSliceReport, error)
-
+	PodUnpause(ctx context.Context, namesOrIds []string, options PodunpauseOptions) ([]*PodUnpauseReport, error)
 	VolumeCreate(ctx context.Context, opts VolumeCreateOptions) (*IdOrNameResponse, error)
 	VolumeInspect(ctx context.Context, namesOrIds []string, opts VolumeInspectOptions) ([]*VolumeInspectReport, error)
-	VolumeRm(ctx context.Context, namesOrIds []string, opts VolumeRmOptions) ([]*VolumeRmReport, error)
-	VolumePrune(ctx context.Context, opts VolumePruneOptions) ([]*VolumePruneReport, error)
 	VolumeList(ctx context.Context, opts VolumeListOptions) ([]*VolumeListReport, error)
-
-	HealthCheckRun(ctx context.Context, nameOrId string, options HealthCheckOptions) (*define.HealthCheckResults, error)
+	VolumePrune(ctx context.Context, opts VolumePruneOptions) ([]*VolumePruneReport, error)
+	VolumeRm(ctx context.Context, namesOrIds []string, opts VolumeRmOptions) ([]*VolumeRmReport, error)
 }
diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go
index 6547cbfaf..2ca48e795 100644
--- a/pkg/domain/entities/engine_image.go
+++ b/pkg/domain/entities/engine_image.go
@@ -8,6 +8,7 @@ type ImageEngine interface {
 	Delete(ctx context.Context, nameOrId []string, opts ImageDeleteOptions) (*ImageDeleteReport, error)
 	Exists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	History(ctx context.Context, nameOrId string, opts ImageHistoryOptions) (*ImageHistoryReport, error)
+	Inspect(ctx context.Context, names []string, opts InspectOptions) (*ImageInspectReport, error)
 	List(ctx context.Context, opts ImageListOptions) ([]*ImageSummary, error)
 	Prune(ctx context.Context, opts ImagePruneOptions) (*ImagePruneReport, error)
 	Pull(ctx context.Context, rawImage string, opts ImagePullOptions) (*ImagePullReport, error)
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 41579398b..20682b05b 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/types"
+	"github.com/containers/libpod/pkg/inspect"
 	docker "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/opencontainers/go-digest"
@@ -12,7 +13,6 @@ import (
 )
 
 type Image struct {
-	IdOrNamed
 	ID              string                 `json:"Id"`
 	RepoTags        []string               `json:",omitempty"`
 	RepoDigests     []string               `json:",omitempty"`
@@ -111,13 +111,6 @@ type ImageHistoryReport struct {
 	Layers []ImageHistoryLayer
 }
 
-type ImageInspectOptions struct {
-	TypeObject string `json:",omitempty"`
-	Format     string `json:",omitempty"`
-	Size       bool   `json:",omitempty"`
-	Latest     bool   `json:",omitempty"`
-}
-
 // ImagePullOptions are the arguments for pulling images.
 type ImagePullOptions struct {
 	// AllTags can be specified to pull all tags of the spiecifed image. Note
@@ -157,10 +150,6 @@ type ImageListOptions struct {
 	Filters url.Values `json:"filters" schema:"filters"`
 }
 
-// type ImageListReport struct {
-// 	Images []ImageSummary
-// }
-
 type ImagePruneOptions struct {
 	All     bool       `json:"all" schema:"all"`
 	Filter  []string   `json:"filter" schema:"filter"`
@@ -174,3 +163,12 @@ type ImagePruneReport struct {
 
 type ImageTagOptions struct{}
 type ImageUntagOptions struct{}
+
+type ImageData struct {
+	*inspect.ImageData
+}
+
+type ImageInspectReport struct {
+	Images []*ImageData
+	Errors map[string]error
+}
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index a1a729584..dd7aaa07f 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -42,3 +42,10 @@ type NetOptions struct {
 	StaticIP     *net.IP
 	StaticMAC    *net.HardwareAddr
 }
+
+// All CLI inspect commands and inspect sub-commands use the same options
+type InspectOptions struct {
+	Format string `json:",omitempty"`
+	Latest bool   `json:",omitempty"`
+	Size   bool   `json:",omitempty"`
+}