Move snapshots/native to plugins/snapshots/native

Signed-off-by: Derek McGowan <derek@mcg.dev>

cmd/containerd/builtins/builtins_linux.go

@@ -20,7 +20,7 @@ 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/plugins/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
-	_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
 )

cmd/containerd/builtins/builtins_unix.go

@@ -20,5 +20,5 @@ package builtins
 
 import (
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
-	_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
+	_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
 )

contrib/fuzz/builtins_linux.go

@@ -21,7 +21,7 @@ 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/plugins/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
-	_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
 )

contrib/fuzz/builtins_unix.go

@@ -21,5 +21,5 @@ package fuzz
 import (
 	// Unix specific imports
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
-	_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
+	_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
 )

contrib/fuzz/metadata_fuzzer.go

@@ -33,8 +33,8 @@ import (
 	"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/plugins/snapshots/native"
 	"github.com/containerd/containerd/v2/snapshots"
-	"github.com/containerd/containerd/v2/snapshots/native"
 )
 
 func testEnv() (context.Context, *bolt.DB, func(), error) {

core/metadata/db_test.go

@@ -37,9 +37,9 @@ import (
 	"github.com/containerd/containerd/v2/gc"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins/content/local"
+	"github.com/containerd/containerd/v2/plugins/snapshots/native"
 	"github.com/containerd/containerd/v2/protobuf/types"
 	"github.com/containerd/containerd/v2/snapshots"
-	"github.com/containerd/containerd/v2/snapshots/native"
 	"github.com/containerd/log/logtest"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

core/metadata/snapshot_test.go

@@ -32,8 +32,8 @@ import (
 	"github.com/containerd/containerd/v2/filters"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/pkg/testutil"
+	"github.com/containerd/containerd/v2/plugins/snapshots/native"
 	"github.com/containerd/containerd/v2/snapshots"
-	"github.com/containerd/containerd/v2/snapshots/native"
 	"github.com/containerd/containerd/v2/snapshots/testsuite"
 	bolt "go.etcd.io/bbolt"
 )

plugins/snapshots/native/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/native"
+	"github.com/containerd/containerd/v2/plugins/snapshots/native"
 	"github.com/containerd/plugin"
 	"github.com/containerd/plugin/registry"
 )

snapshots/benchsuite/benchmark_test.go

@@ -34,8 +34,8 @@ import (
 
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/plugins/snapshots/devmapper"
+	"github.com/containerd/containerd/v2/plugins/snapshots/native"
 	"github.com/containerd/containerd/v2/snapshots"
-	"github.com/containerd/containerd/v2/snapshots/native"
 	"github.com/containerd/containerd/v2/snapshots/overlay"
 	"github.com/containerd/log"
 )