Move Container and runtime to plugin pkg

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

linux/container.go

@@ -3,24 +3,25 @@
 package linux
 
 import (
-	"github.com/containerd/containerd"
+	"context"
+
 	"github.com/containerd/containerd/api/services/shim"
 	"github.com/containerd/containerd/api/types/container"
+	"github.com/containerd/containerd/plugin"
 	protobuf "github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"golang.org/x/net/context"
 )
 
 type State struct {
 	pid    uint32
-	status containerd.Status
+	status plugin.Status
 }
 
 func (s State) Pid() uint32 {
 	return s.pid
 }
 
-func (s State) Status() containerd.Status {
+func (s State) Status() plugin.Status {
 	return s.status
 }
 
@@ -37,8 +38,8 @@ type Container struct {
 	shim shim.ShimClient
 }
 
-func (c *Container) Info() containerd.ContainerInfo {
-	return containerd.ContainerInfo{
+func (c *Container) Info() plugin.ContainerInfo {
+	return plugin.ContainerInfo{
 		ID:      c.id,
 		Runtime: runtimeName,
 	}
@@ -49,21 +50,21 @@ func (c *Container) Start(ctx context.Context) error {
 	return err
 }
 
-func (c *Container) State(ctx context.Context) (containerd.State, error) {
+func (c *Container) State(ctx context.Context) (plugin.State, error) {
 	response, err := c.shim.State(ctx, &shim.StateRequest{})
 	if err != nil {
 		return nil, err
 	}
-	var status containerd.Status
+	var status plugin.Status
 	switch response.Status {
 	case container.Status_CREATED:
-		status = containerd.CreatedStatus
+		status = plugin.CreatedStatus
 	case container.Status_RUNNING:
-		status = containerd.RunningStatus
+		status = plugin.RunningStatus
 	case container.Status_STOPPED:
-		status = containerd.StoppedStatus
+		status = plugin.StoppedStatus
 	case container.Status_PAUSED:
-		status = containerd.PausedStatus
+		status = plugin.PausedStatus
 		// TODO: containerd.DeletedStatus
 	}
 	return &State{
@@ -90,7 +91,7 @@ func (c *Container) Kill(ctx context.Context, signal uint32, all bool) error {
 	return err
 }
 
-func (c *Container) Exec(ctx context.Context, opts containerd.ExecOpts) (containerd.Process, error) {
+func (c *Container) Exec(ctx context.Context, opts plugin.ExecOpts) (plugin.Process, error) {
 	request := &shim.ExecRequest{
 		Stdin:    opts.IO.Stdin,
 		Stdout:   opts.IO.Stdout,
@@ -110,7 +111,7 @@ func (c *Container) Exec(ctx context.Context, opts containerd.ExecOpts) (contain
 		c:   c,
 	}, nil
 }
-func (c *Container) Pty(ctx context.Context, pid uint32, size containerd.ConsoleSize) error {
+func (c *Container) Pty(ctx context.Context, pid uint32, size plugin.ConsoleSize) error {
 	_, err := c.shim.Pty(ctx, &shim.PtyRequest{
 		Pid:    pid,
 		Width:  size.Width,
@@ -139,7 +140,7 @@ func (p *Process) Kill(ctx context.Context, signal uint32, _ bool) error {
 	return err
 }
 
-func (p *Process) State(ctx context.Context) (containerd.State, error) {
+func (p *Process) State(ctx context.Context) (plugin.State, error) {
 	// use the container status for the status of the process
 	state, err := p.c.State(ctx)
 	if err != nil {

linux/runtime.go

@@ -4,6 +4,7 @@ package linux
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -19,7 +20,6 @@ import (
 	"github.com/containerd/containerd/plugin"
 	runc "github.com/containerd/go-runc"
 
-	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"
 )
 
@@ -37,7 +37,7 @@ func init() {
 	})
 }
 
-var _ = (containerd.Runtime)(&Runtime{})
+var _ = (plugin.Runtime)(&Runtime{})
 
 type Config struct {
 	// Runtime is a path or name of an OCI runtime used by the shim
@@ -81,7 +81,7 @@ type Runtime struct {
 	monitor       plugin.ContainerMonitor
 }
 
-func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateOpts) (containerd.Container, error) {
+func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts) (plugin.Container, error) {
 	path, err := r.newBundle(id, opts.Spec)
 	if err != nil {
 		return nil, err
@@ -123,7 +123,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO
 	return c, nil
 }
 
-func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containerd.Exit, error) {
+func (r *Runtime) Delete(ctx context.Context, c plugin.Container) (*plugin.Exit, error) {
 	lc, ok := c.(*Container)
 	if !ok {
 		return nil, fmt.Errorf("container cannot be cast as *linux.Container")
@@ -138,18 +138,18 @@ func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containe
 		return nil, err
 	}
 	lc.shim.Exit(ctx, &shim.ExitRequest{})
-	return &containerd.Exit{
+	return &plugin.Exit{
 		Status:    rsp.ExitStatus,
 		Timestamp: rsp.ExitedAt,
 	}, r.deleteBundle(lc.id)
 }
 
-func (r *Runtime) Containers(ctx context.Context) ([]containerd.Container, error) {
+func (r *Runtime) Containers(ctx context.Context) ([]plugin.Container, error) {
 	dir, err := ioutil.ReadDir(r.root)
 	if err != nil {
 		return nil, err
 	}
-	var o []containerd.Container
+	var o []plugin.Container
 	for _, fi := range dir {
 		if !fi.IsDir() {
 			continue