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>
containerd · Apr 30, 2024 · 0095cb8 · 0095cb8
1 parent 899011a
commit 0095cb8
Show file tree

Hide file tree

Showing 371 changed files with 42,057 additions and 483 deletions.
diff --git a/Makefile b/Makefile
@@ -177,7 +177,6 @@ protos: bin/protoc-gen-go-fieldpath
 	$(eval TMPDIR := $(shell mktemp -d))
 	@mv ${ROOTDIR}/vendor ${TMPDIR}
 	@(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES})
-	find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
 	@mv ${TMPDIR}/vendor ${ROOTDIR}
 	@rm -rf ${TMPDIR} v2
 	go-fix-acronym -w -a '^Os' $(shell find api/ -name '*.pb.go')
@@ -472,17 +471,18 @@ vendor: ## ensure all the go.mod/go.sum files are up-to-date including vendor/ d
 	@$(GO) mod tidy
 	@$(GO) mod vendor
 	@$(GO) mod verify
-	#@(cd ${ROOTDIR}/integration/client && ${GO} mod tidy)
+	@(cd ${ROOTDIR}/api && ${GO} mod tidy)
 
 verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date
 	@echo "$(WHALE) $@"
 	$(eval TMPDIR := $(shell mktemp -d))
 	@cp -R ${ROOTDIR} ${TMPDIR}
 	@(cd ${TMPDIR}/containerd && ${GO} mod tidy)
-	@(cd ${TMPDIR}/containerd/integration/client && ${GO} mod tidy)
+	@(cd ${TMPDIR}/containerd && ${GO} mod vendor)
+	@(cd ${TMPDIR}/containerd && ${GO} mod verify)
+	@(cd ${TMPDIR}/containerd/api && ${GO} mod tidy)
 	@diff -r -u -q ${ROOTDIR} ${TMPDIR}/containerd
 	@rm -rf ${TMPDIR}
-	#@${ROOTDIR}/script/verify-go-modules.sh integration/client
 
 
 help: ## this help

diff --git a/api/events/container.pb.go b/api/events/container.pb.go
diff --git a/api/events/container.proto b/api/events/container.proto
@@ -21,7 +21,7 @@ package containerd.events;
 import "google/protobuf/any.proto";
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ContainerCreate {

diff --git a/api/events/content.pb.go b/api/events/content.pb.go
diff --git a/api/events/content.proto b/api/events/content.proto
@@ -20,7 +20,7 @@ package containerd.events;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ContentDelete {

diff --git a/api/events/image.pb.go b/api/events/image.pb.go
diff --git a/api/events/image.proto b/api/events/image.proto
@@ -20,7 +20,7 @@ package containerd.services.images.v1;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ImageCreate {

diff --git a/api/events/namespace.pb.go b/api/events/namespace.pb.go
diff --git a/api/events/namespace.proto b/api/events/namespace.proto
@@ -20,7 +20,7 @@ package containerd.events;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message NamespaceCreate {

diff --git a/api/events/sandbox.pb.go b/api/events/sandbox.pb.go
diff --git a/api/events/sandbox.proto b/api/events/sandbox.proto
@@ -20,7 +20,7 @@ package containerd.events;
 
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 
 message SandboxCreate {
 	string sandbox_id = 1;

diff --git a/api/events/snapshot.pb.go b/api/events/snapshot.pb.go
diff --git a/api/events/snapshot.proto b/api/events/snapshot.proto
@@ -20,7 +20,7 @@ package containerd.events;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message SnapshotPrepare {

diff --git a/api/events/task.pb.go b/api/events/task.pb.go
diff --git a/api/events/task.proto b/api/events/task.proto
@@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message TaskCreate {

diff --git a/api/go.mod b/api/go.mod
@@ -0,0 +1,21 @@
+module github.com/containerd/containerd/api
+
+go 1.21.8
+
+require (
+	github.com/containerd/ttrpc v1.2.3
+	github.com/containerd/typeurl/v2 v2.1.1
+	github.com/opencontainers/image-spec v1.1.0
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda
+	google.golang.org/grpc v1.63.2
+	google.golang.org/protobuf v1.33.0
+)
+
+require (
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+)