enable inspect tests

A surprisingly big change.  A core problem was that `podman inspect`
allows for passing containers AND images with the default `--type=all`.
This only worked partially as the data was processed in isolation which
caused various issues (e.g., two separate outputs instead of one) but it
also caused issues regarding error handling.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

5 files changed, 30 insertions, 35 deletions

diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go
index b118a4104..46a96ca20 100644
--- a/pkg/domain/entities/engine_image.go
+++ b/pkg/domain/entities/engine_image.go
@@ -13,7 +13,7 @@ type ImageEngine interface {
 	Exists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	History(ctx context.Context, nameOrId string, opts ImageHistoryOptions) (*ImageHistoryReport, error)
 	Import(ctx context.Context, opts ImageImportOptions) (*ImageImportReport, error)
-	Inspect(ctx context.Context, names []string, opts InspectOptions) (*ImageInspectReport, error)
+	Inspect(ctx context.Context, namesOrIDs []string, opts InspectOptions) ([]*ImageInspectReport, error)
 	List(ctx context.Context, opts ImageListOptions) ([]*ImageSummary, error)
 	Load(ctx context.Context, opts ImageLoadOptions) (*ImageLoadReport, error)
 	Prune(ctx context.Context, opts ImagePruneOptions) (*ImagePruneReport, error)
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 460965b34..707937a44 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -238,13 +238,9 @@ type ImagePruneReport struct {
 type ImageTagOptions struct{}
 type ImageUntagOptions struct{}
 
-type ImageData struct {
-	*inspect.ImageData
-}
-
+// ImageInspectReport is the data when inspecting an image.
 type ImageInspectReport struct {
-	Images []*ImageData
-	Errors map[string]error
+	*inspect.ImageData
 }
 
 type ImageLoadOptions struct {
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index d742cc53d..9fbe04c9a 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -47,10 +47,14 @@ type NetOptions struct {
 
 // All CLI inspect commands and inspect sub-commands use the same options
 type InspectOptions struct {
+	// Format - change the output to JSON or a Go template.
 	Format string `json:",omitempty"`
-	Latest bool   `json:",omitempty"`
-	Size   bool   `json:",omitempty"`
-	Type   string `json:",omitempty"`
+	// Latest - inspect the latest container Podman is aware of.
+	Latest bool `json:",omitempty"`
+	// Size (containers only) - display total file size.
+	Size bool `json:",omitempty"`
+	// Type -- return JSON for specified type.
+	Type string `json:",omitempty"`
 }
 
 // All API and CLI diff commands and diff sub-commands use the same options
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 7ac111745..7c63276e5 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -170,29 +170,24 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	return &entities.ImagePullReport{Images: foundIDs}, nil
 }
 
-func (ir *ImageEngine) Inspect(ctx context.Context, names []string, opts entities.InspectOptions) (*entities.ImageInspectReport, error) {
-	report := entities.ImageInspectReport{
-		Errors: make(map[string]error),
-	}
-
-	for _, id := range names {
-		img, err := ir.Libpod.ImageRuntime().NewFromLocal(id)
+func (ir *ImageEngine) Inspect(ctx context.Context, namesOrIDs []string, opts entities.InspectOptions) ([]*entities.ImageInspectReport, error) {
+	reports := []*entities.ImageInspectReport{}
+	for _, i := range namesOrIDs {
+		img, err := ir.Libpod.ImageRuntime().NewFromLocal(i)
 		if err != nil {
-			report.Errors[id] = err
-			continue
+			return nil, err
 		}
-
-		results, err := img.Inspect(ctx)
+		result, err := img.Inspect(ctx)
 		if err != nil {
-			report.Errors[id] = err
-			continue
+			return nil, err
 		}
-
-		cookedResults := entities.ImageData{}
-		_ = domainUtils.DeepCopy(&cookedResults, results)
-		report.Images = append(report.Images, &cookedResults)
+		report := entities.ImageInspectReport{}
+		if err := domainUtils.DeepCopy(&report, result); err != nil {
+			return nil, err
+		}
+		reports = append(reports, &report)
 	}
-	return &report, nil
+	return reports, nil
 }
 
 func (ir *ImageEngine) Push(ctx context.Context, source string, destination string, options entities.ImagePushOptions) error {
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 66e4e6e3f..dcc5fc3e7 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -143,16 +143,16 @@ func (ir *ImageEngine) Untag(ctx context.Context, nameOrId string, tags []string
 	return nil
 }
 
-func (ir *ImageEngine) Inspect(_ context.Context, names []string, opts entities.InspectOptions) (*entities.ImageInspectReport, error) {
-	report := entities.ImageInspectReport{}
-	for _, id := range names {
-		r, err := images.GetImage(ir.ClientCxt, id, &opts.Size)
+func (ir *ImageEngine) Inspect(ctx context.Context, namesOrIDs []string, opts entities.InspectOptions) ([]*entities.ImageInspectReport, error) {
+	reports := []*entities.ImageInspectReport{}
+	for _, i := range namesOrIDs {
+		r, err := images.GetImage(ir.ClientCxt, i, &opts.Size)
 		if err != nil {
-			report.Errors[id] = err
+			return nil, err
 		}
-		report.Images = append(report.Images, r)
+		reports = append(reports, r)
 	}
-	return &report, nil
+	return reports, nil
 }
 
 func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) (*entities.ImageLoadReport, error) {