From c50d16cd7814b3ce68d9a59ba738c5ab06eec49c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 21 Jul 2025 14:29:05 +0200 Subject: [PATCH] pkg/compose: remove uses of moby/errdefs Signed-off-by: Sebastiaan van Stijn --- .golangci.yml | 2 ++ pkg/compose/down_test.go | 4 ++-- pkg/compose/up.go | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d00a1f9f7..1d8ae0bb3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -30,6 +30,8 @@ linters: deny: - pkg: io/ioutil desc: io/ioutil package has been deprecated + - pkg: github.com/docker/docker/errdefs + desc: use github.com/containerd/errdefs instead. - pkg: golang.org/x/exp/maps desc: use stdlib maps package - pkg: golang.org/x/exp/slices diff --git a/pkg/compose/down_test.go b/pkg/compose/down_test.go index faeb0a81d..58c1ec0b1 100644 --- a/pkg/compose/down_test.go +++ b/pkg/compose/down_test.go @@ -24,13 +24,13 @@ import ( "testing" "github.com/compose-spec/compose-go/v2/types" + "github.com/containerd/errdefs" "github.com/docker/cli/cli/streams" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/volume" - "github.com/docker/docker/errdefs" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" @@ -326,7 +326,7 @@ func TestDownRemoveImages(t *testing.T) { if exists { resp.RepoTags = []string{img} } else { - err = errdefs.NotFound(fmt.Errorf("test specified that image %q should not exist", img)) + err = errdefs.ErrNotFound.WithMessage(fmt.Sprintf("test specified that image %q should not exist", img)) } api.EXPECT().ImageInspect(gomock.Any(), img). diff --git a/pkg/compose/up.go b/pkg/compose/up.go index 51ea55c2f..e8d81c3f8 100644 --- a/pkg/compose/up.go +++ b/pkg/compose/up.go @@ -18,7 +18,6 @@ package compose import ( "context" - "errors" "fmt" "os" "os/signal" @@ -32,7 +31,6 @@ import ( "github.com/docker/compose/v2/internal/tracing" "github.com/docker/compose/v2/pkg/api" "github.com/docker/compose/v2/pkg/progress" - "github.com/docker/docker/errdefs" "github.com/eiannone/keyboard" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" @@ -222,8 +220,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options Follow: true, Since: ctr.State.StartedAt, }) - var notImplErr errdefs.ErrNotImplemented - if errors.As(err, ¬ImplErr) { + if cerrdefs.IsNotImplemented(err) { // container may be configured with logging_driver: none // as container already started, we might miss the very first logs. But still better than none return s.doAttachContainer(ctx, event.Service, event.ID, event.Source, printer.HandleEvent)