refactor(native): separate init from implementation

knight42 · knight42 · commit c50ff694f013 · 2020-09-03T19:58:31.000+08:00
Part of #4513 Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins_linux.go
@@ -22,6 +22,6 @@ import (
 	_ "github.com/containerd/containerd/runtime/v1/linux"
 	_ "github.com/containerd/containerd/runtime/v2"
 	_ "github.com/containerd/containerd/runtime/v2/runc/options"
-	_ "github.com/containerd/containerd/snapshots/native"
+	_ "github.com/containerd/containerd/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/snapshots/overlay/plugin"
 )
diff --git a/cmd/containerd/builtins_unix.go b/cmd/containerd/builtins_unix.go
@@ -19,5 +19,5 @@
 package main
 
 import (
-	_ "github.com/containerd/containerd/snapshots/native"
+	_ "github.com/containerd/containerd/snapshots/native/plugin"
 )
diff --git a/snapshots/native/native.go b/snapshots/native/native.go
@@ -24,26 +24,13 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
 
 	"github.com/containerd/continuity/fs"
 	"github.com/pkg/errors"
 )
 
-func init() {
-	plugin.Register(&plugin.Registration{
-		Type: plugin.SnapshotPlugin,
-		ID:   "native",
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
-			return NewSnapshotter(ic.Root)
-		},
-	})
-}
-
 type snapshotter struct {
 	root string
 	ms   *storage.MetaStore

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ import (`
`22`	`22`	`_ "github.com/containerd/containerd/runtime/v1/linux"`
`23`	`23`	`_ "github.com/containerd/containerd/runtime/v2"`
`24`	`24`	`_ "github.com/containerd/containerd/runtime/v2/runc/options"`
`25`		`- _ "github.com/containerd/containerd/snapshots/native"`
	`25`	`+ _ "github.com/containerd/containerd/snapshots/native/plugin"`
`26`	`26`	`_ "github.com/containerd/containerd/snapshots/overlay/plugin"`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`package main`
`20`	`20`
`21`	`21`	`import (`
`22`		`- _ "github.com/containerd/containerd/snapshots/native"`
	`22`	`+ _ "github.com/containerd/containerd/snapshots/native/plugin"`
`23`	`23`	`)`