From 468947d5c85cdd72d604c95789d91075553f0a92 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Thu, 3 Dec 2020 16:11:17 -0700
Subject: Jira RUN-1106 Image handlers updates

* Audit and add tests for required fields.
* Added issue for /images/load implementation

Audit:
- GET /images/json GetImages
- POST /build BuildImage
- POST /build/prune 404 not found
- POST /images/create CreateImageFromImage/CreateImageFromSrc
- GET /images/{name}/json GetImage
- GET /images/{name}/history HistoryImage
- POST /images/{name}/push PushImage
- POST /images/{name}/tag TagImage
- DELETE /images/{name} RemoveImage
- POST /images/prune PruneImages
- POST /commit CommitContainer
- GET /images/{name}/get ExportImage
- GET /images/get ExportImages
- POST /images/load LoadImages See https://github.com/containers/podman/issues/8586

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 pkg/domain/entities/images.go       | 22 +++++++++++-----------
 pkg/domain/infra/abi/images_list.go |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'pkg/domain')

diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index ab545d882..81f12bff7 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -51,22 +51,22 @@ func (i *Image) Id() string { // nolint
 }
 
 type ImageSummary struct {
-	ID          string   `json:"Id"`
-	ParentId    string   // nolint
-	RepoTags    []string `json:",omitempty"`
+	ID          string `json:"Id"`
+	ParentId    string // nolint
+	RepoTags    []string
+	RepoDigests []string
 	Created     int64
-	Size        int64             `json:",omitempty"`
-	SharedSize  int               `json:",omitempty"`
-	VirtualSize int64             `json:",omitempty"`
-	Labels      map[string]string `json:",omitempty"`
-	Containers  int               `json:",omitempty"`
-	ReadOnly    bool              `json:",omitempty"`
-	Dangling    bool              `json:",omitempty"`
+	Size        int64
+	SharedSize  int
+	VirtualSize int64
+	Labels      map[string]string
+	Containers  int
+	ReadOnly    bool `json:",omitempty"`
+	Dangling    bool `json:",omitempty"`
 
 	// Podman extensions
 	Names        []string `json:",omitempty"`
 	Digest       string   `json:",omitempty"`
-	Digests      []string `json:",omitempty"`
 	ConfigDigest string   `json:",omitempty"`
 	History      []string `json:",omitempty"`
 }
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 281b04294..20ae0d0f6 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -35,7 +35,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 			Created:      img.Created().Unix(),
 			Dangling:     img.Dangling(),
 			Digest:       string(img.Digest()),
-			Digests:      digests,
+			RepoDigests:  digests,
 			History:      img.NamesHistory(),
 			Names:        img.Names(),
 			ParentId:     img.Parent,
-- 
cgit v1.2.3-54-g00ecf