Merge pull request #5195 from thaJeztah/0.15_backport_fix_wrong_errdefs

[0.15 backport] snapshot/containerd: fix wrong errdefs package import

.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:

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)
 		}
 	}

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