Consolidate gogo/protobuf dependencies under our own protobuf package

This would make gogo/protobuf migration easier.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>

pkg/cri/server/helpers_test.go

@@ -30,11 +30,11 @@ import (
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
 	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/reference/docker"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
 	runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/typeurl"
-	"github.com/gogo/protobuf/types"
 
 	imagedigest "github.com/opencontainers/go-digest"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"

pkg/process/deleted_state.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/errdefs"
-	google_protobuf "github.com/gogo/protobuf/types"
+	google_protobuf "github.com/containerd/containerd/protobuf/types"
 )
 
 type deletedState struct {

pkg/process/init.go

@@ -34,9 +34,9 @@ import (
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/pkg/stdio"
+	google_protobuf "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
-	google_protobuf "github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/sys/unix"
 )

pkg/process/init_state.go

@@ -24,8 +24,8 @@ import (
 	"errors"
 	"fmt"
 
+	google_protobuf "github.com/containerd/containerd/protobuf/types"
 	runc "github.com/containerd/go-runc"
-	google_protobuf "github.com/gogo/protobuf/types"
 	"github.com/sirupsen/logrus"
 )
 

pkg/process/types.go

@@ -17,7 +17,7 @@
 package process
 
 import (
-	google_protobuf "github.com/gogo/protobuf/types"
+	google_protobuf "github.com/containerd/containerd/protobuf/types"
 )
 
 // Mount holds filesystem mount configuration