diff --git a/client.go b/client.go index 1c2202e1ecdb..66d8e18a1b0a 100644 --- a/client.go +++ b/client.go @@ -43,7 +43,6 @@ import ( "github.com/containerd/containerd/content" contentproxy "github.com/containerd/containerd/content/proxy" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" @@ -57,6 +56,7 @@ import ( "github.com/containerd/containerd/services/introspection" "github.com/containerd/containerd/snapshots" snproxy "github.com/containerd/containerd/snapshots/proxy" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" ptypes "github.com/gogo/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 42a09dc90c83..926aa2a9bc55 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -28,7 +28,6 @@ import ( "time" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" _ "github.com/containerd/containerd/metrics" // import containerd build info "github.com/containerd/containerd/mount" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/sys" "github.com/containerd/containerd/tracing" "github.com/containerd/containerd/version" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/urfave/cli" "google.golang.org/grpc/grpclog" diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index b18f19f7e80a..c86fa5c1ff96 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -25,9 +25,9 @@ import ( "time" eventsapi "github.com/containerd/containerd/api/services/events/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/dialer" + "github.com/containerd/errdefs" "github.com/gogo/protobuf/types" "github.com/urfave/cli" "google.golang.org/grpc" diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index eb2062c71857..a24edacccc00 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -24,8 +24,8 @@ import ( "time" "unsafe" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/services/server" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/urfave/cli" exec "golang.org/x/sys/execabs" diff --git a/cmd/ctr/commands/containers/checkpoint.go b/cmd/ctr/commands/containers/checkpoint.go index 62804f486cda..ecbb586d5856 100644 --- a/cmd/ctr/commands/containers/checkpoint.go +++ b/cmd/ctr/commands/containers/checkpoint.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index d1025344e0a0..1c41466c9905 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/run" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index 2847340c9135..37c9ee283d99 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index a68c2438edf1..abae2765cfc0 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index aef9e86349cd..69bd62fef94e 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -29,12 +29,12 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index a68d2168dfa2..5cf831d5f252 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -25,11 +25,11 @@ import ( "text/tabwriter" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index a907ad596e09..5d987c97352a 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -22,10 +22,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/tag.go b/cmd/ctr/commands/images/tag.go index 7c5d2a96afbd..5db3398446a7 100644 --- a/cmd/ctr/commands/images/tag.go +++ b/cmd/ctr/commands/images/tag.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index f98570d845e7..6070f3c87e40 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index ddab3f58a114..1bb99da3ef71 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -25,8 +25,8 @@ import ( "text/tabwriter" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index 311608c26cb7..dc66e9aeac2b 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -23,7 +23,7 @@ import ( "syscall" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" ) diff --git a/container.go b/container.go index 2cf15666f132..a75360ec8249 100644 --- a/container.go +++ b/container.go @@ -29,10 +29,10 @@ import ( tasktypes "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" "github.com/containerd/fifo" "github.com/containerd/typeurl" prototypes "github.com/gogo/protobuf/types" diff --git a/container_opts.go b/container_opts.go index 4d630ea6c9d2..2421808a35a4 100644 --- a/container_opts.go +++ b/container_opts.go @@ -24,10 +24,10 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "github.com/gogo/protobuf/types" "github.com/opencontainers/image-spec/identity" diff --git a/container_opts_unix.go b/container_opts_unix.go index b6fc37db9271..4100b1bd3962 100644 --- a/container_opts_unix.go +++ b/container_opts_unix.go @@ -27,8 +27,8 @@ import ( "syscall" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" + "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/containerstore.go b/containerstore.go index bdd1c6066a79..7c4091b6b285 100644 --- a/containerstore.go +++ b/containerstore.go @@ -23,7 +23,7 @@ import ( containersapi "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/content/helpers.go b/content/helpers.go index 23ddc452f8d9..39db2085f25f 100644 --- a/content/helpers.go +++ b/content/helpers.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/helpers_test.go b/content/helpers_test.go index fb860e48fc1f..549240264f38 100644 --- a/content/helpers_test.go +++ b/content/helpers_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/content/local/locks.go b/content/local/locks.go index 1e59f39b30dd..4caffcc02f46 100644 --- a/content/local/locks.go +++ b/content/local/locks.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) // Handles locking references diff --git a/content/local/readerat.go b/content/local/readerat.go index a83c171bbd2b..9f77b52c1d93 100644 --- a/content/local/readerat.go +++ b/content/local/readerat.go @@ -21,7 +21,7 @@ import ( "os" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) // readerat implements io.ReaderAt in a completely stateless manner by opening diff --git a/content/local/store.go b/content/local/store.go index 1b01790a5d46..9d3676e2418f 100644 --- a/content/local/store.go +++ b/content/local/store.go @@ -28,10 +28,10 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/opencontainers/go-digest" diff --git a/content/local/store_test.go b/content/local/store_test.go index 0d1619ec8b8a..05eb944d4ea3 100644 --- a/content/local/store_test.go +++ b/content/local/store_test.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/testsuite" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/randutil" "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/local/writer.go b/content/local/writer.go index b187e524cb71..49ac4e5b010e 100644 --- a/content/local/writer.go +++ b/content/local/writer.go @@ -27,8 +27,8 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ) diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go index 217b746516a1..d4d70dfb2fab 100644 --- a/content/proxy/content_store.go +++ b/content/proxy/content_store.go @@ -22,7 +22,7 @@ import ( contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" protobuftypes "github.com/gogo/protobuf/types" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/proxy/content_writer.go b/content/proxy/content_writer.go index ffc0f50ea1bc..31bd9da8d806 100644 --- a/content/proxy/content_writer.go +++ b/content/proxy/content_writer.go @@ -23,7 +23,7 @@ import ( contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index 562f1278594d..baa4515e1e37 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -29,9 +29,9 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 6542333f9f36..4d53d583ccb9 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -21,9 +21,9 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" ) diff --git a/diff.go b/diff.go index 28012b1f02bc..f662e4921fce 100644 --- a/diff.go +++ b/diff.go @@ -22,8 +22,8 @@ import ( diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/apply/apply_linux.go b/diff/apply/apply_linux.go index 55602db625b2..87aceb2fb3eb 100644 --- a/diff/apply/apply_linux.go +++ b/diff/apply/apply_linux.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/errdefs" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error { diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index 3fa19fe6fcc5..8d2a8abae724 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -32,11 +32,11 @@ import ( "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/diff/walking/differ.go b/diff/walking/differ.go index ad20788617d6..39ece75c6139 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 97afb5a5f267..26a7ddfb8c28 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -32,12 +32,12 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/events.go b/events.go index 3577b7c3a9fc..d699dba67c29 100644 --- a/events.go +++ b/events.go @@ -20,8 +20,8 @@ import ( "context" eventsapi "github.com/containerd/containerd/api/services/events/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" ) diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go index 2c193787c4e1..cd112102faf3 100644 --- a/events/exchange/exchange.go +++ b/events/exchange/exchange.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" goevents "github.com/docker/go-events" "github.com/gogo/protobuf/types" diff --git a/events/exchange/exchange_test.go b/events/exchange/exchange_test.go index 8f87cbba24c9..7f61df879735 100644 --- a/events/exchange/exchange_test.go +++ b/events/exchange/exchange_test.go @@ -24,9 +24,9 @@ import ( "time" eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" ) diff --git a/filters/parser.go b/filters/parser.go index 32767909b1c9..f07fd33bd2dd 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) /* diff --git a/identifiers/validate.go b/identifiers/validate.go index cbd3a52ba9e2..0acbf3fc4bb4 100644 --- a/identifiers/validate.go +++ b/identifiers/validate.go @@ -28,7 +28,7 @@ import ( "fmt" "regexp" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) const ( diff --git a/identifiers/validate_test.go b/identifiers/validate_test.go index 77f926c0c389..615e6ab7d2b0 100644 --- a/identifiers/validate_test.go +++ b/identifiers/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func TestValidIdentifiers(t *testing.T) { diff --git a/image.go b/image.go index 59a0db0f2ec6..28b7e215c63c 100644 --- a/image.go +++ b/image.go @@ -26,12 +26,12 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/kmutex" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/image_store.go b/image_store.go index a9702822afe2..06cbd321603c 100644 --- a/image_store.go +++ b/image_store.go @@ -21,8 +21,8 @@ import ( imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/archive/exporter.go b/images/archive/exporter.go index 8e039e779b58..b79b50972486 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -26,9 +26,9 @@ import ( "sort" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/archive/importer.go b/images/archive/importer.go index ea7891f2173a..b94756ea6a00 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -29,10 +29,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/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index ceb998fb8ff6..7c1669ae90e3 100644 --- a/images/converter/uncompress/uncompress.go +++ b/images/converter/uncompress/uncompress.go @@ -23,10 +23,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" "github.com/containerd/containerd/labels" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/handlers.go b/images/handlers.go index 077d88e78774..162e87a862da 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -23,8 +23,8 @@ import ( "sort" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/images/image.go b/images/image.go index d45afe482c90..8bdc5d12ce07 100644 --- a/images/image.go +++ b/images/image.go @@ -24,9 +24,9 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/mediatypes.go b/images/mediatypes.go index d4fa95a3fcbc..480748e49a9f 100644 --- a/images/mediatypes.go +++ b/images/mediatypes.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/import.go b/import.go index 8936d88effd6..13ec391e5b6d 100644 --- a/import.go +++ b/import.go @@ -22,10 +22,10 @@ import ( "io" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/archive" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 963df4572438..9cac741c5f95 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -28,7 +28,6 @@ import ( . "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/log" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/sys" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" "github.com/sirupsen/logrus" diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 34fed5f21e92..20c3011c77d9 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -35,12 +35,12 @@ import ( . "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/sys" + "github.com/containerd/errdefs" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 53cffb6874d1..4cea931dc2b7 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -34,7 +34,6 @@ import ( apievents "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" @@ -44,6 +43,7 @@ import ( _ "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" "github.com/containerd/go-runc" "github.com/containerd/typeurl" gogotypes "github.com/gogo/protobuf/types" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index 6ad760e47e5b..bf917e69a1fe 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -25,8 +25,8 @@ import ( . "github.com/containerd/containerd" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/testsuite" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" ) func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { diff --git a/integration/client/go.mod b/integration/client/go.mod index e6c3cbdfdf87..4067afb8303d 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -6,9 +6,9 @@ require ( github.com/Microsoft/hcsshim v0.9.11 github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 github.com/containerd/cgroups v1.0.4 - // the actual version of containerd is replaced with the code at the root of this repository - github.com/containerd/containerd v1.6.23 + github.com/containerd/containerd v1.6.32 // the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/continuity v0.3.0 + github.com/containerd/errdefs v0.1.0 github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.1.2 github.com/containerd/typeurl v1.0.2 @@ -26,7 +26,6 @@ require ( github.com/Microsoft/go-winio v0.5.3 // indirect github.com/cilium/ebpf v0.7.0 // indirect github.com/containerd/console v1.0.3 // indirect - github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/fifo v1.0.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect diff --git a/integration/client/image_test.go b/integration/client/image_test.go index a3329b50df32..6c78080289e9 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -24,9 +24,9 @@ import ( "testing" . "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 130ee5c0ef4f..4e177bc6c026 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -21,9 +21,9 @@ import ( "testing" . "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" + "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 8948731a35e5..2659c6caac3a 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -25,9 +25,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cri/labels" + "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/integration/restart_test.go b/integration/restart_test.go index 767752ca01a2..a50d2b7ae72e 100644 --- a/integration/restart_test.go +++ b/integration/restart_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/labels/validate.go b/labels/validate.go index 1fd527adb35f..717d3cc218d4 100644 --- a/labels/validate.go +++ b/labels/validate.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) const ( diff --git a/labels/validate_test.go b/labels/validate_test.go index 1368fc5b7d74..146ff47a80bc 100644 --- a/labels/validate_test.go +++ b/labels/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func TestValidLabels(t *testing.T) { diff --git a/leases/proxy/manager.go b/leases/proxy/manager.go index 96cd5e653ba4..0620c24d6f44 100644 --- a/leases/proxy/manager.go +++ b/leases/proxy/manager.go @@ -20,8 +20,8 @@ import ( "context" leasesapi "github.com/containerd/containerd/api/services/leases/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" + "github.com/containerd/errdefs" ) type proxyManager struct { diff --git a/metadata/containers.go b/metadata/containers.go index 97002e5886e1..7286e40ca2ef 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -24,12 +24,12 @@ import ( "time" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" bolt "go.etcd.io/bbolt" diff --git a/metadata/containers_test.go b/metadata/containers_test.go index 71f7d9d1ba5c..932ca284602b 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -27,10 +27,10 @@ import ( "time" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "github.com/gogo/protobuf/types" "github.com/google/go-cmp/cmp" diff --git a/metadata/content.go b/metadata/content.go index 66d0ee263ef6..5c6eec1f0f44 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -26,12 +26,12 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/content_test.go b/metadata/content_test.go index 061095c0f19b..6c2e676b92cd 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/content/testsuite" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/db_test.go b/metadata/db_test.go index 707d9a9f4a69..75c0e0912653 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -32,7 +32,6 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" @@ -40,6 +39,7 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/errdefs" "github.com/gogo/protobuf/types" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/metadata/images.go b/metadata/images.go index 8355b712ef9c..1859af0266f7 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/images_test.go b/metadata/images_test.go index 8903e4616cf7..aea6cc3b7364 100644 --- a/metadata/images_test.go +++ b/metadata/images_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/metadata/leases.go b/metadata/leases.go index 03fa75af3465..7c451e7469f6 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -24,11 +24,11 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/leases_test.go b/metadata/leases_test.go index be120ce7740a..c4cd3d6775c6 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/namespaces.go b/metadata/namespaces.go index 84eb83f2733e..8b6174e35482 100644 --- a/metadata/namespaces.go +++ b/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" l "github.com/containerd/containerd/labels" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/snapshot.go b/metadata/snapshot.go index 59d3c26867d1..08a7564a8a1e 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -24,7 +24,6 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/log" @@ -32,6 +31,7 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/snapshot_test.go b/metadata/snapshot_test.go index 7f9a58ef0ac8..f3bd5af352b7 100644 --- a/metadata/snapshot_test.go +++ b/metadata/snapshot_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index d80d13e0da42..716591ae256b 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -24,12 +24,12 @@ import ( "github.com/containerd/cgroups" eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v1/linux" + "github.com/containerd/errdefs" "github.com/docker/go-metrics" "github.com/sirupsen/logrus" ) diff --git a/namespaces.go b/namespaces.go index 4c66406b084e..7f0026da31e1 100644 --- a/namespaces.go +++ b/namespaces.go @@ -21,8 +21,8 @@ import ( "strings" api "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/gogo/protobuf/types" ) diff --git a/namespaces/context.go b/namespaces/context.go index e5e23fe43014..94ef9408d1d1 100644 --- a/namespaces/context.go +++ b/namespaces/context.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" + "github.com/containerd/errdefs" ) const ( diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 5ea1b8739e1a..8c21b5059964 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" ) // WithNewSnapshot wraps `containerd.WithNewSnapshot` so that if creating the diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 4323681d5de4..670aef845254 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/errdefs" "golang.org/x/net/context" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index ddbd1c914af3..2daa0ecebdac 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -22,9 +22,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 35ec64b50c94..940ab6179ff1 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" "github.com/sirupsen/logrus" diff --git a/pkg/cri/server/container_stats_list_other.go b/pkg/cri/server/container_stats_list_other.go index bed0b6b6a6e7..bed95e248e40 100644 --- a/pkg/cri/server/container_stats_list_other.go +++ b/pkg/cri/server/container_stats_list_other.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerstore "github.com/containerd/containerd/pkg/cri/store/container" diff --git a/pkg/cri/server/container_status.go b/pkg/cri/server/container_status.go index 553ea968fe51..444d48cef1a2 100644 --- a/pkg/cri/server/container_status.go +++ b/pkg/cri/server/container_status.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/errdefs" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/net/context" diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 99487108b833..c5bdf5007bc6 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -23,10 +23,10 @@ import ( "time" eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/errdefs" "github.com/moby/sys/signal" "golang.org/x/net/context" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index 48e6fd6159b6..d8aa019d13c5 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/net/context" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 6622f44e62f4..c240b543e6bf 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -26,12 +26,12 @@ import ( eventtypes "github.com/containerd/containerd/api/events" apitasks "github.com/containerd/containerd/api/services/tasks/v1" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/pkg/cri/constants" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" gogotypes "github.com/gogo/protobuf/types" "github.com/sirupsen/logrus" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 4ee0ae8ffc12..52397b7edb15 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -25,7 +25,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index f73e174dcc47..75b89c2511d6 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -32,6 +31,7 @@ import ( "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go index 6b5e39717c2f..4787c487a6e5 100644 --- a/pkg/cri/server/image_pull.go +++ b/pkg/cri/server/image_pull.go @@ -30,7 +30,6 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" crilabels "github.com/containerd/containerd/pkg/cri/labels" @@ -38,6 +37,7 @@ import ( distribution "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" + "github.com/containerd/errdefs" "github.com/containerd/imgcrypt" "github.com/containerd/imgcrypt/images/encryption" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/cri/server/image_remove.go b/pkg/cri/server/image_remove.go index 8821661b2c4b..d086df2831f5 100644 --- a/pkg/cri/server/image_remove.go +++ b/pkg/cri/server/image_remove.go @@ -19,8 +19,8 @@ package server import ( "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" + "github.com/containerd/errdefs" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/image_status.go b/pkg/cri/server/image_status.go index 884aca441e02..71843aeb8733 100644 --- a/pkg/cri/server/image_status.go +++ b/pkg/cri/server/image_status.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" imagestore "github.com/containerd/containerd/pkg/cri/store/image" + "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/net/context" diff --git a/pkg/cri/server/instrumented_service.go b/pkg/cri/server/instrumented_service.go index e84735517f1f..3bedd6fecb90 100644 --- a/pkg/cri/server/instrumented_service.go +++ b/pkg/cri/server/instrumented_service.go @@ -20,9 +20,9 @@ import ( "errors" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime_alpha "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index f5f3e5083e2c..d8edf78412ee 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 2861ddcae25f..6551f00faa4d 100644 --- a/pkg/cri/server/sandbox_portforward_other.go +++ b/pkg/cri/server/sandbox_portforward_other.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "golang.org/x/net/context" ) diff --git a/pkg/cri/server/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go index 4f5a4f78a210..6c7b01de951d 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -21,8 +21,8 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "golang.org/x/net/context" diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index fa4a9f925489..f3cd8466a8fb 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" cni "github.com/containerd/go-cni" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go index f21391eacacb..307ea9e1b51f 100644 --- a/pkg/cri/server/sandbox_stats_other.go +++ b/pkg/cri/server/sandbox_stats_other.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" ) func (c *criService) podSandboxStats(ctx context.Context, sandbox sandboxstore.Sandbox, stats interface{}) (*runtime.PodSandboxStats, error) { diff --git a/pkg/cri/server/sandbox_stats_windows.go b/pkg/cri/server/sandbox_stats_windows.go index d4b23733794f..7282828c42cf 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -22,8 +22,8 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" ) func (c *criService) podSandboxStats(ctx context.Context, sandbox sandboxstore.Sandbox, stats interface{}) (*runtime.PodSandboxStats, error) { diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go index fd2afc4b55b8..6624ed67f028 100644 --- a/pkg/cri/server/sandbox_status.go +++ b/pkg/cri/server/sandbox_status.go @@ -22,7 +22,7 @@ import ( goruntime "runtime" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" cni "github.com/containerd/go-cni" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/net/context" diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index 963307eb19eb..786fc43b057b 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -23,8 +23,8 @@ import ( "time" eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/snapshots.go b/pkg/cri/server/snapshots.go index ed672752ff88..7c2159bf5d50 100644 --- a/pkg/cri/server/snapshots.go +++ b/pkg/cri/server/snapshots.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 3aa3fe95a6d3..5a4936d84611 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -20,12 +20,12 @@ import ( "sync" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/store" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/pkg/cri/store/truncindex" + "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/store/container/container_test.go b/pkg/cri/store/container/container_test.go index 6f7bd69b6b62..d90728e6f030 100644 --- a/pkg/cri/store/container/container_test.go +++ b/pkg/cri/store/container/container_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" + "github.com/containerd/errdefs" "github.com/opencontainers/selinux/go-selinux" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/errors.go b/pkg/cri/store/errors.go index d8398e45fabc..6461b31d73a1 100644 --- a/pkg/cri/store/errors.go +++ b/pkg/cri/store/errors.go @@ -16,7 +16,7 @@ package store -import "github.com/containerd/containerd/errdefs" +import "github.com/containerd/errdefs" var ( // ErrAlreadyExist is the error returned when data added in the store diff --git a/pkg/cri/store/errors_test.go b/pkg/cri/store/errors_test.go index 11b38bfd70c6..e10efac11bca 100644 --- a/pkg/cri/store/errors_test.go +++ b/pkg/cri/store/errors_test.go @@ -19,7 +19,7 @@ package store import ( "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 1ae4620b5743..48ebe7aeb6c9 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/labels" "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/errdefs" "k8s.io/apimachinery/pkg/util/sets" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/store/image/image_test.go b/pkg/cri/store/image/image_test.go index 72fd22ab69df..88478f9a1f74 100644 --- a/pkg/cri/store/image/image_test.go +++ b/pkg/cri/store/image/image_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "k8s.io/apimachinery/pkg/util/sets" "github.com/opencontainers/go-digest/digestset" diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index d9a55d335eb5..d872ffd6b486 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -20,12 +20,12 @@ import ( "sync" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/store" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/pkg/cri/store/truncindex" "github.com/containerd/containerd/pkg/netns" + "github.com/containerd/errdefs" ) // Sandbox contains all resources associated with the sandbox. All methods to diff --git a/pkg/cri/store/sandbox/sandbox_test.go b/pkg/cri/store/sandbox/sandbox_test.go index 68ff056eaa20..5b2887b9252e 100644 --- a/pkg/cri/store/sandbox/sandbox_test.go +++ b/pkg/cri/store/sandbox/sandbox_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" + "github.com/containerd/errdefs" assertlib "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/snapshot/snapshot.go b/pkg/cri/store/snapshot/snapshot.go index ca046f1a9317..f0d7aee262ac 100644 --- a/pkg/cri/store/snapshot/snapshot.go +++ b/pkg/cri/store/snapshot/snapshot.go @@ -19,8 +19,8 @@ package snapshot import ( "sync" - "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ) // Snapshot contains the information about the snapshot. diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/pkg/cri/store/snapshot/snapshot_test.go index 5c62976c96ec..936547b1898c 100644 --- a/pkg/cri/store/snapshot/snapshot_test.go +++ b/pkg/cri/store/snapshot/snapshot_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" assertlib "github.com/stretchr/testify/assert" ) diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go index 4e62b300d08f..282ae27def21 100644 --- a/pkg/process/deleted_state.go +++ b/pkg/process/deleted_state.go @@ -25,7 +25,7 @@ import ( "fmt" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" google_protobuf "github.com/gogo/protobuf/types" ) diff --git a/pkg/process/exec.go b/pkg/process/exec.go index dcd7592e8108..df707adffed6 100644 --- a/pkg/process/exec.go +++ b/pkg/process/exec.go @@ -32,8 +32,8 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/errdefs" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/process/utils.go b/pkg/process/utils.go index afada02b7b83..51d3c113aa16 100644 --- a/pkg/process/utils.go +++ b/pkg/process/utils.go @@ -31,7 +31,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" "golang.org/x/sys/unix" ) diff --git a/platforms/cpuinfo_linux.go b/platforms/cpuinfo_linux.go index 722d86c3578c..e07aa99cc15b 100644 --- a/platforms/cpuinfo_linux.go +++ b/platforms/cpuinfo_linux.go @@ -24,7 +24,7 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "golang.org/x/sys/unix" ) diff --git a/platforms/cpuinfo_linux_test.go b/platforms/cpuinfo_linux_test.go index c0b8b0f6fae5..b324e7398acc 100644 --- a/platforms/cpuinfo_linux_test.go +++ b/platforms/cpuinfo_linux_test.go @@ -21,7 +21,7 @@ import ( "runtime" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func TestCPUVariant(t *testing.T) { diff --git a/platforms/cpuinfo_other.go b/platforms/cpuinfo_other.go index 51fb62ea7195..a485832c2384 100644 --- a/platforms/cpuinfo_other.go +++ b/platforms/cpuinfo_other.go @@ -23,7 +23,7 @@ import ( "fmt" "runtime" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func getCPUVariant() (string, error) { diff --git a/platforms/platforms.go b/platforms/platforms.go index 234309941803..671537b7e6bc 100644 --- a/platforms/platforms.go +++ b/platforms/platforms.go @@ -114,7 +114,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" specs "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/plugin/context.go b/plugin/context.go index 370508d28d15..d084564ea280 100644 --- a/plugin/context.go +++ b/plugin/context.go @@ -23,8 +23,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" + "github.com/containerd/errdefs" ) // InitContext is used for plugin initialization diff --git a/process.go b/process.go index 297c77ab6e03..6d6d167766c8 100644 --- a/process.go +++ b/process.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) // Process represents a system process diff --git a/pull.go b/pull.go index e4232f4cbd82..d28817a3b412 100644 --- a/pull.go +++ b/pull.go @@ -25,12 +25,12 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/schema1" + "github.com/containerd/errdefs" ) // Pull downloads the provided content into containerd's content store diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go index f872af775416..0bf06e108f6b 100644 --- a/remotes/docker/authorizer.go +++ b/remotes/docker/authorizer.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" ) diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go index 606872deee86..7cc76b8531a0 100644 --- a/remotes/docker/config/hosts.go +++ b/remotes/docker/config/hosts.go @@ -32,9 +32,9 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/errdefs" "github.com/pelletier/go-toml" ) diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index 11a75356e804..f2e051e41ea6 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -26,9 +26,9 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/httpreadseeker.go b/remotes/docker/httpreadseeker.go index 9a827ef04c25..9b0d3db90fc0 100644 --- a/remotes/docker/httpreadseeker.go +++ b/remotes/docker/httpreadseeker.go @@ -21,8 +21,8 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" ) const maxRetry = 3 diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index b5e65d73d27e..2debcb402548 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -29,11 +29,11 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" remoteserrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index f1b092b19fc4..7dfdfb2a2564 100644 --- a/remotes/docker/pusher_test.go +++ b/remotes/docker/pusher_test.go @@ -30,9 +30,9 @@ import ( "testing" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index 92744c39e6a8..5afb0f420cae 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,7 +28,6 @@ import ( "path" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/reference" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/remotes/docker/schema1" remoteerrors "github.com/containerd/containerd/remotes/errors" "github.com/containerd/containerd/version" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index efa4e8d6eeb3..e3e8cbac02bd 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -31,10 +31,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/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/status.go b/remotes/docker/status.go index 1a9227725bb3..c7764758f0ef 100644 --- a/remotes/docker/status.go +++ b/remotes/docker/status.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index 7d41b1e25a75..030d2e26a56e 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -25,10 +25,10 @@ import ( "sync" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" "golang.org/x/sync/semaphore" diff --git a/rootfs/apply.go b/rootfs/apply.go index 35eae6d63de1..097c5aa6faf1 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -24,10 +24,10 @@ import ( "time" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/runtime/v1/linux/process.go b/runtime/v1/linux/process.go index b7f9e0dc53b4..19071eb3a82a 100644 --- a/runtime/v1/linux/process.go +++ b/runtime/v1/linux/process.go @@ -25,9 +25,9 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/runtime" shim "github.com/containerd/containerd/runtime/v1/shim/v1" + "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ) diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go index b6d53820a859..bc103e639864 100644 --- a/runtime/v1/linux/runtime.go +++ b/runtime/v1/linux/runtime.go @@ -31,7 +31,6 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/log" @@ -45,6 +44,7 @@ import ( "github.com/containerd/containerd/runtime/linux/runctypes" v1 "github.com/containerd/containerd/runtime/v1" "github.com/containerd/containerd/runtime/v1/shim/v1" + "github.com/containerd/errdefs" "github.com/containerd/go-runc" "github.com/containerd/typeurl" ptypes "github.com/gogo/protobuf/types" diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go index be1d5b8322c3..d89443702859 100644 --- a/runtime/v1/linux/task.go +++ b/runtime/v1/linux/task.go @@ -29,13 +29,13 @@ import ( "github.com/containerd/cgroups" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/log" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v1/shim/client" "github.com/containerd/containerd/runtime/v1/shim/v1" + "github.com/containerd/errdefs" "github.com/containerd/ttrpc" "github.com/containerd/typeurl" "github.com/gogo/protobuf/types" diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go index a08757d0a7b9..ad77a4736375 100644 --- a/runtime/v1/shim/service.go +++ b/runtime/v1/shim/service.go @@ -30,7 +30,6 @@ import ( "github.com/containerd/console" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" @@ -41,6 +40,7 @@ import ( "github.com/containerd/containerd/runtime/linux/runctypes" shimapi "github.com/containerd/containerd/runtime/v1/shim/v1" "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" "github.com/containerd/typeurl" ptypes "github.com/gogo/protobuf/types" diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index 85ce9302ee8c..efa9ed7f4891 100644 --- a/runtime/v2/example/example.go +++ b/runtime/v2/example/example.go @@ -23,9 +23,9 @@ import ( "context" "os" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/runtime/v2/shim" taskAPI "github.com/containerd/containerd/runtime/v2/task" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" ) diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 1927cbb3f0c3..691b5a6eceba 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -25,7 +25,6 @@ import ( "sync" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/runtime" shimbinary "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/runtime/v2/task" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/runtime/v2/process.go b/runtime/v2/process.go index 84c90c74a579..ea71f55661cd 100644 --- a/runtime/v2/process.go +++ b/runtime/v2/process.go @@ -21,9 +21,9 @@ import ( "errors" tasktypes "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/task" + "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index aac9dad7e916..87a467aa099a 100644 --- a/runtime/v2/runc/container.go +++ b/runtime/v2/runc/container.go @@ -30,13 +30,13 @@ import ( "github.com/containerd/cgroups" cgroupsv2 "github.com/containerd/cgroups/v2" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/process" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/task" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go index 3b4bbb862d02..aaa2c85d8cd6 100644 --- a/runtime/v2/runc/task/service.go +++ b/runtime/v2/runc/task/service.go @@ -29,7 +29,6 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v2" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/oom" oomv1 "github.com/containerd/containerd/pkg/oom/v1" @@ -44,6 +43,7 @@ import ( shimapi "github.com/containerd/containerd/runtime/v2/task" taskAPI "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" "github.com/containerd/ttrpc" "github.com/containerd/typeurl" diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index 8c473430e218..00c87161b4e4 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -33,7 +33,6 @@ import ( "github.com/containerd/cgroups" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/oom" @@ -46,6 +45,7 @@ import ( "github.com/containerd/containerd/runtime/v2/shim" taskAPI "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" "github.com/containerd/typeurl" "github.com/gogo/protobuf/proto" diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 456ffb4409bd..f1d0e794e539 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -28,7 +28,6 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" tasktypes "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/log" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/runtime" client "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/runtime/v2/task" + "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ptypes "github.com/gogo/protobuf/types" "github.com/hashicorp/go-multierror" diff --git a/services/containers/local.go b/services/containers/local.go index 843512e0e98a..ffdca2b5a2ce 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -23,11 +23,11 @@ import ( eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index eb5855a476c4..7025359c8a7d 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -24,8 +24,8 @@ import ( api "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/diff/local.go b/services/diff/local.go index 7d0f071672fb..0de4dda291dc 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -23,10 +23,10 @@ import ( diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" ) diff --git a/services/events/service.go b/services/events/service.go index 3b5f811382b7..c0780258203b 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -22,10 +22,10 @@ import ( api "github.com/containerd/containerd/api/services/events/v1" apittrpc "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ptypes "github.com/gogo/protobuf/types" "google.golang.org/grpc" diff --git a/services/events/ttrpc.go b/services/events/ttrpc.go index b1f28df19495..35f29a7eadfa 100644 --- a/services/events/ttrpc.go +++ b/services/events/ttrpc.go @@ -20,9 +20,9 @@ import ( "context" api "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" ) diff --git a/services/images/local.go b/services/images/local.go index 7cda6847b2af..7106813248c1 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -26,7 +26,6 @@ import ( eventstypes "github.com/containerd/containerd/api/events" imagesapi "github.com/containerd/containerd/api/services/images/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/introspection/introspection.go b/services/introspection/introspection.go index 71758fad88b8..a4a759df3994 100644 --- a/services/introspection/introspection.go +++ b/services/introspection/introspection.go @@ -20,8 +20,8 @@ import ( context "context" api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" ) diff --git a/services/introspection/local.go b/services/introspection/local.go index 17714796ba84..dd0824d956ac 100644 --- a/services/introspection/local.go +++ b/services/introspection/local.go @@ -31,11 +31,11 @@ import ( api "github.com/containerd/containerd/api/services/introspection/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/leases/service.go b/services/leases/service.go index 75afa4f15804..3fce809b3b72 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -21,10 +21,10 @@ import ( "errors" api "github.com/containerd/containerd/api/services/leases/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" "google.golang.org/grpc" ) diff --git a/services/namespaces/local.go b/services/namespaces/local.go index c45ae807426c..3f01e01b1087 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -22,12 +22,12 @@ import ( eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" diff --git a/services/server/config/config.go b/services/server/config/config.go index 0ddac5a6cd84..1e592d4146e3 100644 --- a/services/server/config/config.go +++ b/services/server/config/config.go @@ -25,8 +25,8 @@ import ( "github.com/pelletier/go-toml" "github.com/sirupsen/logrus" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" ) // NOTE: Any new map fields added also need to be handled in mergeConfig. diff --git a/services/snapshots/service.go b/services/snapshots/service.go index bda92065b3d8..0ff13d19da56 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -22,7 +22,6 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/deprecation" @@ -30,6 +29,7 @@ import ( "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ptypes "github.com/gogo/protobuf/types" "google.golang.org/grpc" ) diff --git a/services/tasks/local.go b/services/tasks/local.go index 40f6979e7db2..cdbadbce1966 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -39,7 +39,6 @@ import ( "github.com/containerd/containerd/archive" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" @@ -54,6 +53,7 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" ) var ( diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index 1e2977966bc3..943185ea8b4d 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -28,12 +28,12 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/errdefs" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" exec "golang.org/x/sys/execabs" diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index 8c911c05264b..f358d0540a95 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -34,13 +34,13 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 00c320c60872..cbf51bc513ec 100644 --- a/snapshots/proxy/proxy.go +++ b/snapshots/proxy/proxy.go @@ -22,9 +22,9 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" protobuftypes "github.com/gogo/protobuf/types" ) diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 894ac2e022fc..3e8e8e45efac 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go index 16847068d1b0..e4a0bf097093 100644 --- a/snapshots/storage/metastore_test.go +++ b/snapshots/storage/metastore_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index e5a86cec9347..f8af1b43afc0 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" @@ -35,6 +34,7 @@ import ( "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/continuity/fs/fstest" + "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go index 820f9858f8b2..49574b5fb8d3 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -35,7 +35,6 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/computestorage" "github.com/Microsoft/hcsshim/pkg/ociwclayer" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" @@ -43,6 +42,7 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/task.go b/task.go index ef8cd44942cf..fc45fa78aed8 100644 --- a/task.go +++ b/task.go @@ -33,7 +33,6 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" @@ -41,6 +40,7 @@ import ( "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" google_protobuf "github.com/gogo/protobuf/types" digest "github.com/opencontainers/go-digest" diff --git a/task_opts.go b/task_opts.go index 67e652732523..220f2d6739f3 100644 --- a/task_opts.go +++ b/task_opts.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index 5d2877206b95..69eeee22b044 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -24,12 +24,12 @@ import ( "strconv" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/deprecation" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services/warning" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" diff --git a/unpacker.go b/unpacker.go index 16bc240c1776..639b6c9226d5 100644 --- a/unpacker.go +++ b/unpacker.go @@ -28,13 +28,13 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/kmutex" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1"