code review changes

.circleci/config.yml

@@ -237,9 +237,10 @@ jobs:
       - run:
           name: Install protobuf
           command: |
+            goproto_version=$(go list -m github.com/golang/protobuf | awk '{print $2}')
             go install -v github.com/hashicorp/protoc-gen-go-binary@master
             go install -v github.com/favadi/protoc-go-inject-tag@v1.3.0
-            go install -v github.com/golang/protobuf/protoc-gen-go@v1.3.5
+            go install -v github.com/golang/protobuf/protoc-gen-go@${goproto_version}
 
       - run:
           command: make --always-make proto

GNUmakefile

@@ -2,11 +2,13 @@
 # https://www.consul.io/docs/install#compiling-from-source
 
 SHELL = bash
+GOPROTOVERSION?=$(shell grep github.com/golang/protobuf go.mod | awk '{print $$2}')
 GOTOOLS = \
 	github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs@master \
 	github.com/hashicorp/go-bindata/go-bindata@master \
 	golang.org/x/tools/cmd/cover@master \
 	golang.org/x/tools/cmd/stringer@master \
+	github.com/golang/protobuf/protoc-gen-go@$(GOPROTOVERSION) \
 	github.com/hashicorp/protoc-gen-go-binary@master \
 	github.com/vektra/mockery/cmd/mockery@master \
 	github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1 \

build-support/scripts/proto-gen-entry.sh

@@ -1,169 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
-pushd $(dirname ${BASH_SOURCE[0]}) > /dev/null
-SCRIPT_DIR=$(pwd)
-pushd ../.. > /dev/null
-SOURCE_DIR=$(pwd)
-popd > /dev/null
-pushd ../functions > /dev/null
-FN_DIR=$(pwd)
-popd > /dev/null
-popd > /dev/null
-
-source "${SCRIPT_DIR}/functions.sh"
-
-function usage {
-cat <<-EOF
-Usage: ${SCRIPT_NAME} [<options ...>] <proto filepath>
-
-Description:
-   Generate the Go files from protobuf definitions. In addition to
-   running the protoc generator it will also fixup build tags in the
-   generated code.
-
-Options:
-   --import-replace         Replace imports of google types with those from the protobuf repo.
-   --grpc                   Enable the gRPC plugin
-   -h | --help              Print this help text.
-EOF
-}
-
-function err_usage {
-   err "$1"
-   err ""
-   err "$(usage)"
-}
-
-function main {
-   local -i grpc=0
-   local -i imp_replace=0
-   local    proto_path=
-
-   while test $# -gt 0
-   do
-      case "$1" in
-         -h | --help )
-            usage
-            return 0
-            ;;
-         --grpc )
-            grpc=1
-            shift
-            ;;
-         --import-replace )
-            imp_replace=1
-            shift
-            ;;
-         * )
-            proto_path="$1"
-            shift
-            ;;
-      esac
-   done
-
-   if test -z "${proto_path}"
-   then
-      err_usage "ERROR: No proto file specified"
-      return 1
-   fi
-
-   go mod download
-
-   local golang_proto_path=$(go list -f '{{ .Dir }}' -m github.com/golang/protobuf)
-   local golang_proto_mod_path=$(sed -e 's,\(.*\)github.com.*,\1,' <<< "${golang_proto_path}")
-
-
-   local golang_proto_imp_replace="Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp"
-   golang_proto_imp_replace="${golang_proto_imp_replace},Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration"
-
-   local proto_go_path=${proto_path%%.proto}.pb.go
-   local proto_go_bin_path=${proto_path%%.proto}.pb.binary.go
-   local proto_go_rpcglue_path=${proto_path%%.proto}.rpcglue.pb.go
-
-   local go_proto_out="paths=source_relative"
-   if is_set "${grpc}"
-   then
-      go_proto_out="${go_proto_out},plugins=grpc"
-   fi
-
-   if is_set "${imp_replace}"
-   then
-      go_proto_out="${go_proto_out},${golang_proto_imp_replace}"
-   fi
-
-   if test -n "${go_proto_out}"
-   then
-      go_proto_out="${go_proto_out}:"
-   fi
-
-   # How we run protoc probably needs some documentation.
-   #
-   # This is the path to where
-   #  -I="${golang_proto_path}/protobuf" \
-   local -i ret=0
-   status_stage "Generating ${proto_path} into ${proto_go_path} and ${proto_go_bin_path} (NO GOGO)"
-    echo "debug_run protoc \
-          -I=\"${golang_proto_path}\" \
-          -I=\"${golang_proto_mod_path}\" \
-          -I=\"${SOURCE_DIR}\" \
-          --go_out=\"${go_proto_out}${SOURCE_DIR}\" \
-          --go-binary_out=\"${SOURCE_DIR}\" \
-          \"${proto_path}\""
-   debug_run protoc \
-      -I="${golang_proto_path}" \
-      -I="${golang_proto_mod_path}" \
-      -I="${SOURCE_DIR}" \
-      --go_out="${go_proto_out}${SOURCE_DIR}" \
-      --go-binary_out="${SOURCE_DIR}" \
-      "${proto_path}"
-
-   if test $? -ne 0
-   then
-      err "Failed to run protoc for ${proto_path}"
-      return 1
-   fi
-
-   debug_run protoc-go-inject-tag \
-   	   -input="${proto_go_path}"
-
-   if test $? -ne 0
-   then
-      err "Failed to run protoc-go-inject-tag for ${proto_path}"
-      return 1
-   fi
-
-   echo "debug_run protoc \
-         -I=\"${golang_proto_path}\" \
-         -I=\"${golang_proto_mod_path}\" \
-         -I=\"${SOURCE_DIR}\" \
-         --go_out=\"${go_proto_out}${SOURCE_DIR}\" \
-         --go-binary_out=\"${SOURCE_DIR}\" \
-         \"${proto_path}\""
-
-   BUILD_TAGS=$(sed -e '/^[[:space:]]*$/,$d' < "${proto_path}" | grep '// +build')
-   if test -n "${BUILD_TAGS}"
-   then
-      echo -e "${BUILD_TAGS}\n" >> "${proto_go_path}.new"
-      cat "${proto_go_path}" >> "${proto_go_path}.new"
-      mv "${proto_go_path}.new" "${proto_go_path}"
-
-      echo -e "${BUILD_TAGS}\n" >> "${proto_go_bin_path}.new"
-      cat "${proto_go_bin_path}" >> "${proto_go_bin_path}.new"
-      mv "${proto_go_bin_path}.new" "${proto_go_bin_path}"
-   fi
-
-   # note: this has to run after we fix up the build tags above
-   rm -f "${proto_go_rpcglue_path}"
-   debug_run go run ./internal/tools/proto-gen-rpc-glue/main.go -path "${proto_go_path}"
-   if test $? -ne 0
-      then
-         err "Failed to generate consul rpc glue outputs from ${proto_path}"
-         return 1
-   fi
-
-   return 0
-}
-
-main "$@"
-exit $?