Make api a Go sub-module

Allow the api to stay at the same v1 go package name and keep using a
1.x version number. This indicates the API is still at 1.x and allows
sharing proto types with containerd 1.6 and 1.7 releases.

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

client/client.go

@@ -26,16 +26,16 @@ import (
 	"sync"
 	"time"
 
-	containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
-	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
-	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
-	leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1"
-	namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1"
-	sandboxsapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
-	snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
-	"github.com/containerd/containerd/v2/api/services/tasks/v1"
-	versionservice "github.com/containerd/containerd/v2/api/services/version/v1"
-	apitypes "github.com/containerd/containerd/v2/api/types"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
+	leasesapi "github.com/containerd/containerd/api/services/leases/v1"
+	namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
+	sandboxsapi "github.com/containerd/containerd/api/services/sandbox/v1"
+	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
+	versionservice "github.com/containerd/containerd/api/services/version/v1"
+	apitypes "github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	contentproxy "github.com/containerd/containerd/v2/core/content/proxy"

client/container.go

@@ -24,10 +24,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containerd/containerd/v2/api/services/tasks/v1"
-	"github.com/containerd/containerd/v2/api/types"
-	"github.com/containerd/containerd/v2/api/types/runc/options"
-	tasktypes "github.com/containerd/containerd/v2/api/types/task"
+	"github.com/containerd/containerd/api/services/tasks/v1"
+	"github.com/containerd/containerd/api/types"
+	"github.com/containerd/containerd/api/types/runc/options"
+	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/pkg/cio"

client/container_checkpoint_opts.go

@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"runtime"
 
-	tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
-	"github.com/containerd/containerd/v2/api/types/runc/options"
+	tasks "github.com/containerd/containerd/api/services/tasks/v1"
+	"github.com/containerd/containerd/api/types/runc/options"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/images"

client/containerstore.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"io"
 
-	containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

client/diff.go

@@ -17,7 +17,7 @@
 package client
 
 import (
-	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
 	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/diff/proxy"
 )

client/events.go

@@ -19,8 +19,8 @@ package client
 import (
 	"context"
 
-	eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/errdefs"

client/image_store.go

@@ -19,7 +19,7 @@ package client
 import (
 	"context"
 
-	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/pkg/epoch"
 	"github.com/containerd/containerd/v2/pkg/oci"

client/namespaces.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"strings"
 
-	api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
+	api "github.com/containerd/containerd/api/services/namespaces/v1"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/errdefs"

client/process.go

@@ -23,7 +23,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/containerd/v2/api/services/tasks/v1"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/v2/pkg/cio"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/errdefs"

client/services.go

@@ -19,11 +19,11 @@ package client
 import (
 	"fmt"
 
-	containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
-	"github.com/containerd/containerd/v2/api/services/diff/v1"
-	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
-	namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1"
-	"github.com/containerd/containerd/v2/api/services/tasks/v1"
+	containersapi "github.com/containerd/containerd/api/services/containers/v1"
+	"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"
+	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"

client/task.go

@@ -26,9 +26,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/containerd/v2/api/services/tasks/v1"
-	"github.com/containerd/containerd/v2/api/types"
-	"github.com/containerd/containerd/v2/api/types/runc/options"
+	"github.com/containerd/containerd/api/services/tasks/v1"
+	"github.com/containerd/containerd/api/types"
+	"github.com/containerd/containerd/api/types/runc/options"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/images"

client/task_opts.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/containerd/containerd/v2/api/types"
-	"github.com/containerd/containerd/v2/api/types/runc/options"
+	"github.com/containerd/containerd/api/types"
+	"github.com/containerd/containerd/api/types/runc/options"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/errdefs"

client/task_opts_unix.go

@@ -22,7 +22,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/containerd/containerd/v2/api/types/runc/options"
+	"github.com/containerd/containerd/api/types/runc/options"
 )
 
 // WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage.

client/transfer.go

@@ -21,8 +21,8 @@ import (
 	"errors"
 	"io"
 
-	streamingapi "github.com/containerd/containerd/v2/api/services/streaming/v1"
-	transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1"
+	streamingapi "github.com/containerd/containerd/api/services/streaming/v1"
+	transferapi "github.com/containerd/containerd/api/services/transfer/v1"
 	"github.com/containerd/containerd/v2/core/streaming"
 	"github.com/containerd/containerd/v2/core/transfer"
 	"github.com/containerd/containerd/v2/core/transfer/proxy"