diff --git a/client/client.go b/client/client.go index 6c4794935..d1c607362 100644 --- a/client/client.go +++ b/client/client.go @@ -40,8 +40,8 @@ import ( versionservice "github.com/containerd/containerd/v2/api/services/version/v1" apitypes "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" - contentproxy "github.com/containerd/containerd/v2/content/proxy" + "github.com/containerd/containerd/v2/core/content" + contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" diff --git a/client/container_opts.go b/client/container_opts.go index a4e16e4ff..2790733ef 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index da61c9986..16324b3df 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/image.go b/client/image.go index 9836a6faa..59b6a8653 100644 --- a/client/image.go +++ b/client/image.go @@ -23,7 +23,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/client/install.go b/client/install.go index 1e50ebd1d..37b0119ea 100644 --- a/client/install.go +++ b/client/install.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ) diff --git a/client/services.go b/client/services.go index ab8b15ff7..37c491c51 100644 --- a/client/services.go +++ b/client/services.go @@ -26,7 +26,7 @@ import ( namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/signals.go b/client/signals.go index c9d26a448..ed1b56311 100644 --- a/client/signals.go +++ b/client/signals.go @@ -22,7 +22,7 @@ import ( "fmt" "syscall" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/moby/sys/signal" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/task.go b/client/task.go index ae733e6d8..08663ff7b 100644 --- a/client/task.go +++ b/client/task.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index f676c70ee..d6e7b5cc3 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -28,7 +28,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 6c4908052..17deb21b6 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -28,7 +28,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/progress" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index bae3698e0..9afd35781 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -22,7 +22,7 @@ import ( "unicode" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/leases" "github.com/containerd/log" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index b10c7c841..f0c8c89c7 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/progress" diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index 9762fb590..d3f014e79 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -29,7 +29,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 1a3b229cd..a9325174a 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -27,7 +27,7 @@ import ( bolt "go.etcd.io/bbolt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" diff --git a/content/adaptor.go b/core/content/adaptor.go similarity index 100% rename from content/adaptor.go rename to core/content/adaptor.go diff --git a/content/adaptor_test.go b/core/content/adaptor_test.go similarity index 100% rename from content/adaptor_test.go rename to core/content/adaptor_test.go diff --git a/content/content.go b/core/content/content.go similarity index 100% rename from content/content.go rename to core/content/content.go diff --git a/content/helpers.go b/core/content/helpers.go similarity index 100% rename from content/helpers.go rename to core/content/helpers.go diff --git a/content/helpers_test.go b/core/content/helpers_test.go similarity index 100% rename from content/helpers_test.go rename to core/content/helpers_test.go diff --git a/content/proxy/content_reader.go b/core/content/proxy/content_reader.go similarity index 100% rename from content/proxy/content_reader.go rename to core/content/proxy/content_reader.go diff --git a/content/proxy/content_store.go b/core/content/proxy/content_store.go similarity index 99% rename from content/proxy/content_store.go rename to core/content/proxy/content_store.go index 609dad4df..107193a7c 100644 --- a/content/proxy/content_store.go +++ b/core/content/proxy/content_store.go @@ -21,7 +21,7 @@ import ( "io" contentapi "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/content/proxy/content_writer.go b/core/content/proxy/content_writer.go similarity index 98% rename from content/proxy/content_writer.go rename to core/content/proxy/content_writer.go index 30f759291..3fac000e4 100644 --- a/content/proxy/content_writer.go +++ b/core/content/proxy/content_writer.go @@ -22,7 +22,7 @@ import ( "io" contentapi "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" digest "github.com/opencontainers/go-digest" diff --git a/content/testsuite/testsuite.go b/core/content/testsuite/testsuite.go similarity index 99% rename from content/testsuite/testsuite.go rename to core/content/testsuite/testsuite.go index d673c8cf0..46b31de4f 100644 --- a/content/testsuite/testsuite.go +++ b/core/content/testsuite/testsuite.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/log/logtest" diff --git a/diff/apply/apply.go b/diff/apply/apply.go index fb83dafaa..35116714a 100644 --- a/diff/apply/apply.go +++ b/diff/apply/apply.go @@ -22,7 +22,7 @@ import ( "io" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/log" diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index 8bd142eaf..fca3b8562 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -30,7 +30,7 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" diff --git a/diff/walking/differ.go b/diff/walking/differ.go index 2f94b3be2..6eebe159f 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" diff --git a/diff/windows/cimfs.go b/diff/windows/cimfs.go index 3d2831a21..d0f0c93b3 100644 --- a/diff/windows/cimfs.go +++ b/diff/windows/cimfs.go @@ -25,7 +25,7 @@ import ( "github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 93d00be10..ed27bd3c9 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -30,7 +30,7 @@ import ( "github.com/Microsoft/go-winio" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" diff --git a/images/archive/exporter.go b/images/archive/exporter.go index 79f5e2632..30acd9879 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -26,7 +26,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/images/archive/importer.go b/images/archive/importer.go index b9eb095ec..57cf81e13 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -28,7 +28,7 @@ import ( "path" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/images/converter/converter.go b/images/converter/converter.go index a978787bd..2601bc9f9 100644 --- a/images/converter/converter.go +++ b/images/converter/converter.go @@ -20,7 +20,7 @@ package converter import ( "context" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/platforms" diff --git a/images/converter/default.go b/images/converter/default.go index f44a2247b..7f4021d8e 100644 --- a/images/converter/default.go +++ b/images/converter/default.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index bf757fb1e..b3162fe24 100644 --- a/images/converter/uncompress/uncompress.go +++ b/images/converter/uncompress/uncompress.go @@ -22,7 +22,7 @@ import ( "io" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/converter" diff --git a/images/diffid.go b/images/diffid.go index 95ba3df89..50cdddd18 100644 --- a/images/diffid.go +++ b/images/diffid.go @@ -24,7 +24,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ) diff --git a/images/handlers.go b/images/handlers.go index 44a6a93f4..f3a28ac9e 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -22,7 +22,7 @@ import ( "fmt" "sort" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/image.go b/images/image.go index 68065a447..a06525042 100644 --- a/images/image.go +++ b/images/image.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/imagetest/content.go b/images/imagetest/content.go index 2561c73ac..e84f249d1 100644 --- a/images/imagetest/content.go +++ b/images/imagetest/content.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/images/importexport.go b/images/importexport.go index fe5d29f1f..601d545ef 100644 --- a/images/importexport.go +++ b/images/importexport.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/usage/calculator.go b/images/usage/calculator.go index 88efd9e2f..fb98d4af4 100644 --- a/images/usage/calculator.go +++ b/images/usage/calculator.go @@ -21,7 +21,7 @@ import ( "strings" "sync/atomic" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 6cb14eb5c..f5ae32526 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -24,7 +24,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index b8c533bc6..f688b25c9 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -23,8 +23,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" ) diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 1abc3613e..6c384dcb7 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -26,7 +26,7 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index b52cb16ab..9248e4ab6 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -35,7 +35,7 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/leases" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index a1a40447e..6af7dc2e4 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -39,7 +39,7 @@ import ( "github.com/stretchr/testify/assert" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index d40070958..fda40164b 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/metadata/content.go b/metadata/content.go index 5394e0740..5e3e5fd51 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" diff --git a/metadata/content_test.go b/metadata/content_test.go index 0f87e12ef..51047d6e3 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "testing" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/leases" diff --git a/metadata/db.go b/metadata/db.go index d6857b843..d3ac3af68 100644 --- a/metadata/db.go +++ b/metadata/db.go @@ -27,7 +27,7 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/db_test.go b/metadata/db_test.go index df3b3fd00..664586a32 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -30,7 +30,7 @@ import ( "time" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/images" diff --git a/metadata/plugin/plugin.go b/metadata/plugin/plugin.go index babae1a7b..a3da76f7d 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -22,7 +22,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" diff --git a/oci/client.go b/oci/client.go index 3d28832cf..9c21ab3a7 100644 --- a/oci/client.go +++ b/oci/client.go @@ -19,7 +19,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 2a900f81d..6e18ff6a2 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -30,7 +30,7 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 0a31eb389..0cf05e4b8 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -37,7 +37,7 @@ import ( "github.com/stretchr/testify/require" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" ) diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 0fc170c0d..1114a9386 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -21,7 +21,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/images" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 1117f697a..ea8e08564 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/usage" diff --git a/pkg/display/manifest_printer.go b/pkg/display/manifest_printer.go index 64738bd87..e9e846da7 100644 --- a/pkg/display/manifest_printer.go +++ b/pkg/display/manifest_printer.go @@ -25,7 +25,7 @@ import ( "os" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index b2cdf8689..97440bed7 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index e1f50f330..ba7e46a1f 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -24,7 +24,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" transferapi "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 68fd34913..e1aee0025 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index d9506958b..3867215f8 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -23,7 +23,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/pkg/transfer/local/progress.go b/pkg/transfer/local/progress.go index 7e66a08ff..a130e7f54 100644 --- a/pkg/transfer/local/progress.go +++ b/pkg/transfer/local/progress.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index d116dedc7..41b036d7e 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 985feb584..9e84de092 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index e70439c93..8079e6f70 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/typeurl/v2" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index a8fdb9582..9ea4e1699 100644 --- a/pkg/transfer/transfer.go +++ b/pkg/transfer/transfer.go @@ -22,7 +22,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 417ab6e30..c2d29209e 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/plugins/content/local/content_local_fuzzer.go b/plugins/content/local/content_local_fuzzer.go index fb1a15393..39ec84b37 100644 --- a/plugins/content/local/content_local_fuzzer.go +++ b/plugins/content/local/content_local_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/go-digest" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ) func FuzzContentStoreWriter(data []byte) int { diff --git a/plugins/content/local/readerat.go b/plugins/content/local/readerat.go index 692630b27..48c95a1e7 100644 --- a/plugins/content/local/readerat.go +++ b/plugins/content/local/readerat.go @@ -21,7 +21,7 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" ) diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index 7af3d2ae9..d2aee9eab 100644 --- a/plugins/content/local/store.go +++ b/plugins/content/local/store.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/log" diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 4abceb6eb..a5867d11f 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -32,8 +32,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" diff --git a/plugins/content/local/test_helper.go b/plugins/content/local/test_helper.go index b3a8f860b..a4c238c47 100644 --- a/plugins/content/local/test_helper.go +++ b/plugins/content/local/test_helper.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ) func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) { diff --git a/plugins/content/local/writer.go b/plugins/content/local/writer.go index d22c3365c..a35ca20c4 100644 --- a/plugins/content/local/writer.go +++ b/plugins/content/local/writer.go @@ -26,7 +26,7 @@ import ( "runtime" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index e173d3e42..4dc7673e7 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -22,7 +22,7 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 3a0f8d961..042ca3c29 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -22,7 +22,7 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/reference" diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index f0bc4a38b..abfad23f1 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index a86102565..29b9e3a04 100644 --- a/remotes/docker/pusher_test.go +++ b/remotes/docker/pusher_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/remotes" diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 5e6cbc705..bca146be4 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -33,7 +33,7 @@ import ( "time" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/remotes/docker/status.go b/remotes/docker/status.go index ada761148..f7deb7227 100644 --- a/remotes/docker/status.go +++ b/remotes/docker/status.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index 507e2dfd3..d4f8302a6 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 9a7a5dbaf..0ce6683db 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/remotes/resolver.go b/remotes/resolver.go index e784426fe..c39b93785 100644 --- a/remotes/resolver.go +++ b/remotes/resolver.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index cd58d8776..736a9c349 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -23,7 +23,7 @@ import ( "sync" api "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/services/content/service.go b/services/content/service.go index 2d8b810d6..0ad90233d 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -17,7 +17,7 @@ package content import ( - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services/content/contentserver" diff --git a/services/content/store.go b/services/content/store.go index 85005c8e0..6164ca6c4 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -20,7 +20,7 @@ import ( "context" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" diff --git a/services/server/server.go b/services/server/server.go index 861079099..93f0fb247 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -50,7 +50,7 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" - csproxy "github.com/containerd/containerd/v2/content/proxy" + csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/diff" diffproxy "github.com/containerd/containerd/v2/diff/proxy" diff --git a/services/tasks/local.go b/services/tasks/local.go index 138f6d228..2c970f031 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters"