Move runtimeoptions to api directory

dmcgowan · dmcgowan · commit 3e9cace720ce · 2024-05-02T10:52:02.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/Makefile b/Makefile
@@ -109,7 +109,6 @@ SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version
 # Project packages.
 PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration)
 API_PACKAGES=$(shell (cd api && $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration))
-NON_API_PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration | grep -v "containerd/api")
 TEST_REQUIRES_ROOT_PACKAGES=$(filter \
     ${PACKAGES}, \
     $(shell \
@@ -178,12 +177,11 @@ 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})
-	@(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_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/ core/runtime/ -name '*.pb.go')
-	go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ core/runtime/ -name '*.pb.go')
+	go-fix-acronym -w -a '^Os' $(shell find api/ -name '*.pb.go')
+	go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ -name '*.pb.go')
 
 check-protos: protos ## check if protobufs needs to be generated again
 	@echo "$(WHALE) $@"
diff --git a/Protobuild.toml b/Protobuild.toml
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -7350,6 +7350,38 @@ file {
   }
   syntax: "proto3"
 }
+file {
+  name: "github.com/containerd/containerd/api/types/runtimeoptions/v1/api.proto"
+  package: "runtimeoptions.v1"
+  message_type {
+    name: "Options"
+    field {
+      name: "type_url"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "typeUrl"
+    }
+    field {
+      name: "config_path"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "configPath"
+    }
+    field {
+      name: "config_body"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_BYTES
+      json_name: "configBody"
+    }
+  }
+  options {
+    go_package: "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1;runtimeoptions"
+  }
+  syntax: "proto3"
+}
 file {
   name: "github.com/containerd/containerd/api/types/transfer/imagestore.proto"
   package: "containerd.types.transfer"
diff --git a/api/types/runtimeoptions/v1/api.pb.go b/api/types/runtimeoptions/v1/api.pb.go
diff --git a/api/types/runtimeoptions/v1/api.proto b/api/types/runtimeoptions/v1/api.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 
 package runtimeoptions.v1;
 
-option go_package = "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1;runtimeoptions_v1";
+option go_package = "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1;runtimeoptions";
 
 message Options {
 	// TypeUrl specifies the type of the content inside the config file.
diff --git a/api/types/runtimeoptions/v1/doc.go b/api/types/runtimeoptions/v1/doc.go
@@ -14,4 +14,4 @@
    limitations under the License.
 */
 
-package runtimeoptions_v1 //nolint:revive // Ignore var-naming: don't use an underscore in package name (revive)
+package runtimeoptions
diff --git a/cmd/ctr/commands/commands_unix.go b/cmd/ctr/commands/commands_unix.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 
 	"github.com/containerd/containerd/v2/api/types/runc/options"
-	runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
+	runtimeoptions "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh
@@ -65,6 +65,7 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/metrics/$1$2"github.com\/containerd\/containerd\/v2\/core\/metrics/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime/$1$2"github.com\/containerd\/containerd\/v2\/core\/runtime/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/core\/runtime\/v2\/runc\/options/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runc\/options/g' $GOFILE
+  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/runtimeoptions/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runtimeoptions/g' $GOFILE
 
   # Migrate packages split out to their own repository
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE
diff --git a/internal/cri/config/config.go b/internal/cri/config/config.go
@@ -30,9 +30,9 @@ import (
 
 	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
+	runtimeoptions "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1"
 	"github.com/containerd/containerd/v2/internal/cri/annotations"
 	"github.com/containerd/containerd/v2/pkg/deprecation"
-	runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
 	"github.com/containerd/containerd/v2/plugins"
 )
 
diff --git a/pkg/runtimeoptions/v1/api.pb.go b/pkg/runtimeoptions/v1/api.pb.go

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"errors"`
`23`	`23`
`24`	`24`	`"github.com/containerd/containerd/v2/api/types/runc/options"`
`25`		`- runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"`
	`25`	`+ runtimeoptions "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1"`
`26`	`26`	`"github.com/urfave/cli/v2"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ import (`
`30`	`30`
`31`	`31`	`runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"`
`32`	`32`	`runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"`
	`33`	`+ runtimeoptions "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1"`
`33`	`34`	`"github.com/containerd/containerd/v2/internal/cri/annotations"`
`34`	`35`	`"github.com/containerd/containerd/v2/pkg/deprecation"`
`35`		`- runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"`
`36`	`36`	`"github.com/containerd/containerd/v2/plugins"`
`37`	`37`	`)`
`38`	`38`