*: update import paths to use versioned services

Signed-off-by: Stephen J Day <stephen.day@docker.com>

client.go

@@ -10,15 +10,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containerd/containerd/api/services/containers"
-	contentapi "github.com/containerd/containerd/api/services/content"
-	diffapi "github.com/containerd/containerd/api/services/diff"
-	eventsapi "github.com/containerd/containerd/api/services/events"
-	imagesapi "github.com/containerd/containerd/api/services/images"
-	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
-	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
-	"github.com/containerd/containerd/api/services/tasks"
-	versionservice "github.com/containerd/containerd/api/services/version"
+	"github.com/containerd/containerd/api/services/containers/v1"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
+	namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
+	versionservice "github.com/containerd/containerd/api/services/version/v1"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/plugin"

cmd/containerd-shim/main_unix.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/Sirupsen/logrus"
-	shimapi "github.com/containerd/containerd/api/services/shim"
+	shimapi "github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/linux/shim"
 	"github.com/containerd/containerd/reaper"
 	"github.com/containerd/containerd/version"

cmd/containerd/main.go

@@ -18,14 +18,14 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 
 	"github.com/Sirupsen/logrus"
-	containersapi "github.com/containerd/containerd/api/services/containers"
-	contentapi "github.com/containerd/containerd/api/services/content"
-	diffapi "github.com/containerd/containerd/api/services/diff"
-	imagesapi "github.com/containerd/containerd/api/services/images"
-	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
-	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
-	api "github.com/containerd/containerd/api/services/tasks"
-	versionapi "github.com/containerd/containerd/api/services/version"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
+	namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
+	api "github.com/containerd/containerd/api/services/tasks/v1"
+	versionapi "github.com/containerd/containerd/api/services/version/v1"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/log"

cmd/ctr/events.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	eventsapi "github.com/containerd/containerd/api/services/events"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/gogo/protobuf/proto"
 	"github.com/urfave/cli"

cmd/ctr/run_windows.go

@@ -11,8 +11,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/containerd/console"
 	"github.com/containerd/containerd"
-	containersapi "github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/tasks"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/windows"

cmd/ctr/shim.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/api/services/shim"
+	"github.com/containerd/containerd/api/services/shim/v1"
 	protobuf "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"

cmd/ctr/utils.go

@@ -12,15 +12,15 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd"
-	containersapi "github.com/containerd/containerd/api/services/containers"
-	contentapi "github.com/containerd/containerd/api/services/content"
-	diffapi "github.com/containerd/containerd/api/services/diff"
-	"github.com/containerd/containerd/api/services/events"
-	imagesapi "github.com/containerd/containerd/api/services/images"
-	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
-	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
-	"github.com/containerd/containerd/api/services/tasks"
-	versionservice "github.com/containerd/containerd/api/services/version"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
+	"github.com/containerd/containerd/api/services/events/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
+	namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
+	versionservice "github.com/containerd/containerd/api/services/version/v1"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/namespaces"

container.go

@@ -9,8 +9,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 
-	"github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/tasks"
+	"github.com/containerd/containerd/api/services/containers/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/api/types/mount"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"

container_unix.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/tasks"
+	"github.com/containerd/containerd/api/services/containers/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/api/types/descriptor"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"

linux/runtime.go

@@ -16,7 +16,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/containerd/containerd/api/services/shim"
+	"github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/api/types/mount"
 	"github.com/containerd/containerd/api/types/task"

linux/shim.go

@@ -13,7 +13,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/containerd/containerd/api/services/shim"
+	"github.com/containerd/containerd/api/services/shim/v1"
 	localShim "github.com/containerd/containerd/linux/shim"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/reaper"

linux/shim/client.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	shimapi "github.com/containerd/containerd/api/services/shim"
+	shimapi "github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/api/types/task"
 	runc "github.com/containerd/go-runc"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"

linux/shim/exec.go

@@ -16,7 +16,7 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/containerd/console"
-	shimapi "github.com/containerd/containerd/api/services/shim"
+	shimapi "github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
 	specs "github.com/opencontainers/runtime-spec/specs-go"

linux/shim/init.go

@@ -17,7 +17,7 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/containerd/console"
-	shimapi "github.com/containerd/containerd/api/services/shim"
+	shimapi "github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/fifo"

linux/shim/service.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	"github.com/containerd/console"
-	shimapi "github.com/containerd/containerd/api/services/shim"
+	shimapi "github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/reaper"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"

linux/task.go

@@ -7,7 +7,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/containerd/containerd/api/services/shim"
+	"github.com/containerd/containerd/api/services/shim/v1"
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/plugin"
 	protobuf "github.com/gogo/protobuf/types"

process.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"syscall"
 
-	eventsapi "github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/tasks"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/api/types/event"
 	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/gogo/protobuf/proto"

services/containers/helpers.go

@@ -1,7 +1,7 @@
 package containers
 
 import (
-	api "github.com/containerd/containerd/api/services/containers"
+	api "github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/metadata"
 	"github.com/containerd/containerd/namespaces"

services/containers/service.go

@@ -2,7 +2,7 @@ package containers
 
 import (
 	"github.com/boltdb/bolt"
-	api "github.com/containerd/containerd/api/services/containers"
+	api "github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/events"

services/content/reader.go

@@ -3,7 +3,7 @@ package content
 import (
 	"context"
 
-	contentapi "github.com/containerd/containerd/api/services/content"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
 	digest "github.com/opencontainers/go-digest"
 )
 

services/content/service.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	api "github.com/containerd/containerd/api/services/content"
+	api "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/events"

services/content/store.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	contentapi "github.com/containerd/containerd/api/services/content"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/content"
 	digest "github.com/opencontainers/go-digest"
 )

services/content/writer.go

@@ -3,7 +3,7 @@ package content
 import (
 	"io"
 
-	contentapi "github.com/containerd/containerd/api/services/content"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/content"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

services/diff/client.go

@@ -1,7 +1,7 @@
 package diff
 
 import (
-	diffapi "github.com/containerd/containerd/api/services/diff"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
 	"github.com/containerd/containerd/api/types/descriptor"
 	mounttypes "github.com/containerd/containerd/api/types/mount"
 	"github.com/containerd/containerd/mount"

services/diff/service.go

@@ -1,7 +1,7 @@
 package diff
 
 import (
-	diffapi "github.com/containerd/containerd/api/services/diff"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
 	mounttypes "github.com/containerd/containerd/api/types/mount"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/plugin"

services/events/service.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	api "github.com/containerd/containerd/api/services/events"
+	api "github.com/containerd/containerd/api/services/events/v1"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/plugin"
 	"google.golang.org/grpc"

services/images/client.go

@@ -3,7 +3,7 @@ package images
 import (
 	"context"
 
-	imagesapi "github.com/containerd/containerd/api/services/images"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
 	"github.com/containerd/containerd/images"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

services/images/helpers.go

@@ -1,7 +1,7 @@
 package images
 
 import (
-	imagesapi "github.com/containerd/containerd/api/services/images"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
 	"github.com/containerd/containerd/api/types/descriptor"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/metadata"

services/images/service.go

@@ -2,7 +2,7 @@ package images
 
 import (
 	"github.com/boltdb/bolt"
-	imagesapi "github.com/containerd/containerd/api/services/images"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/images"

services/namespaces/client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	api "github.com/containerd/containerd/api/services/namespaces"
+	api "github.com/containerd/containerd/api/services/namespaces/v1"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/gogo/protobuf/types"
 )

services/namespaces/service.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/boltdb/bolt"
-	api "github.com/containerd/containerd/api/services/namespaces"
+	api "github.com/containerd/containerd/api/services/namespaces/v1"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/metadata"

services/snapshot/client.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 
-	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
 	mountapi "github.com/containerd/containerd/api/types/mount"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/snapshot"

services/snapshot/service.go

@@ -3,7 +3,7 @@ package snapshot
 import (
 	gocontext "context"
 
-	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
 	"github.com/containerd/containerd/api/types/event"
 	mounttypes "github.com/containerd/containerd/api/types/mount"
 	"github.com/containerd/containerd/events"

services/tasks/service.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/boltdb/bolt"
-	api "github.com/containerd/containerd/api/services/tasks"
+	api "github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/api/types/descriptor"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/api/types/task"

services/version/service.go

@@ -1,7 +1,7 @@
 package version
 
 import (
-	api "github.com/containerd/containerd/api/services/version"
+	api "github.com/containerd/containerd/api/services/version/v1"
 	"github.com/containerd/containerd/plugin"
 	ctrdversion "github.com/containerd/containerd/version"
 	empty "github.com/golang/protobuf/ptypes/empty"

spec_unix.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containerd/containerd/api/services/containers"
+	"github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/images"
 	protobuf "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/image-spec/specs-go/v1"

spec_windows.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/containerd/containerd/api/services/containers"
+	"github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/images"
 	protobuf "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/image-spec/specs-go/v1"

task.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containerd/containerd/api/services/containers"
-	eventsapi "github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/tasks"
+	"github.com/containerd/containerd/api/services/containers/v1"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/api/types/event"
 	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/content"