Merge pull request #6835 from kzys/proto-upgrade-5

estesp · web-flow · commit 320ef912bc72 · 2022-04-21T14:24:04.000+01:00
Prepare for google.golang.org/protobuf
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -48,6 +48,9 @@ file {
     type: TYPE_BOOL
     json_name: "fieldpath"
   }
+  options {
+    go_package: "github.com/containerd/containerd/protobuf/plugin"
+  }
 }
 file {
   name: "github.com/containerd/containerd/api/events/container.proto"
@@ -1214,6 +1217,9 @@ file {
       number: 5
     }
   }
+  options {
+    go_package: "github.com/containerd/containerd/api/types/task"
+  }
   syntax: "proto3"
 }
 file {
diff --git a/api/types/task/task.pb.go b/api/types/task/task.pb.go
diff --git a/api/types/task/task.proto b/api/types/task/task.proto
@@ -22,6 +22,8 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 
+option go_package = "github.com/containerd/containerd/api/types/task";
+
 enum Status {
 	UNKNOWN = 0;
 	CREATED = 1;
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -39,6 +39,7 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/process"
 	"github.com/containerd/containerd/protobuf"
+	"github.com/containerd/containerd/protobuf/proto"
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	shimlog "github.com/containerd/containerd/runtime/v1"
 	"github.com/containerd/containerd/runtime/v1/shim"
@@ -305,7 +306,7 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
 	if err != nil {
 		return err
 	}
-	data, err := encoded.Marshal()
+	data, err := proto.Marshal(encoded)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go
@@ -28,6 +28,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/dialer"
+	"github.com/containerd/containerd/protobuf/proto"
 	"github.com/containerd/containerd/protobuf/types"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
@@ -78,7 +79,7 @@ func getEventPayload(r io.Reader) (*types.Any, error) {
 		return nil, err
 	}
 	var any types.Any
-	if err := any.Unmarshal(data); err != nil {
+	if err := proto.Unmarshal(data, &any); err != nil {
 		return nil, err
 	}
 	return &any, nil
diff --git a/container_checkpoint_opts.go b/container_checkpoint_opts.go
@@ -29,6 +29,7 @@ import (
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/protobuf"
+	"github.com/containerd/containerd/protobuf/proto"
 	"github.com/containerd/containerd/rootfs"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/opencontainers/go-digest"
@@ -79,7 +80,7 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta
 		})
 	}
 	// save copts
-	data, err := any.Marshal()
+	data, err := proto.Marshal(any)
 	if err != nil {
 		return err
 	}
@@ -99,7 +100,8 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta
 // WithCheckpointRuntime includes the container runtime info
 func WithCheckpointRuntime(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error {
 	if c.Runtime.Options != nil && c.Runtime.Options.GetValue() != nil {
-		data, err := protobuf.FromAny(c.Runtime.Options).Marshal()
+		any := protobuf.FromAny(c.Runtime.Options)
+		data, err := proto.Marshal(any)
 		if err != nil {
 			return err
 		}
diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go
@@ -32,6 +32,7 @@ var empty = &ptypes.Empty{}
 
 type service struct {
 	sn snapshots.Snapshotter
+	snapshotsapi.UnimplementedSnapshotsServer
 }
 
 // FromSnapshotter returns a Snapshot API server from a containerd snapshotter
diff --git a/protobuf/plugin/fieldpath.pb.go b/protobuf/plugin/fieldpath.pb.go
diff --git a/protobuf/plugin/fieldpath.proto b/protobuf/plugin/fieldpath.proto
@@ -31,6 +31,8 @@ package containerd.plugin;
 
 import "google/protobuf/descriptor.proto";
 
+option go_package = "github.com/containerd/containerd/protobuf/plugin";
+
 extend google.protobuf.FileOptions {
 	optional bool fieldpath_all = 63300;
 }
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -30,6 +30,7 @@ import (
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/protobuf"
+	"github.com/containerd/containerd/protobuf/proto"
 	"github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	client "github.com/containerd/containerd/runtime/v2/shim"
@@ -185,7 +186,7 @@ func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
 		log.G(ctx).Warnf("cleanup warnings %s", s)
 	}
 	var response task.DeleteResponse
-	if err := response.Unmarshal(out.Bytes()); err != nil {
+	if err := proto.Unmarshal(out.Bytes(), &response); err != nil {
 		return nil, err
 	}
 	if err := b.bundle.Delete(); err != nil {
diff --git a/services/containers/service.go b/services/containers/service.go
@@ -55,6 +55,7 @@ func init() {
 
 type service struct {
 	local api.ContainersClient
+	api.UnimplementedContainersServer
 }
 
 var _ api.ContainersServer = &service{}
diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go
@@ -38,6 +38,7 @@ import (
 
 type service struct {
 	store content.Store
+	api.UnimplementedContentServer
 }
 
 var bufPool = sync.Pool{
diff --git a/services/diff/service.go b/services/diff/service.go
@@ -53,6 +53,7 @@ func init() {
 
 type service struct {
 	local diffapi.DiffClient
+	diffapi.UnimplementedDiffServer
 }
 
 var _ diffapi.DiffServer = &service{}
diff --git a/services/events/service.go b/services/events/service.go
@@ -52,6 +52,7 @@ func init() {
 type service struct {
 	ttService *ttrpcService
 	events    *exchange.Exchange
+	api.UnimplementedEventsServer
 }
 
 // NewService returns the GRPC events server
diff --git a/services/images/service.go b/services/images/service.go
@@ -54,6 +54,7 @@ func init() {
 
 type service struct {
 	local imagesapi.ImagesClient
+	imagesapi.UnimplementedImagesServer
 }
 
 var _ imagesapi.ImagesServer = &service{}
diff --git a/services/introspection/service.go b/services/introspection/service.go
@@ -62,6 +62,7 @@ func init() {
 
 type server struct {
 	local api.IntrospectionClient
+	api.UnimplementedIntrospectionServer
 }
 
 var _ = (api.IntrospectionServer)(&server{})
diff --git a/services/leases/service.go b/services/leases/service.go
@@ -47,6 +47,7 @@ func init() {
 
 type service struct {
 	lm leases.Manager
+	api.UnimplementedLeasesServer
 }
 
 func (s *service) Register(server *grpc.Server) error {
diff --git a/services/namespaces/service.go b/services/namespaces/service.go
@@ -54,6 +54,7 @@ func init() {
 
 type service struct {
 	local api.NamespacesClient
+	api.UnimplementedNamespacesServer
 }
 
 var _ api.NamespacesServer = &service{}
diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go
@@ -59,6 +59,7 @@ func init() {
 
 type controllerService struct {
 	local api.ControllerClient
+	api.UnimplementedControllerServer
 }
 
 var _ api.ControllerServer = (*controllerService)(nil)
diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go
@@ -55,6 +55,7 @@ func init() {
 
 type sandboxService struct {
 	local api.StoreClient
+	api.UnimplementedStoreServer
 }
 
 var _ api.StoreServer = (*sandboxService)(nil)
diff --git a/services/snapshots/service.go b/services/snapshots/service.go
@@ -48,6 +48,7 @@ var empty = &ptypes.Empty{}
 
 type service struct {
 	ss map[string]snapshots.Snapshotter
+	snapshotsapi.UnimplementedSnapshotsServer
 }
 
 func newService(ic *plugin.InitContext) (interface{}, error) {
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -42,6 +42,7 @@ import (
 	"github.com/containerd/containerd/pkg/timeout"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/protobuf"
+	"github.com/containerd/containerd/protobuf/proto"
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
@@ -579,7 +580,8 @@ func (l *local) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest, _
 		return nil, err
 	}
 	// write the config to the content store
-	data, err := protobuf.FromAny(container.Spec).Marshal()
+	pbany := protobuf.FromAny(container.Spec)
+	data, err := proto.Marshal(pbany)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/tasks/service.go b/services/tasks/service.go
@@ -58,6 +58,7 @@ func init() {
 
 type service struct {
 	local api.TasksClient
+	api.UnimplementedTasksServer
 }
 
 func (s *service) Register(server *grpc.Server) error {
diff --git a/services/version/service.go b/services/version/service.go
@@ -41,6 +41,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
 }
 
 type service struct {
+	api.UnimplementedVersionServer
 }
 
 func (s *service) Register(server *grpc.Server) error {

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ file {`
`48`	`48`	`type: TYPE_BOOL`
`49`	`49`	`json_name: "fieldpath"`
`50`	`50`	`}`
	`51`	`+ options {`
	`52`	`+ go_package: "github.com/containerd/containerd/protobuf/plugin"`
	`53`	`+ }`
`51`	`54`	`}`
`52`	`55`	`file {`
`53`	`56`	`name: "github.com/containerd/containerd/api/events/container.proto"`
`@@ -1214,6 +1217,9 @@ file {`
`1214`	`1217`	`number: 5`
`1215`	`1218`	`}`
`1216`	`1219`	`}`
	`1220`	`+ options {`
	`1221`	`+ go_package: "github.com/containerd/containerd/api/types/task"`
	`1222`	`+ }`
`1217`	`1223`	`syntax: "proto3"`
`1218`	`1224`	`}`
`1219`	`1225`	`file {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ var empty = &ptypes.Empty{}`
`32`	`32`
`33`	`33`	`type service struct {`
`34`	`34`	`sn snapshots.Snapshotter`
	`35`	`+ snapshotsapi.UnimplementedSnapshotsServer`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`// FromSnapshotter returns a Snapshot API server from a containerd snapshotter`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ package containerd.plugin;`
`31`	`31`
`32`	`32`	`import "google/protobuf/descriptor.proto";`
`33`	`33`
	`34`	`+option go_package = "github.com/containerd/containerd/protobuf/plugin";`
	`35`	`+`
`34`	`36`	`extend google.protobuf.FileOptions {`
`35`	`37`	`optional bool fieldpath_all = 63300;`
`36`	`38`	`}`