From d6c438ea1a181e65aee2a4a7d382c6832b589dc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:14:38 +0000 Subject: [PATCH 1/2] Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.1.4+incompatible to 27.2.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v26.1.4...v27.2.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f596e90b..3c18ac8ec 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.3 require ( github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240514230400-03fa26f5508f github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 - github.com/docker/docker v26.1.4+incompatible + github.com/docker/docker v27.2.1+incompatible github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 github.com/go-training/helloworld v0.0.0-20200225145412-ba5f4379d78b github.com/google/go-cmp v0.6.0 diff --git a/go.sum b/go.sum index 121f465ff..7a177f68d 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1x github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI= +github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From efc004a291a65d27d0bde39921de641e7f45a251 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 9 Sep 2024 21:22:21 -0500 Subject: [PATCH 2/2] fix lints Signed-off-by: cpanato --- pkg/commands/resolver_test.go | 5 +++-- pkg/internal/testing/daemon.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/commands/resolver_test.go b/pkg/commands/resolver_test.go index a04edfd75..7c65a19a8 100644 --- a/pkg/commands/resolver_test.go +++ b/pkg/commands/resolver_test.go @@ -28,6 +28,7 @@ import ( "testing" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/image" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-containerregistry/pkg/crane" @@ -72,8 +73,8 @@ type erroringClient struct { } func (m *erroringClient) NegotiateAPIVersion(context.Context) {} -func (m *erroringClient) ImageLoad(context.Context, io.Reader, bool) (types.ImageLoadResponse, error) { - return types.ImageLoadResponse{}, errImageLoad +func (m *erroringClient) ImageLoad(context.Context, io.Reader, bool) (image.LoadResponse, error) { + return image.LoadResponse{}, errImageLoad } func (m *erroringClient) ImageTag(_ context.Context, _ string, _ string) error { return errImageTag diff --git a/pkg/internal/testing/daemon.go b/pkg/internal/testing/daemon.go index 620884b60..68cab13aa 100644 --- a/pkg/internal/testing/daemon.go +++ b/pkg/internal/testing/daemon.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/image" "github.com/google/go-containerregistry/pkg/v1/daemon" ) @@ -33,8 +34,8 @@ type MockDaemon struct { } func (m *MockDaemon) NegotiateAPIVersion(context.Context) {} -func (m *MockDaemon) ImageLoad(context.Context, io.Reader, bool) (types.ImageLoadResponse, error) { - return types.ImageLoadResponse{ +func (m *MockDaemon) ImageLoad(context.Context, io.Reader, bool) (image.LoadResponse, error) { + return image.LoadResponse{ Body: io.NopCloser(strings.NewReader("Loaded")), }, nil }