*: update import paths to use versioned services

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

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"