Update verify protobuf scripts

Author: JoelSpeed

hack/update-protobuf.sh

@@ -2,44 +2,10 @@
 
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-[[ -n "${PROTO_OPTIONAL:-}" ]] && exit 0
-
-if [ -z "${GOPATH:-}" ]; then
-  echo "Generating protobuf requires GOPATH to be set. Please set GOPATH.
-To skip protobuf generation, set \$PROTO_OPTIONAL."
-  exit 1
-fi
-
-if [[ "$(protoc --version)" != "libprotoc 3."* ]]; then
-  echo "Generating protobuf requires protoc 3.0.x. Please download and
-install the platform appropriate Protobuf package for your OS:
-
-  https://github.com/google/protobuf/releases
-
-To skip protobuf generation, set \$PROTO_OPTIONAL."
-  exit 1
-fi
-
-# Build go-to-protobuf when it's not present and not overriden for a specific file.
-if [ -z "${GO_TO_PROTOBUF:-}" ]; then
-  ${TOOLS_MAKE} go-to-protobuf
-  GO_TO_PROTOBUF="${TOOLS_OUTPUT}/go-to-protobuf"
-fi
-
 # Build protoc-gen-gogo when it's not present and not overriden for a specific file.
 if [ -z "${PROTOC_GEN_GOGO:-}" ]; then
   ${TOOLS_MAKE} protoc-gen-gogo
   PROTOC_GEN_GOGO="${TOOLS_OUTPUT}/protoc-gen-gogo"
 fi
 
-# We need to make sure that protoc-gen-gogo is on the path for go-to-protobuf to run correctly.
-protoc_bin_dir=$(dirname "${PROTOC_GEN_GOGO}")
-
-PATH="$PATH:${protoc_bin_dir}" "${GO_TO_PROTOBUF}" \
-  --output-base="${GOPATH}/src" \
-  --apimachinery-packages='-k8s.io/apimachinery/pkg/util/intstr,-k8s.io/apimachinery/pkg/api/resource,-k8s.io/apimachinery/pkg/runtime/schema,-k8s.io/apimachinery/pkg/runtime,-k8s.io/apimachinery/pkg/apis/meta/v1,-k8s.io/apimachinery/pkg/apis/meta/v1beta1,-k8s.io/api/core/v1,-k8s.io/api/rbac/v1' \
-  --go-header-file=${SCRIPT_ROOT}/hack/empty.txt \
-  --proto-import=${SCRIPT_ROOT}/third_party/protobuf \
-  --proto-import=${SCRIPT_ROOT}/vendor \
-  --proto-import=${SCRIPT_ROOT}/tools/vendor \
-  --packages="${API_PACKAGES}"
+GENERATOR=go-to-protobuf ${SCRIPT_ROOT}/hack/update-codegen.sh

hack/verify-protobuf.sh

@@ -2,29 +2,10 @@
 
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-TMP_ROOT="${SCRIPT_ROOT}/_tmp"
+# Build protoc-gen-gogo when it's not present and not overriden for a specific file.
+if [ -z "${PROTOC_GEN_GOGO:-}" ]; then
+  ${TOOLS_MAKE} protoc-gen-gogo
+  PROTOC_GEN_GOGO="${TOOLS_OUTPUT}/protoc-gen-gogo"
+fi
 
-cleanup() {
-  rm -rf "${TMP_ROOT}"
-}
-trap "cleanup" EXIT SIGINT
-
-cleanup
-
-for gv in ${API_GROUP_VERSIONS}; do
-  mkdir -p "${TMP_ROOT}/${gv}"
-  cp -a --no-preserve=timestamp "${SCRIPT_ROOT}/${gv}"/* "${TMP_ROOT}/${gv}"
-done
-
-"${SCRIPT_ROOT}/hack/update-protobuf.sh"
-echo "Checking against freshly generated protobuf..."
-for gv in ${API_GROUP_VERSIONS}; do
-  ret=0
-  diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' -x 'types_swagger*' "${SCRIPT_ROOT}/${gv}" "${TMP_ROOT}/${gv}" || ret=$?
-  if [[ $ret -ne 0 ]]; then
-    cp -a --no-preserve=timestamp "${TMP_ROOT}"/* "${SCRIPT_ROOT}/"
-    echo "Protobuf is out of date. Please run hack/update-protobuf.sh"
-    exit 1
-  fi
-done
-echo "Protobuf up to date."
+GENERATOR=go-to-protobuf EXTRA_ARGS=--verify ${SCRIPT_ROOT}/hack/update-codegen.sh