Update to latest Protobuf 21.3 release (vitessio#10803)

This updates to the latest Protobuf release (where they seem to have
dropped the 3 prefix as well).

The version has MacOS arm64 binaries as well, so we can remove the
Homebrew path. The homebrew path was broken as well, because we'd alias
whichever version of protobuf was installed as 3.19.4 even if it's a
different version.

That in turn leads to always having diffs in the generated protobuf
code, thus also failing CI or having to manually fix up generated code.

Updating this and having a fixed binary in place resolves that issue as
well.

Signed-off-by: Dirkjan Bussink <[email protected]>

Author: dbussink

Makefile

@@ -246,7 +246,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 		--go-vtproto_opt=features=marshal+unmarshal+size+pool \
 		--go-vtproto_opt=pool=vitess.io/vitess/go/vt/proto/query.Row \
 		--go-vtproto_opt=pool=vitess.io/vitess/go/vt/proto/binlogdata.VStreamRowsResponse \
-		-I${PWD}/dist/vt-protoc-3.19.4/include:proto $(PROTO_SRCS)
+		-I${PWD}/dist/vt-protoc-21.3/include:proto $(PROTO_SRCS)
 	cp -Rf vitess.io/vitess/go/vt/proto/* go/vt/proto
 	rm -rf vitess.io/vitess/go/vt/proto/
 

bootstrap.sh

@@ -107,42 +107,16 @@ install_protoc() {
       aarch64)  local target=aarch_64;;
       x86_64)  local target=x86_64;;
       arm64) case "$platform" in
-          osx) local use_homebrew=1;;
+          osx) local target=aarch_64;;
           *) echo "ERROR: unsupported architecture for protoc"; exit 1;;
       esac;;
       *)   echo "ERROR: unsupported architecture for protoc"; exit 1;;
   esac
 
-  # TODO (ajm188): remove this branch after protoc includes signed protoc binaries for M1 Macs.
-  if [[ "$use_homebrew" -eq 1 ]]; then
-    cat >&2 <<WARNING
-WARN: Protobuf does not have a protoc binary for arm64 macos.
-Checking for homebrew installation. Altertatively, you may install the x86-64
-version if you have Rosetta installed; your mileage may vary.
-
-See https://github.com/protocolbuffers/protobuf/issues/9397.
-WARNING
-
-    if [[ -z "$(command -v brew)" ]]; then
-      echo "Could not find \`brew\` command. Please install homebrew and retry." >&2;
-      exit 1;
-    fi
-
-    brew install protobuf;
-    protobuf_base="$(brew list protobuf | grep -E 'LICENSE$' | sed 's:/LICENSE$::')"
-    if [[ -z "$protobuf_base" ]]; then
-      echo "Could not find \`protobuf\` directory after installing. Please verify the output of \`brew info protobuf\`" >&2;
-      exit 1;
-    fi
-
-    ln -snf "${protobuf_base}/bin" "${dist}/bin"
-    ln -snf "${protobuf_base}/include" "${dist}/include"
-  else
-    # This is how we'd download directly from source:
-    # wget https://github.com/protocolbuffers/protobuf/releases/download/v$version/protoc-$version-$platform-${target}.zip
-    $VTROOT/tools/wget-retry "${VITESS_RESOURCES_DOWNLOAD_URL}/protoc-$version-$platform-${target}.zip"
-    unzip "protoc-$version-$platform-${target}.zip"
-  fi
+  # This is how we'd download directly from source:
+  $VTROOT/tools/wget-retry https://github.com/protocolbuffers/protobuf/releases/download/v$version/protoc-$version-$platform-${target}.zip
+  #$VTROOT/tools/wget-retry "${VITESS_RESOURCES_DOWNLOAD_URL}/protoc-$version-$platform-${target}.zip"
+  unzip "protoc-$version-$platform-${target}.zip"
 
   ln -snf "$dist/bin/protoc" "$VTROOT/bin/protoc"
 }
@@ -291,7 +265,7 @@ install_all() {
   echo "##local system details..."
   echo "##platform: $(uname) target:$(get_arch) OS: $os"
   # protoc
-  protoc_ver=3.19.4
+  protoc_ver=21.3
   install_dep "protoc" "$protoc_ver" "$VTROOT/dist/vt-protoc-$protoc_ver" install_protoc
 
   # zk