Fix usage of protoc-gen-go-binary (#15920)

* Fix usage of protoc-gen-go-binary
* Pin protoc-gen-go-binary version

GNUmakefile

@@ -13,6 +13,7 @@ BUF_VERSION='v1.4.0'
 PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
 MOG_VERSION='v0.3.0'
 PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
+PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
 DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
 
 MOCKED_PB_DIRS= pbdns

build-support/scripts/devtools.sh

@@ -73,6 +73,8 @@ function proto_tools_install {
     mog_version="$(make --no-print-directory print-MOG_VERSION)"
     protoc_go_inject_tag_version="$(make --no-print-directory print-PROTOC_GO_INJECT_TAG_VERSION)"
     buf_version="$(make --no-print-directory print-BUF_VERSION)"
+    protoc_gen_go_binary_version="$(make --no-print-directory print-PROTOC_GEN_GO_BINARY_VERSION)"
+
 
     # echo "go: ${protoc_gen_go_version}"
     # echo "mog: ${mog_version}"
@@ -102,9 +104,11 @@ function proto_tools_install {
         "${protoc_gen_go_grpc_version}" \
         'google.golang.org/grpc/cmd/protoc-gen-go-grpc'
 
-    install_unversioned_tool \
+    install_versioned_tool \
         protoc-gen-go-binary \
-        'github.com/hashicorp/protoc-gen-go-binary@master'
+        'github.com/hashicorp/protoc-gen-go-binary' \
+        "${protoc_gen_go_binary_version}" \
+        'github.com/hashicorp/protoc-gen-go-binary'
 
     install_versioned_tool \
         'protoc-go-inject-tag' \

proto-public/annotations/ratelimit/ratelimit.pb.binary.go

@@ -4,7 +4,7 @@
 package ratelimit
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto-public/buf.gen.yaml

@@ -20,6 +20,8 @@ plugins:
       - require_unimplemented_servers=false
   - name: go-binary
     out: .
+    opt:
+      - paths=source_relative
   - name: consul-rate-limit
     out: .
     opt:

proto-public/pbacl/acl.pb.binary.go

@@ -4,7 +4,7 @@
 package pbacl
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto-public/pbconnectca/ca.pb.binary.go

@@ -4,7 +4,7 @@
 package pbconnectca
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto-public/pbdataplane/dataplane.pb.binary.go

@@ -4,7 +4,7 @@
 package pbdataplane
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto-public/pbdns/dns.pb.binary.go

@@ -4,7 +4,7 @@
 package pbdns
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto-public/pbserverdiscovery/serverdiscovery.pb.binary.go

@@ -4,7 +4,7 @@
 package pbserverdiscovery
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/buf.gen.yaml

@@ -21,6 +21,8 @@ plugins:
       - require_unimplemented_servers=false
   - name: go-binary
     out: .
+    opt:
+      - paths=source_relative
   - name: consul-rate-limit
     out: .
     opt:

proto/pbacl/acl.pb.binary.go

@@ -4,7 +4,7 @@
 package pbacl
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbautoconf/auto_config.pb.binary.go

@@ -4,7 +4,7 @@
 package pbautoconf
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbcommon/common.pb.binary.go

@@ -4,7 +4,7 @@
 package pbcommon
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbconfig/config.pb.binary.go

@@ -4,7 +4,7 @@
 package pbconfig
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbconfigentry/config_entry.pb.binary.go

@@ -4,7 +4,7 @@
 package pbconfigentry
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbconnect/connect.pb.binary.go

@@ -4,7 +4,7 @@
 package pbconnect
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pboperator/operator.pb.binary.go

@@ -4,7 +4,7 @@
 package pboperator
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbpeering/peering.pb.binary.go

@@ -4,7 +4,7 @@
 package pbpeering
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbpeerstream/peerstream.pb.binary.go

@@ -4,7 +4,7 @@
 package pbpeerstream
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbservice/healthcheck.pb.binary.go

@@ -4,7 +4,7 @@
 package pbservice
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbservice/node.pb.binary.go

@@ -4,7 +4,7 @@
 package pbservice
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbservice/service.pb.binary.go

@@ -4,7 +4,7 @@
 package pbservice
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbstatus/status.pb.binary.go

@@ -4,7 +4,7 @@
 package pbstatus
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler

proto/pbsubscribe/subscribe.pb.binary.go

@@ -4,7 +4,7 @@
 package pbsubscribe
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // MarshalBinary implements encoding.BinaryMarshaler