fix gogo/protobuf -> google.golang.org/protobuf

Signed-off-by: Akhil Mohan <[email protected]>

Author: akhilerm

container/containerd/client.go

@@ -22,10 +22,10 @@ import (
 	"sync"
 	"time"
 
-	ptypes "github.com/gogo/protobuf/types"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 
 	containersapi "github.com/containerd/containerd/api/services/containers/v1"
 	tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
@@ -126,22 +126,23 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
 	if err != nil {
 		return 0, errdefs.FromGRPC(err)
 	}
-	if response.Process.Status == tasktypes.StatusUnknown {
+	if response.Process.Status == tasktypes.Status_UNKNOWN {
 		return 0, ErrTaskIsInUnknownState
 	}
 	return response.Process.Pid, nil
 }
 
 func (c *client) Version(ctx context.Context) (string, error) {
-	response, err := c.versionService.Version(ctx, &ptypes.Empty{})
+	response, err := c.versionService.Version(ctx, &emptypb.Empty{})
 	if err != nil {
 		return "", errdefs.FromGRPC(err)
 	}
 	return response.Version, nil
 }
 
-func containerFromProto(containerpb containersapi.Container) *containers.Container {
+func containerFromProto(containerpb *containersapi.Container) *containers.Container {
 	var runtime containers.RuntimeInfo
+	// TODO: is nil check required for containerpb
 	if containerpb.Runtime != nil {
 		runtime = containers.RuntimeInfo{
 			Name:    containerpb.Runtime.Name,

container/containerd/containers/containers.go

@@ -33,7 +33,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/gogo/protobuf/types"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 )
 
 // Container represents the set of data pinned by a container. Unless otherwise
@@ -66,7 +66,7 @@ type Container struct {
 	// container.
 	//
 	// This field is required but mutable.
-	Spec *types.Any
+	Spec *anypb.Any
 
 	// SnapshotKey specifies the snapshot key to use for the container's root
 	// filesystem. When starting a task from this container, a caller should
@@ -88,13 +88,13 @@ type Container struct {
 	UpdatedAt time.Time
 
 	// Extensions stores client-specified metadata
-	Extensions map[string]types.Any
+	Extensions map[string]*anypb.Any
 }
 
 // RuntimeInfo holds runtime specific information
 type RuntimeInfo struct {
 	Name    string
-	Options *types.Any
+	Options *anypb.Any
 }
 
 // Store interacts with the underlying container storage