Use google.golang.org/protobuf instead of github.com/gogo/protobuf

This change replaces github.com/gogo/protobuf with
google.golang.org/protobuf, except for the code generators.

Signed-off-by: Kazuyoshi Kato <[email protected]>

.github/workflows/ci.yml

@@ -107,23 +107,20 @@ jobs:
         sudo chmod -R go+rX /usr/local/include
         sudo chmod go+x /usr/local/bin/protoc
 
-    - name: Install gogo/protobuf
+    - name: Install protoc-gen-go
       run: |
-        cd $GOPATH/src
-        mkdir -p github.com/gogo
-        cd github.com/gogo
-        git clone --depth 1 --branch v1.3.2 https://github.com/gogo/protobuf
+        go install google.golang.org/protobuf/cmd/[email protected]
 
-    - name: Build protoc-gen-gogottrpc
+    - name: Build protoc-gen-go-ttrpc
       working-directory: src/github.com/containerd/ttrpc
       run: |
-        go build ./cmd/protoc-gen-gogottrpc
+        go build ./cmd/protoc-gen-go-ttrpc
 
     - name: Run Protobuild
       working-directory: src/github.com/containerd/ttrpc
       run: |
         export PATH=$GOPATH/bin:$PWD:$PATH
         go install github.com/containerd/protobuild@7e5ee24bc1f70e9e289fef15e2631eb3491320bf
-        cd example
         protobuild
+        (cd example && protobuild)
         git diff --exit-code

Protobuild.toml

@@ -0,0 +1,19 @@
+version = "2"
+generators = ["go"]
+
+# Control protoc include paths. Below are usually some good defaults, but feel
+# free to try it without them if it works for your project.
+[includes]
+  # Include paths that will be added before all others. Typically, you want to
+  # treat the root of the project as an include, but this may not be necessary.
+  before = ["."]
+
+  # Paths that will be added untouched to the end of the includes. We use
+  # `/usr/local/include` to pickup the common install location of protobuf.
+  # This is the default.
+  after = ["/usr/local/include"]
+
+# This section maps protobuf imports to Go packages. These will become
+# `-M` directives in the call to the go protobuf generator.
+[packages]
+  "proto/status.proto" = "google.golang.org/genproto/googleapis/rpc/status"

client.go

@@ -27,10 +27,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 // ErrClosed is returned by client methods when the underlying connection is

client_test.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"testing"
 	"time"
+
+	"github.com/containerd/ttrpc/internal"
 )
 
 func TestUserOnCloseWait(t *testing.T) {
@@ -46,7 +48,7 @@ func TestUserOnCloseWait(t *testing.T) {
 			}),
 		)
 
-		tp      testPayload
+		tp      internal.TestPayload
 		tclient = newTestingClient(client)
 	)
 

codec.go

@@ -19,7 +19,7 @@ package ttrpc
 import (
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 type codec struct{}

example/Protobuild.toml

@@ -1,6 +1,5 @@
-version = "unstable"
-generator = "gogottrpc"
-plugins = ["ttrpc"]
+version = "2"
+generators = ["go", "go-ttrpc"]
 
 # Control protoc include paths. Below are usually some good defaults, but feel
 # free to try it without them if it works for your project.
@@ -9,11 +8,6 @@ plugins = ["ttrpc"]
   # treat the root of the project as an include, but this may not be necessary.
   # before = ["./protobuf"]
 
-  # Paths that should be treated as include roots in relation to the vendor
-  # directory. These will be calculated with the vendor directory nearest the
-  # target package.
-  packages = ["github.com/gogo/protobuf"]
-
   # Paths that will be added untouched to the end of the includes. We use
   # `/usr/local/include` to pickup the common install location of protobuf.
   # This is the default.
@@ -22,11 +16,4 @@ plugins = ["ttrpc"]
 # This section maps protobuf imports to Go packages. These will become
 # `-M` directives in the call to the go protobuf generator.
 [packages]
-  "gogoproto/gogo.proto" = "github.com/gogo/protobuf/gogoproto"
-  "google/protobuf/any.proto" = "github.com/gogo/protobuf/types"
-  "google/protobuf/empty.proto" = "github.com/gogo/protobuf/types"
-  "google/protobuf/descriptor.proto" = "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-  "google/protobuf/field_mask.proto" = "github.com/gogo/protobuf/types"
-  "google/protobuf/timestamp.proto" = "github.com/gogo/protobuf/types"
-  "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types"
   "google/rpc/status.proto" = "github.com/containerd/containerd/protobuf/google/rpc"

example/cmd/main.go

@@ -26,7 +26,7 @@ import (
 
 	ttrpc "github.com/containerd/ttrpc"
 	"github.com/containerd/ttrpc/example"
-	"github.com/gogo/protobuf/types"
+	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 const socket = "example-ttrpc-server"
@@ -130,6 +130,6 @@ func (s *exampleServer) Method1(ctx context.Context, r *example.Method1Request)
 	}, nil
 }
 
-func (s *exampleServer) Method2(ctx context.Context, r *example.Method1Request) (*types.Empty, error) {
-	return &types.Empty{}, nil
+func (s *exampleServer) Method2(ctx context.Context, r *example.Method1Request) (*emptypb.Empty, error) {
+	return &emptypb.Empty{}, nil
 }