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>

core/content/proxy/content_reader.go

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

core/content/proxy/content_store.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

core/content/proxy/content_writer.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
+	contentapi "github.com/containerd/containerd/api/services/content/v1"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/errdefs"

core/diff/proxy/differ.go

@@ -19,7 +19,7 @@ package proxy
 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/core/diff"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/pkg/epoch"

core/events/exchange/exchange_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/protobuf"

core/events/proxy/remote_events.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	api "github.com/containerd/containerd/v2/api/services/events/v1"
-	"github.com/containerd/containerd/v2/api/types"
+	api "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"

core/introspection/introspection.go

@@ -19,7 +19,7 @@ package introspection
 import (
 	context "context"
 
-	api "github.com/containerd/containerd/v2/api/services/introspection/v1"
+	api "github.com/containerd/containerd/api/services/introspection/v1"
 )
 
 // Service defines the introspection service interface

core/introspection/proxy/remote.go

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

core/leases/proxy/manager.go

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

core/metadata/db.go

@@ -26,7 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	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/snapshots"

core/metadata/gc.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/pkg/gc"
 	"github.com/containerd/log"
 	bolt "go.etcd.io/bbolt"

core/metadata/images.go

@@ -25,7 +25,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/metadata/boltutil"
 	"github.com/containerd/containerd/v2/pkg/epoch"

core/metadata/snapshot.go

@@ -24,7 +24,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/core/metadata/boltutil"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"

core/metrics/cgroups/v1/cgroups.go

@@ -22,7 +22,7 @@ import (
 	"context"
 
 	cgroups "github.com/containerd/cgroups/v3/cgroup1"
-	eventstypes "github.com/containerd/containerd/v2/api/events"
+	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/v2/core/events"
 	"github.com/containerd/containerd/v2/core/runtime"
 	"github.com/containerd/containerd/v2/pkg/namespaces"

core/mount/mount.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containerd/containerd/v2/api/types"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/continuity/fs"
 )
 

core/runtime/events.go

@@ -17,7 +17,7 @@
 package runtime
 
 import (
-	"github.com/containerd/containerd/v2/api/events"
+	"github.com/containerd/containerd/api/events"
 	"github.com/containerd/log"
 )
 

core/runtime/v2/binary.go

@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	gruntime "runtime"
 
-	"github.com/containerd/containerd/v2/api/runtime/task/v2"
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/v2/core/runtime"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/protobuf"

core/runtime/v2/bridge.go

@@ -24,10 +24,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	v2 "github.com/containerd/containerd/v2/api/runtime/task/v2"
-	v3 "github.com/containerd/containerd/v2/api/runtime/task/v3"
+	v2 "github.com/containerd/containerd/api/runtime/task/v2"
+	v3 "github.com/containerd/containerd/api/runtime/task/v3"
 
-	api "github.com/containerd/containerd/v2/api/runtime/task/v3" // Current version used by TaskServiceClient
+	api "github.com/containerd/containerd/api/runtime/task/v3" // Current version used by TaskServiceClient
 )
 
 // TaskServiceClient exposes a client interface to shims, which aims to hide

core/runtime/v2/example/example.go

@@ -21,8 +21,8 @@ import (
 	"io"
 	"os"
 
-	taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2"
-	apitypes "github.com/containerd/containerd/v2/api/types"
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
+	apitypes "github.com/containerd/containerd/api/types"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/pkg/shim"
 	"github.com/containerd/containerd/v2/pkg/shutdown"

core/runtime/v2/process.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"errors"
 
-	task "github.com/containerd/containerd/v2/api/runtime/task/v3"
-	tasktypes "github.com/containerd/containerd/v2/api/types/task"
+	task "github.com/containerd/containerd/api/runtime/task/v3"
+	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/v2/core/runtime"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/errdefs"

core/runtime/v2/shim.go

@@ -35,9 +35,9 @@ import (
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials/insecure"
 
-	eventstypes "github.com/containerd/containerd/v2/api/events"
-	task "github.com/containerd/containerd/v2/api/runtime/task/v3"
-	"github.com/containerd/containerd/v2/api/types"
+	eventstypes "github.com/containerd/containerd/api/events"
+	task "github.com/containerd/containerd/api/runtime/task/v3"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/events/exchange"
 	"github.com/containerd/containerd/v2/core/runtime"
 	"github.com/containerd/containerd/v2/pkg/identifiers"

core/runtime/v2/task_manager.go

@@ -27,7 +27,7 @@ import (
 	"github.com/containerd/plugin"
 	"github.com/containerd/plugin/registry"
 
-	apitypes "github.com/containerd/containerd/v2/api/types"
+	apitypes "github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/runtime"
 	"github.com/containerd/containerd/v2/internal/cleanup"
 	"github.com/containerd/containerd/v2/pkg/protobuf/proto"

core/sandbox/bridge.go

@@ -23,7 +23,7 @@ import (
 	"github.com/containerd/ttrpc"
 	"google.golang.org/grpc"
 
-	api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
+	api "github.com/containerd/containerd/api/runtime/sandbox/v1"
 )
 
 // NewClient returns a new sandbox client that handles both GRPC and TTRPC clients.

core/sandbox/controller.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/containerd/containerd/v2/api/types"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/platforms"
 	"github.com/containerd/typeurl/v2"

core/sandbox/helpers.go

@@ -17,7 +17,7 @@
 package sandbox
 
 import (
-	"github.com/containerd/containerd/v2/api/types"
+	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	gogo_types "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/typeurl/v2"

core/sandbox/proxy/controller.go

@@ -19,8 +19,8 @@ package proxy
 import (
 	"context"
 
-	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/mount"
 	"github.com/containerd/containerd/v2/core/sandbox"
 	"github.com/containerd/errdefs"

core/sandbox/proxy/store.go

@@ -19,7 +19,7 @@ package proxy
 import (
 	"context"
 
-	api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
+	api "github.com/containerd/containerd/api/services/sandbox/v1"
 	sb "github.com/containerd/containerd/v2/core/sandbox"
 	"github.com/containerd/errdefs"
 )

core/snapshots/proxy/proxy.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"io"
 
-	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"
 	protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

core/snapshots/snapshotter.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	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/pkg/protobuf"
 )

core/transfer/archive/exporter.go

@@ -23,8 +23,8 @@ import (
 	"github.com/containerd/typeurl/v2"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 
-	"github.com/containerd/containerd/v2/api/types"
-	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
+	"github.com/containerd/containerd/api/types"
+	transfertypes "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/images/archive"

core/transfer/archive/importer.go

@@ -23,7 +23,7 @@ import (
 	"github.com/containerd/typeurl/v2"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
-	transferapi "github.com/containerd/containerd/v2/api/types/transfer"
+	transferapi "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images/archive"
 	"github.com/containerd/containerd/v2/core/streaming"

core/transfer/image/imagestore.go

@@ -23,8 +23,8 @@ import (
 	"github.com/containerd/typeurl/v2"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
-	"github.com/containerd/containerd/v2/api/types"
-	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
+	"github.com/containerd/containerd/api/types"
+	transfertypes "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/images/archive"

core/transfer/proxy/transfer.go

@@ -23,8 +23,8 @@ import (
 
 	"google.golang.org/protobuf/types/known/anypb"
 
-	transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1"
-	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
+	transferapi "github.com/containerd/containerd/api/services/transfer/v1"
+	transfertypes "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/streaming"
 	"github.com/containerd/containerd/v2/core/transfer"
 	tstreaming "github.com/containerd/containerd/v2/core/transfer/streaming"

core/transfer/registry/registry.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"sync"
 
-	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
+	transfertypes "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/remotes"
 	"github.com/containerd/containerd/v2/core/remotes/docker"
 	"github.com/containerd/containerd/v2/core/remotes/docker/config"

core/transfer/streaming/stream.go

@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	transferapi "github.com/containerd/containerd/v2/api/types/transfer"
+	transferapi "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/streaming"
 	"github.com/containerd/log"
 	"github.com/containerd/typeurl/v2"

core/transfer/streaming/writer.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"sync/atomic"
 
-	transferapi "github.com/containerd/containerd/v2/api/types/transfer"
+	transferapi "github.com/containerd/containerd/api/types/transfer"
 	"github.com/containerd/containerd/v2/core/streaming"
 	"github.com/containerd/log"
 	"github.com/containerd/typeurl/v2"