From 52b3785d39f24ab3677ce35fd71f7ac828b1aa2e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 22 Jun 2024 00:45:09 +0200 Subject: [PATCH] switch to github.com/containerd/errdefs containerd 1.7.18 and up alias the errdefs package to the new module, and deprecate the package. Signed-off-by: Sebastiaan van Stijn --- .golangci.yml | 11 +++++++++++ analyzer/analyzer.go | 2 +- analyzer/recorder/recorder.go | 2 +- analyzer/recorder/recorder_test.go | 2 +- fs/remote/resolver.go | 2 +- go.mod | 2 +- nativeconverter/estargz/estargz.go | 2 +- nativeconverter/estargz/externaltoc/converter.go | 2 +- nativeconverter/zstdchunked/zstdchunked.go | 2 +- service/resolver/cri.go | 2 +- snapshot/snapshot.go | 2 +- snapshot/snapshot_test.go | 2 +- util/containerdutil/manifest.go | 2 +- 13 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b3fc38c59..464774757 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,6 +3,7 @@ linters: enable: + - depguard # Checks for imports that shouldn't be used. - staticcheck - unconvert - gofmt @@ -15,6 +16,16 @@ linters: disable: - errcheck +linters-settings: + depguard: + rules: + main: + deny: + - pkg: "github.com/containerd/containerd/errdefs" + desc: The containerd errdefs package was migrated to a separate module. Use github.com/containerd/errdefs instead. + - pkg: "github.com/containerd/containerd/log" + desc: The containerd log package was migrated to a separate module. Use github.com/containerd/log instead. + run: deadline: 4m diff --git a/analyzer/analyzer.go b/analyzer/analyzer.go index 26bc80fe4..ac36f9add 100644 --- a/analyzer/analyzer.go +++ b/analyzer/analyzer.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/tasks" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/stargz-snapshotter/analyzer/fanotify" "github.com/containerd/stargz-snapshotter/analyzer/recorder" diff --git a/analyzer/recorder/recorder.go b/analyzer/recorder/recorder.go index 6502f50ed..f22c028c9 100644 --- a/analyzer/recorder/recorder.go +++ b/analyzer/recorder/recorder.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/stargz-snapshotter/recorder" "github.com/containerd/stargz-snapshotter/util/containerdutil" diff --git a/analyzer/recorder/recorder_test.go b/analyzer/recorder/recorder_test.go index e43d9c54d..9ea3d2612 100644 --- a/analyzer/recorder/recorder_test.go +++ b/analyzer/recorder/recorder_test.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/containerd/stargz-snapshotter/recorder" "github.com/containerd/stargz-snapshotter/util/testutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/fs/remote/resolver.go b/fs/remote/resolver.go index efd046b08..bfef78abd 100644 --- a/fs/remote/resolver.go +++ b/fs/remote/resolver.go @@ -38,9 +38,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/stargz-snapshotter/cache" "github.com/containerd/stargz-snapshotter/fs/config" diff --git a/go.mod b/go.mod index 231c8483e..c78e4f707 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/containerd/console v1.0.4 github.com/containerd/containerd v1.7.18 github.com/containerd/continuity v0.4.3 + github.com/containerd/errdefs v0.1.0 github.com/containerd/log v0.1.0 github.com/containerd/stargz-snapshotter/estargz v0.15.1 github.com/docker/cli v26.1.4+incompatible @@ -40,7 +41,6 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/cgroups/v3 v3.0.2 // indirect - github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/fifo v1.1.0 // indirect github.com/containerd/go-cni v1.1.9 // indirect github.com/containerd/ttrpc v1.2.4 // indirect diff --git a/nativeconverter/estargz/estargz.go b/nativeconverter/estargz/estargz.go index 2f8bd81ff..c94843ccd 100644 --- a/nativeconverter/estargz/estargz.go +++ b/nativeconverter/estargz/estargz.go @@ -23,11 +23,11 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/containerd/labels" + "github.com/containerd/errdefs" "github.com/containerd/stargz-snapshotter/estargz" "github.com/containerd/stargz-snapshotter/util/ioutils" "github.com/opencontainers/go-digest" diff --git a/nativeconverter/estargz/externaltoc/converter.go b/nativeconverter/estargz/externaltoc/converter.go index 2854170f9..dc2378ef1 100644 --- a/nativeconverter/estargz/externaltoc/converter.go +++ b/nativeconverter/estargz/externaltoc/converter.go @@ -26,12 +26,12 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/reference" + "github.com/containerd/errdefs" "github.com/containerd/stargz-snapshotter/estargz" esgzexternaltoc "github.com/containerd/stargz-snapshotter/estargz/externaltoc" estargzconvert "github.com/containerd/stargz-snapshotter/nativeconverter/estargz" diff --git a/nativeconverter/zstdchunked/zstdchunked.go b/nativeconverter/zstdchunked/zstdchunked.go index f1744e6d2..7c409f919 100644 --- a/nativeconverter/zstdchunked/zstdchunked.go +++ b/nativeconverter/zstdchunked/zstdchunked.go @@ -23,11 +23,11 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/containerd/labels" + "github.com/containerd/errdefs" "github.com/containerd/stargz-snapshotter/estargz" "github.com/containerd/stargz-snapshotter/estargz/zstdchunked" "github.com/containerd/stargz-snapshotter/util/ioutils" diff --git a/service/resolver/cri.go b/service/resolver/cri.go index 3f8835424..ec28bfd20 100644 --- a/service/resolver/cri.go +++ b/service/resolver/cri.go @@ -36,10 +36,10 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes/docker" dconfig "github.com/containerd/containerd/remotes/docker/config" + "github.com/containerd/errdefs" "github.com/containerd/stargz-snapshotter/fs/source" rhttp "github.com/hashicorp/go-retryablehttp" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/snapshot/snapshot.go b/snapshot/snapshot.go index 1a29f1ce8..e41e49513 100644 --- a/snapshot/snapshot.go +++ b/snapshot/snapshot.go @@ -24,12 +24,12 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/overlay/overlayutils" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/moby/sys/mountinfo" "github.com/sirupsen/logrus" diff --git a/snapshot/snapshot_test.go b/snapshot/snapshot_test.go index b0476349c..dbb2cb0b3 100644 --- a/snapshot/snapshot_test.go +++ b/snapshot/snapshot_test.go @@ -25,12 +25,12 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/errdefs" ) const ( diff --git a/util/containerdutil/manifest.go b/util/containerdutil/manifest.go index d7fd55e27..a9285614b 100644 --- a/util/containerdutil/manifest.go +++ b/util/containerdutil/manifest.go @@ -25,10 +25,10 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" )