diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 75ac481be..a7e56279c 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/adaptors.go b/core/metadata/adaptors.go similarity index 100% rename from metadata/adaptors.go rename to core/metadata/adaptors.go diff --git a/metadata/bolt.go b/core/metadata/bolt.go similarity index 100% rename from metadata/bolt.go rename to core/metadata/bolt.go diff --git a/metadata/boltutil/helpers.go b/core/metadata/boltutil/helpers.go similarity index 100% rename from metadata/boltutil/helpers.go rename to core/metadata/boltutil/helpers.go diff --git a/metadata/buckets.go b/core/metadata/buckets.go similarity index 100% rename from metadata/buckets.go rename to core/metadata/buckets.go diff --git a/metadata/compare_test.go b/core/metadata/compare_test.go similarity index 100% rename from metadata/compare_test.go rename to core/metadata/compare_test.go diff --git a/metadata/containers.go b/core/metadata/containers.go similarity index 99% rename from metadata/containers.go rename to core/metadata/containers.go index 056065ffd..7c89ed288 100644 --- a/metadata/containers.go +++ b/core/metadata/containers.go @@ -24,11 +24,11 @@ import ( "time" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/metadata/containers_test.go b/core/metadata/containers_test.go similarity index 100% rename from metadata/containers_test.go rename to core/metadata/containers_test.go diff --git a/metadata/content.go b/core/metadata/content.go similarity index 99% rename from metadata/content.go rename to core/metadata/content.go index 5e3e5fd51..881174cd2 100644 --- a/metadata/content.go +++ b/core/metadata/content.go @@ -26,10 +26,10 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/metadata/content_test.go b/core/metadata/content_test.go similarity index 100% rename from metadata/content_test.go rename to core/metadata/content_test.go diff --git a/metadata/db.go b/core/metadata/db.go similarity index 100% rename from metadata/db.go rename to core/metadata/db.go diff --git a/metadata/db_test.go b/core/metadata/db_test.go similarity index 100% rename from metadata/db_test.go rename to core/metadata/db_test.go diff --git a/metadata/gc.go b/core/metadata/gc.go similarity index 100% rename from metadata/gc.go rename to core/metadata/gc.go diff --git a/metadata/gc_test.go b/core/metadata/gc_test.go similarity index 99% rename from metadata/gc_test.go rename to core/metadata/gc_test.go index e6edb0c2f..7cf79b626 100644 --- a/metadata/gc_test.go +++ b/core/metadata/gc_test.go @@ -28,8 +28,8 @@ import ( "text/tabwriter" "time" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/metadata/images.go b/core/metadata/images.go similarity index 99% rename from metadata/images.go rename to core/metadata/images.go index 75de608f6..0c8fce159 100644 --- a/metadata/images.go +++ b/core/metadata/images.go @@ -26,10 +26,10 @@ import ( "time" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" digest "github.com/opencontainers/go-digest" diff --git a/metadata/images_test.go b/core/metadata/images_test.go similarity index 100% rename from metadata/images_test.go rename to core/metadata/images_test.go diff --git a/metadata/leases.go b/core/metadata/leases.go similarity index 99% rename from metadata/leases.go rename to core/metadata/leases.go index 30ad0ed4f..1f2457207 100644 --- a/metadata/leases.go +++ b/core/metadata/leases.go @@ -25,9 +25,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" diff --git a/metadata/leases_test.go b/core/metadata/leases_test.go similarity index 100% rename from metadata/leases_test.go rename to core/metadata/leases_test.go diff --git a/metadata/migrations.go b/core/metadata/migrations.go similarity index 100% rename from metadata/migrations.go rename to core/metadata/migrations.go diff --git a/metadata/namespaces.go b/core/metadata/namespaces.go similarity index 100% rename from metadata/namespaces.go rename to core/metadata/namespaces.go diff --git a/metadata/namespaces_test.go b/core/metadata/namespaces_test.go similarity index 100% rename from metadata/namespaces_test.go rename to core/metadata/namespaces_test.go diff --git a/metadata/sandbox.go b/core/metadata/sandbox.go similarity index 99% rename from metadata/sandbox.go rename to core/metadata/sandbox.go index 451871bc2..9d7b84efc 100644 --- a/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -23,10 +23,10 @@ import ( "strings" "time" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" diff --git a/metadata/sandbox_test.go b/core/metadata/sandbox_test.go similarity index 100% rename from metadata/sandbox_test.go rename to core/metadata/sandbox_test.go diff --git a/metadata/snapshot.go b/core/metadata/snapshot.go similarity index 99% rename from metadata/snapshot.go rename to core/metadata/snapshot.go index a55ff3373..246c01e15 100644 --- a/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -25,10 +25,10 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/snapshot_test.go b/core/metadata/snapshot_test.go similarity index 100% rename from metadata/snapshot_test.go rename to core/metadata/snapshot_test.go diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index b771268b1..f1fba8393 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -22,8 +22,8 @@ import ( "path/filepath" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index b42eacc74..7b00a6179 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -32,8 +32,8 @@ import ( "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go index ba4d7815e..cc2f27ccd 100644 --- a/plugins/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -19,7 +19,7 @@ package plugin import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff/apply" - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/diff/walking" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 544f3881c..869d21457 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index 26e88af36..0d2ef56fd 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/platforms" diff --git a/plugins/leases/local.go b/plugins/leases/local.go index b6ac1f9aa..10c435559 100644 --- a/plugins/leases/local.go +++ b/plugins/leases/local.go @@ -20,8 +20,8 @@ import ( "context" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index a3da76f7d..827a9b725 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/snapshots" diff --git a/plugins/sandbox/store.go b/plugins/sandbox/store.go index 7f5920324..dde69c957 100644 --- a/plugins/sandbox/store.go +++ b/plugins/sandbox/store.go @@ -17,7 +17,7 @@ package sandbox import ( - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index ac24854d9..1cfad3b64 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -22,9 +22,9 @@ import ( "sync" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index 4d637b656..ce6120254 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -21,9 +21,9 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/transfer/local" "github.com/containerd/containerd/v2/pkg/unpack" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index fbd28fb3b..8b6dc7aa8 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -27,9 +27,9 @@ import ( "sync" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events/exchange" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/timeout" diff --git a/services/containers/local.go b/services/containers/local.go index 1557e06d1..a254d8496 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -23,9 +23,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/services" diff --git a/services/content/store.go b/services/content/store.go index 6164ca6c4..bca229d73 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -21,8 +21,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" diff --git a/services/images/local.go b/services/images/local.go index a46248a9e..f31dcd8bf 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -27,10 +27,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/plugins" diff --git a/services/namespaces/local.go b/services/namespaces/local.go index 2a6dc8d77..48d6e8444 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -22,9 +22,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/services/snapshots/snapshotters.go b/services/snapshots/snapshotters.go index ecc67d4ac..6364b580b 100644 --- a/services/snapshots/snapshotters.go +++ b/services/snapshots/snapshotters.go @@ -17,7 +17,7 @@ package snapshots import ( - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" diff --git a/services/tasks/local.go b/services/tasks/local.go index e671a4990..054835592 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/rdt" diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 942d48451..aebe5ac44 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -25,9 +25,9 @@ import ( "strings" "time" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/snapshots" bolt "go.etcd.io/bbolt" )