From 8473322f0bf42a6ebdad7c49735ab496932c7a35 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:24 -0800 Subject: [PATCH] Move snapshots/devmapper to plugins/snapshots/devmapper Signed-off-by: Derek McGowan --- cmd/containerd/builtins/devmapper_linux.go | 2 +- .../snapshots}/devmapper/blkdiscard/blkdiscard.go | 0 {snapshots => plugins/snapshots}/devmapper/config.go | 0 {snapshots => plugins/snapshots}/devmapper/config_test.go | 0 {snapshots => plugins/snapshots}/devmapper/device_info.go | 0 {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup.go | 2 +- .../snapshots}/devmapper/dmsetup/dmsetup_test.go | 0 {snapshots => plugins/snapshots}/devmapper/metadata.go | 0 {snapshots => plugins/snapshots}/devmapper/metadata_test.go | 0 {snapshots => plugins/snapshots}/devmapper/plugin/plugin.go | 2 +- {snapshots => plugins/snapshots}/devmapper/pool_device.go | 4 ++-- .../snapshots}/devmapper/pool_device_test.go | 2 +- {snapshots => plugins/snapshots}/devmapper/snapshotter.go | 2 +- .../snapshots}/devmapper/snapshotter_test.go | 2 +- snapshots/benchsuite/benchmark_test.go | 2 +- 15 files changed, 9 insertions(+), 9 deletions(-) rename {snapshots => plugins/snapshots}/devmapper/blkdiscard/blkdiscard.go (100%) rename {snapshots => plugins/snapshots}/devmapper/config.go (100%) rename {snapshots => plugins/snapshots}/devmapper/config_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/device_info.go (100%) rename {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup.go (99%) rename {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/metadata.go (100%) rename {snapshots => plugins/snapshots}/devmapper/metadata_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/plugin/plugin.go (95%) rename {snapshots => plugins/snapshots}/devmapper/pool_device.go (99%) rename {snapshots => plugins/snapshots}/devmapper/pool_device_test.go (99%) rename {snapshots => plugins/snapshots}/devmapper/snapshotter.go (99%) rename {snapshots => plugins/snapshots}/devmapper/snapshotter_test.go (98%) diff --git a/cmd/containerd/builtins/devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go index 0c95c82f8..1492cef9e 100644 --- a/cmd/containerd/builtins/devmapper_linux.go +++ b/cmd/containerd/builtins/devmapper_linux.go @@ -18,4 +18,4 @@ package builtins -import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin" +import _ "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/plugin" diff --git a/snapshots/devmapper/blkdiscard/blkdiscard.go b/plugins/snapshots/devmapper/blkdiscard/blkdiscard.go similarity index 100% rename from snapshots/devmapper/blkdiscard/blkdiscard.go rename to plugins/snapshots/devmapper/blkdiscard/blkdiscard.go diff --git a/snapshots/devmapper/config.go b/plugins/snapshots/devmapper/config.go similarity index 100% rename from snapshots/devmapper/config.go rename to plugins/snapshots/devmapper/config.go diff --git a/snapshots/devmapper/config_test.go b/plugins/snapshots/devmapper/config_test.go similarity index 100% rename from snapshots/devmapper/config_test.go rename to plugins/snapshots/devmapper/config_test.go diff --git a/snapshots/devmapper/device_info.go b/plugins/snapshots/devmapper/device_info.go similarity index 100% rename from snapshots/devmapper/device_info.go rename to plugins/snapshots/devmapper/device_info.go diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/plugins/snapshots/devmapper/dmsetup/dmsetup.go similarity index 99% rename from snapshots/devmapper/dmsetup/dmsetup.go rename to plugins/snapshots/devmapper/dmsetup/dmsetup.go index 922753b78..b816661d9 100644 --- a/snapshots/devmapper/dmsetup/dmsetup.go +++ b/plugins/snapshots/devmapper/dmsetup/dmsetup.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" + blkdiscard "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/blkdiscard" "golang.org/x/sys/unix" ) diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go similarity index 100% rename from snapshots/devmapper/dmsetup/dmsetup_test.go rename to plugins/snapshots/devmapper/dmsetup/dmsetup_test.go diff --git a/snapshots/devmapper/metadata.go b/plugins/snapshots/devmapper/metadata.go similarity index 100% rename from snapshots/devmapper/metadata.go rename to plugins/snapshots/devmapper/metadata.go diff --git a/snapshots/devmapper/metadata_test.go b/plugins/snapshots/devmapper/metadata_test.go similarity index 100% rename from snapshots/devmapper/metadata_test.go rename to plugins/snapshots/devmapper/metadata_test.go diff --git a/snapshots/devmapper/plugin/plugin.go b/plugins/snapshots/devmapper/plugin/plugin.go similarity index 95% rename from snapshots/devmapper/plugin/plugin.go rename to plugins/snapshots/devmapper/plugin/plugin.go index b63782a63..fd4d5f70b 100644 --- a/snapshots/devmapper/plugin/plugin.go +++ b/plugins/snapshots/devmapper/plugin/plugin.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/devmapper" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/devmapper/pool_device.go b/plugins/snapshots/devmapper/pool_device.go similarity index 99% rename from snapshots/devmapper/pool_device.go rename to plugins/snapshots/devmapper/pool_device.go index f0cb5e006..5f7686027 100644 --- a/snapshots/devmapper/pool_device.go +++ b/plugins/snapshots/devmapper/pool_device.go @@ -28,8 +28,8 @@ import ( "golang.org/x/sys/unix" - blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + blkdiscard "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/blkdiscard" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" ) diff --git a/snapshots/devmapper/pool_device_test.go b/plugins/snapshots/devmapper/pool_device_test.go similarity index 99% rename from snapshots/devmapper/pool_device_test.go rename to plugins/snapshots/devmapper/pool_device_test.go index 95ec6aac3..3c368a7e8 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/plugins/snapshots/devmapper/pool_device_test.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" "github.com/docker/go-units" "github.com/stretchr/testify/assert" diff --git a/snapshots/devmapper/snapshotter.go b/plugins/snapshots/devmapper/snapshotter.go similarity index 99% rename from snapshots/devmapper/snapshotter.go rename to plugins/snapshots/devmapper/snapshotter.go index 4a0e7feaa..e7ea8cb3f 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/plugins/snapshots/devmapper/snapshotter.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" ) diff --git a/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go similarity index 98% rename from snapshots/devmapper/snapshotter_test.go rename to plugins/snapshots/devmapper/snapshotter_test.go index dfe65848b..cf4d9dbc8 100644 --- a/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/log" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 9bfd7c345..8e193f975 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper" "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log"