From 5268314e5376c3da7a1123ee1954b466baf2d911 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 24 May 2022 13:18:56 +0200 Subject: podman image mount: print pretty table Make sure that `podman image mount` prints a pretty table unless there is only argument passed and without a custom format. Fixing a TODO item brought me to the specific code location and revealed the fart in the logic. Signed-off-by: Valentin Rothberg --- pkg/domain/entities/images.go | 1 - pkg/domain/infra/abi/images.go | 4 ---- 2 files changed, 5 deletions(-) (limited to 'pkg/domain') diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 7081c5d25..553be1157 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -398,7 +398,6 @@ type ImageUnmountOptions struct { // ImageMountReport describes the response from image mount type ImageMountReport struct { - Err error Id string // nolint Name string Repositories []string diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index c3ec7dd8a..d469fa0ca 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -159,10 +159,6 @@ func (ir *ImageEngine) Mount(ctx context.Context, nameOrIDs []string, opts entit mountReports := []*entities.ImageMountReport{} listMountsOnly := !opts.All && len(nameOrIDs) == 0 for _, i := range images { - // TODO: the .Err fields are not used. This pre-dates the - // libimage migration but should be addressed at some point. - // A quick glimpse at cmd/podman/image/mount.go suggests that - // the errors needed to be handled there as well. var mountPoint string var err error if listMountsOnly { -- cgit v1.2.3-54-g00ecf From fbeef1d70065913625f70e19283f9ba7c21ec249 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 24 May 2022 13:53:54 +0200 Subject: image list: remove unused ConfigDigest Remove the `ConfigDigest` field from `entities.ImageSummary` which has never been populated (or documented) until now. Unless there is a specific request or need to support it, remove the TODO that was added during the libimage migration. Signed-off-by: Valentin Rothberg --- pkg/domain/entities/images.go | 1 - pkg/domain/infra/abi/images_list.go | 2 -- 2 files changed, 3 deletions(-) (limited to 'pkg/domain') diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 553be1157..28ffcfbdf 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -68,7 +68,6 @@ type ImageSummary struct { // Podman extensions Names []string `json:",omitempty"` Digest 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 9a0aaaf3a..25cddc503 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -37,8 +37,6 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) e := entities.ImageSummary{ ID: img.ID(), - // TODO: libpod/image didn't set it but libimage should - // ConfigDigest: string(img.ConfigDigest), Created: img.Created().Unix(), Dangling: isDangling, Digest: string(img.Digest()), -- cgit v1.2.3-54-g00ecf From 956e2e1b842b5e753a5a2476465deb3ab25ca370 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 24 May 2022 13:56:58 +0200 Subject: pkg/domain/infra/abi/images_test.go: remove commented code Signed-off-by: Valentin Rothberg --- pkg/domain/infra/abi/images_test.go | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'pkg/domain') diff --git a/pkg/domain/infra/abi/images_test.go b/pkg/domain/infra/abi/images_test.go index 311ab3ed7..3999de457 100644 --- a/pkg/domain/infra/abi/images_test.go +++ b/pkg/domain/infra/abi/images_test.go @@ -16,39 +16,3 @@ func TestToDomainHistoryLayer(t *testing.T) { newLayer := toDomainHistoryLayer(&layer) assert.Equal(t, layer.Size, newLayer.Size) } - -// -// import ( -// "context" -// "testing" -// -// "github.com/stretchr/testify/mock" -// ) -// -// type MockImageRuntime struct { -// mock.Mock -// } -// -// func (m *MockImageRuntime) Delete(ctx context.Context, renderer func() interface{}, name string) error { -// _ = m.Called(ctx, renderer, name) -// return nil -// } -// -// func TestImageSuccess(t *testing.T) { -// actual := func() interface{} { return nil } -// -// m := new(MockImageRuntime) -// m.On( -// "Delete", -// mock.AnythingOfType("*context.emptyCtx"), -// mock.AnythingOfType("func() interface {}"), -// "fedora"). -// Return(nil) -// -// r := DirectImageRuntime{m} -// err := r.Delete(context.TODO(), actual, "fedora") -// if err != nil { -// t.Errorf("should be nil, got: %v", err) -// } -// m.AssertExpectations(t) -// } -- cgit v1.2.3-54-g00ecf From 2400d1d52ff4199778781446445eef39a6e2c6b9 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 24 May 2022 14:24:37 +0200 Subject: go format previosly touched files Signed-off-by: Valentin Rothberg --- pkg/domain/entities/images.go | 6 +++--- pkg/domain/infra/abi/images_list.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/domain') diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 28ffcfbdf..2bb4ceb5b 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -66,9 +66,9 @@ type ImageSummary struct { Dangling bool `json:",omitempty"` // Podman extensions - Names []string `json:",omitempty"` - Digest string `json:",omitempty"` - History []string `json:",omitempty"` + Names []string `json:",omitempty"` + Digest string `json:",omitempty"` + History []string `json:",omitempty"` } func (i *ImageSummary) Id() string { // nolint diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 25cddc503..8f5591e92 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -36,7 +36,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) } e := entities.ImageSummary{ - ID: img.ID(), + ID: img.ID(), Created: img.Created().Unix(), Dangling: isDangling, Digest: string(img.Digest()), -- cgit v1.2.3-54-g00ecf