diff --git a/.golangci.yml b/.golangci.yml index 15a32cd82085..b62d49643f87 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -54,6 +54,10 @@ linters-settings: desc: The containerd log package was migrated to a separate module. Use github.com/containerd/log instead. - pkg: "github.com/containerd/containerd/platforms" desc: The containerd platforms package was migrated to a separate module. Use github.com/containerd/platforms instead. + - pkg: "github.com/containerd/nydus-snapshotter/pkg/errdefs" + desc: You probably meant to use github.com/containerd/errdefs + - pkg: "github.com/opencontainers/runc/libcontainer/userns" + desc: Use github.com/moby/sys/user/userns instead. - pkg: "io/ioutil" desc: The io/ioutil package has been deprecated. forbidigo: diff --git a/snapshot/containerd/content.go b/snapshot/containerd/content.go index f137dd5c5450..e418a0671214 100644 --- a/snapshot/containerd/content.go +++ b/snapshot/containerd/content.go @@ -5,7 +5,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/namespaces" - "github.com/containerd/nydus-snapshotter/pkg/errdefs" + cerrdefs "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" @@ -103,7 +103,7 @@ var _ content.Store = &nsFallbackStore{} func (c *nsFallbackStore) Info(ctx context.Context, dgst digest.Digest) (content.Info, error) { info, err := c.main.Info(ctx, dgst) if err != nil { - if errdefs.IsNotFound(err) { + if cerrdefs.IsNotFound(err) { return c.fb.Info(ctx, dgst) } } @@ -137,7 +137,7 @@ func (c *nsFallbackStore) Abort(ctx context.Context, ref string) error { func (c *nsFallbackStore) ReaderAt(ctx context.Context, desc ocispecs.Descriptor) (content.ReaderAt, error) { ra, err := c.main.ReaderAt(ctx, desc) if err != nil { - if errdefs.IsNotFound(err) { + if cerrdefs.IsNotFound(err) { return c.fb.ReaderAt(ctx, desc) } } diff --git a/vendor/github.com/containerd/nydus-snapshotter/pkg/errdefs/errors.go b/vendor/github.com/containerd/nydus-snapshotter/pkg/errdefs/errors.go deleted file mode 100644 index 0676fcdedd05..000000000000 --- a/vendor/github.com/containerd/nydus-snapshotter/pkg/errdefs/errors.go +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2020. Ant Group. All rights reserved. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package errdefs - -import ( - stderrors "errors" - "net" - "syscall" - - "github.com/containerd/containerd/errdefs" - "github.com/pkg/errors" -) - -var ( - ErrAlreadyExists = errdefs.ErrAlreadyExists - ErrNotFound = errdefs.ErrNotFound - ErrInvalidArgument = errors.New("invalid argument") - ErrUnavailable = errors.New("unavailable") - ErrNotImplemented = errors.New("not implemented") // represents not supported and unimplemented - ErrDeviceBusy = errors.New("device busy") // represents not supported and unimplemented -) - -// IsAlreadyExists returns true if the error is due to already exists -func IsAlreadyExists(err error) bool { - return errors.Is(err, ErrAlreadyExists) -} - -// IsNotFound returns true if the error is due to a missing object -func IsNotFound(err error) bool { - return errors.Is(err, ErrNotFound) -} - -// IsConnectionClosed returns true if error is due to connection closed -// this is used when snapshotter closed by sig term -func IsConnectionClosed(err error) bool { - switch err := err.(type) { - case *net.OpError: - return err.Err.Error() == "use of closed network connection" - default: - return false - } -} - -func IsErofsMounted(err error) bool { - return stderrors.Is(err, syscall.EBUSY) -} diff --git a/vendor/modules.txt b/vendor/modules.txt index b6d3608d333e..687107c36d23 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -383,7 +383,6 @@ github.com/containerd/log ## explicit; go 1.19 github.com/containerd/nydus-snapshotter/pkg/converter github.com/containerd/nydus-snapshotter/pkg/converter/tool -github.com/containerd/nydus-snapshotter/pkg/errdefs github.com/containerd/nydus-snapshotter/pkg/label # github.com/containerd/platforms v0.2.1 ## explicit; go 1.20