From 2909f07f8583c6430a77a67e8690965260cd1957 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:06 -0800 Subject: [PATCH] Move snapshots/blockfile to plugins/snapshots/blockfile Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_linux.go | 2 +- cmd/containerd/builtins/builtins_unix.go | 2 +- contrib/fuzz/builtins_linux.go | 2 +- contrib/fuzz/builtins_unix.go | 2 +- {snapshots => plugins/snapshots}/blockfile/blockfile.go | 0 .../snapshots}/blockfile/blockfile_loopsetup_test.go | 0 .../snapshots}/blockfile/blockfile_other_test.go | 0 {snapshots => plugins/snapshots}/blockfile/blockfile_test.go | 0 {snapshots => plugins/snapshots}/blockfile/plugin/plugin.go | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename {snapshots => plugins/snapshots}/blockfile/blockfile.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_loopsetup_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_other_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/plugin/plugin.go (97%) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index a2f86d057..9c749c082 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -19,8 +19,8 @@ package builtins import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index b6d98c162..b8bfc0f52 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -19,6 +19,6 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index 33b05cd20..b0341eeac 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -20,8 +20,8 @@ import ( // Linux specific imports _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_unix.go b/contrib/fuzz/builtins_unix.go index 7b25afe01..0a7df1187 100644 --- a/contrib/fuzz/builtins_unix.go +++ b/contrib/fuzz/builtins_unix.go @@ -20,6 +20,6 @@ package fuzz import ( // Unix specific imports - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/snapshots/blockfile/blockfile.go b/plugins/snapshots/blockfile/blockfile.go similarity index 100% rename from snapshots/blockfile/blockfile.go rename to plugins/snapshots/blockfile/blockfile.go diff --git a/snapshots/blockfile/blockfile_loopsetup_test.go b/plugins/snapshots/blockfile/blockfile_loopsetup_test.go similarity index 100% rename from snapshots/blockfile/blockfile_loopsetup_test.go rename to plugins/snapshots/blockfile/blockfile_loopsetup_test.go diff --git a/snapshots/blockfile/blockfile_other_test.go b/plugins/snapshots/blockfile/blockfile_other_test.go similarity index 100% rename from snapshots/blockfile/blockfile_other_test.go rename to plugins/snapshots/blockfile/blockfile_other_test.go diff --git a/snapshots/blockfile/blockfile_test.go b/plugins/snapshots/blockfile/blockfile_test.go similarity index 100% rename from snapshots/blockfile/blockfile_test.go rename to plugins/snapshots/blockfile/blockfile_test.go diff --git a/snapshots/blockfile/plugin/plugin.go b/plugins/snapshots/blockfile/plugin/plugin.go similarity index 97% rename from snapshots/blockfile/plugin/plugin.go rename to plugins/snapshots/blockfile/plugin/plugin.go index 4d8194da4..a855efd18 100644 --- a/snapshots/blockfile/plugin/plugin.go +++ b/plugins/snapshots/blockfile/plugin/plugin.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/blockfile" + "github.com/containerd/containerd/v2/plugins/snapshots/blockfile" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" )