diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index c49990835..aa2fa6443 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -26,8 +26,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/content/local" imageArchive "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index c3b493c8f..9762fb590 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -30,8 +30,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/plugins/content/local" ) // checkBlobPath performs some basic validation diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index b49ba495a..7084c6c55 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -21,10 +21,10 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/diff/apply" "github.com/containerd/containerd/v2/diff/walking" "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index dc4c527d8..006bdf0ad 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -20,9 +20,9 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a1a803590..1a3b229cd 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/native" ) diff --git a/images/imagetest/content.go b/images/imagetest/content.go index 25db43f91..2561c73ac 100644 --- a/images/imagetest/content.go +++ b/images/imagetest/content.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/metadata/content_test.go b/metadata/content_test.go index 6b7344923..0f87e12ef 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -26,12 +26,12 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "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 234aecdba..df3b3fd00 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -31,12 +31,12 @@ import ( "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/native" diff --git a/content/local/content_local_fuzzer.go b/plugins/content/local/content_local_fuzzer.go similarity index 100% rename from content/local/content_local_fuzzer.go rename to plugins/content/local/content_local_fuzzer.go diff --git a/content/local/locks.go b/plugins/content/local/locks.go similarity index 100% rename from content/local/locks.go rename to plugins/content/local/locks.go diff --git a/content/local/locks_test.go b/plugins/content/local/locks_test.go similarity index 100% rename from content/local/locks_test.go rename to plugins/content/local/locks_test.go diff --git a/content/local/readerat.go b/plugins/content/local/readerat.go similarity index 100% rename from content/local/readerat.go rename to plugins/content/local/readerat.go diff --git a/content/local/store.go b/plugins/content/local/store.go similarity index 100% rename from content/local/store.go rename to plugins/content/local/store.go diff --git a/content/local/store_bsd.go b/plugins/content/local/store_bsd.go similarity index 100% rename from content/local/store_bsd.go rename to plugins/content/local/store_bsd.go diff --git a/content/local/store_openbsd.go b/plugins/content/local/store_openbsd.go similarity index 100% rename from content/local/store_openbsd.go rename to plugins/content/local/store_openbsd.go diff --git a/content/local/store_test.go b/plugins/content/local/store_test.go similarity index 100% rename from content/local/store_test.go rename to plugins/content/local/store_test.go diff --git a/content/local/store_unix.go b/plugins/content/local/store_unix.go similarity index 100% rename from content/local/store_unix.go rename to plugins/content/local/store_unix.go diff --git a/content/local/store_windows.go b/plugins/content/local/store_windows.go similarity index 100% rename from content/local/store_windows.go rename to plugins/content/local/store_windows.go diff --git a/content/local/test_helper.go b/plugins/content/local/test_helper.go similarity index 100% rename from content/local/test_helper.go rename to plugins/content/local/test_helper.go diff --git a/content/local/writer.go b/plugins/content/local/writer.go similarity index 100% rename from content/local/writer.go rename to plugins/content/local/writer.go diff --git a/remotes/docker/converter_fuzz.go b/remotes/docker/converter_fuzz.go index ebaff0583..c97b6b899 100644 --- a/remotes/docker/converter_fuzz.go +++ b/remotes/docker/converter_fuzz.go @@ -23,7 +23,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 42bbc8097..9a7a5dbaf 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/server/server.go b/services/server/server.go index 07d527b50..861079099 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -50,7 +50,6 @@ 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" - "github.com/containerd/containerd/v2/content/local" csproxy "github.com/containerd/containerd/v2/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/diff" @@ -60,6 +59,7 @@ import ( "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/content/local" sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning"