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>

plugins/sandbox/controller.go

@@ -29,8 +29,8 @@ import (
 	"github.com/containerd/plugin/registry"
 	"google.golang.org/protobuf/types/known/anypb"
 
-	runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/events/exchange"
 	"github.com/containerd/containerd/v2/core/mount"

plugins/services/containers/helpers.go

@@ -17,7 +17,7 @@
 package containers
 
 import (
-	api "github.com/containerd/containerd/v2/api/services/containers/v1"
+	api "github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/containerd/v2/pkg/protobuf/types"

plugins/services/containers/local.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"io"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
-	api "github.com/containerd/containerd/v2/api/services/containers/v1"
+	eventstypes "github.com/containerd/containerd/api/events"
+	api "github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/metadata"

plugins/services/containers/service.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"io"
 
-	api "github.com/containerd/containerd/v2/api/services/containers/v1"
+	api "github.com/containerd/containerd/api/services/containers/v1"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"

plugins/services/content/contentserver/contentserver.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"sync"
 
-	api "github.com/containerd/containerd/v2/api/services/content/v1"
+	api "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

plugins/services/content/store.go

@@ -19,7 +19,7 @@ package content
 import (
 	"context"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/metadata"

plugins/services/diff/local.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	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/mount"
 	"github.com/containerd/containerd/v2/pkg/oci"

plugins/services/diff/service.go

@@ -19,7 +19,7 @@ package diff
 import (
 	"context"
 
-	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"
 	"github.com/containerd/plugin"

plugins/services/events/service.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"fmt"
 
-	api "github.com/containerd/containerd/v2/api/services/events/v1"
-	apittrpc "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	api "github.com/containerd/containerd/api/services/events/v1"
+	apittrpc "github.com/containerd/containerd/api/services/ttrpc/events/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/events/exchange"
 	"github.com/containerd/containerd/v2/pkg/protobuf"

plugins/services/events/ttrpc.go

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

plugins/services/images/helpers.go

@@ -17,8 +17,8 @@
 package images
 
 import (
-	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/opencontainers/go-digest"

plugins/services/images/local.go

@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	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/core/metadata"
 	"github.com/containerd/containerd/v2/pkg/deprecation"

plugins/services/images/service.go

@@ -19,7 +19,7 @@ package images
 import (
 	"context"
 
-	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
+	imagesapi "github.com/containerd/containerd/api/services/images/v1"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"

plugins/services/introspection/local.go

@@ -30,8 +30,8 @@ import (
 	rpc "google.golang.org/genproto/googleapis/rpc/status"
 	"google.golang.org/grpc/status"
 
-	api "github.com/containerd/containerd/v2/api/services/introspection/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	api "github.com/containerd/containerd/api/services/introspection/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/introspection"
 	"github.com/containerd/containerd/v2/pkg/filters"
 	"github.com/containerd/containerd/v2/pkg/protobuf"

plugins/services/introspection/service.go

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

plugins/services/leases/service.go

@@ -19,7 +19,7 @@ package leases
 import (
 	"context"
 
-	api "github.com/containerd/containerd/v2/api/services/leases/v1"
+	api "github.com/containerd/containerd/api/services/leases/v1"
 	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

plugins/services/namespaces/local.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"strings"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
-	api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
+	eventstypes "github.com/containerd/containerd/api/events"
+	api "github.com/containerd/containerd/api/services/namespaces/v1"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/metadata"
 	"github.com/containerd/containerd/v2/pkg/namespaces"

plugins/services/namespaces/service.go

@@ -19,7 +19,7 @@ package namespaces
 import (
 	"context"
 
-	api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
+	api "github.com/containerd/containerd/api/services/namespaces/v1"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"

plugins/services/sandbox/controller_service.go

@@ -24,8 +24,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/anypb"
 
-	eventtypes "github.com/containerd/containerd/v2/api/events"
-	api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
+	eventtypes "github.com/containerd/containerd/api/events"
+	api "github.com/containerd/containerd/api/services/sandbox/v1"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/sandbox"
 	"github.com/containerd/containerd/v2/pkg/protobuf"

plugins/services/sandbox/store_service.go

@@ -21,8 +21,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	api "github.com/containerd/containerd/api/services/sandbox/v1"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/sandbox"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/errdefs"

plugins/services/snapshots/service.go

@@ -19,7 +19,7 @@ package snapshots
 import (
 	"context"
 
-	snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
+	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

plugins/services/streaming/service.go

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

plugins/services/tasks/local.go

@@ -26,10 +26,10 @@ import (
 	"path/filepath"
 	"time"
 
-	api "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/v2/api/types/task"
+	api "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/api/types/task"
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/events"

plugins/services/tasks/service.go

@@ -19,7 +19,7 @@ package tasks
 import (
 	"context"
 
-	api "github.com/containerd/containerd/v2/api/services/tasks/v1"
+	api "github.com/containerd/containerd/api/services/tasks/v1"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"

plugins/services/transfer/service.go

@@ -19,9 +19,9 @@ package transfer
 import (
 	"context"
 
-	transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1"
-	"github.com/containerd/containerd/v2/api/types"
-	transferTypes "github.com/containerd/containerd/v2/api/types/transfer"
+	transferapi "github.com/containerd/containerd/api/services/transfer/v1"
+	"github.com/containerd/containerd/api/types"
+	transferTypes "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/streaming"
 	"github.com/containerd/containerd/v2/core/transfer"
 	tplugins "github.com/containerd/containerd/v2/core/transfer/plugins"

plugins/services/version/service.go

@@ -19,7 +19,7 @@ package version
 import (
 	"context"
 
-	api "github.com/containerd/containerd/v2/api/services/version/v1"
+	api "github.com/containerd/containerd/api/services/version/v1"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	ctrdversion "github.com/containerd/containerd/v2/version"