From 18b3cbe4fa28daed5b983946f470412bbd543b3b Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:54 -0800 Subject: [PATCH] Move metadata/plugin to plugins/metadata Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {metadata/plugin => plugins/metadata}/plugin.go | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {metadata/plugin => plugins/metadata}/plugin.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index caf7866c5..6827c166f 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -20,11 +20,11 @@ package builtins import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index c5ba26fa2..a3a88336b 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -20,13 +20,13 @@ import ( // base containerd imports _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 0616a11e3..4a4344a8b 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -36,10 +36,10 @@ import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/services/containers" diff --git a/metadata/plugin/plugin.go b/plugins/metadata/plugin.go similarity index 100% rename from metadata/plugin/plugin.go rename to plugins/metadata/plugin.go