fix: use protobuf 3.21.12 in bazel build rules (#1584)

parthea · web-flow · commit 954a3240d806 · 2023-02-07T00:13:55.000Z
diff --git a/packages/gapic-generator/BUILD.bazel b/packages/gapic-generator/BUILD.bazel
@@ -9,16 +9,16 @@ toolchain_type(
 
 pandoc_toolchain(
     exec_compatible_with = [
-        "@bazel_tools//platforms:linux",
-        "@bazel_tools//platforms:x86_64",
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
     ],
     platform = "linux",
 )
 
 pandoc_toolchain(
     exec_compatible_with = [
-        "@bazel_tools//platforms:osx",
-        "@bazel_tools//platforms:x86_64",
+        "@platforms//os:osx",
+        "@platforms//cpu:x86_64",
     ],
     platform = "macOS",
 )
diff --git a/packages/gapic-generator/repositories.bzl b/packages/gapic-generator/repositories.bzl
@@ -15,14 +15,14 @@ def gapic_generator_python():
         requirements = "@gapic_generator_python//:requirements.txt",
     )
 
-    _protobuf_version = "3.19.2"
-    _protobuf_sha256 = "9ceef0daf7e8be16cd99ac759271eb08021b53b1c7b6edd399953a76390234cd"
+    _protobuf_version = "3.21.12"
+    _protobuf_sha256 = "930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53"
     _protobuf_version_in_link = "v{}".format(_protobuf_version)
     _maybe(
         http_archive,
         name = "com_google_protobuf",
         sha256 = _protobuf_sha256,
-        url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/{}.zip".format(_protobuf_version_in_link),
+        url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/{}.tar.gz".format(_protobuf_version_in_link),
         strip_prefix = "protobuf-{}".format(_protobuf_version),
     )
 
diff --git a/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py b/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py
@@ -1348,9 +1348,6 @@ async def sample_delete_instance():
 
                       }
 
-                   The JSON representation for Empty is empty JSON
-                   object {}.
-
         """
         # Create or coerce a protobuf request object.
         # Quick check: If we got a request object, we should *not* have
diff --git a/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py b/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
@@ -1542,9 +1542,6 @@ def sample_delete_instance():
 
                       }
 
-                   The JSON representation for Empty is empty JSON
-                   object {}.
-
         """
         # Create or coerce a protobuf request object.
         # Quick check: If we got a request object, we should *not* have

Original file line number	Diff line number	Diff line change
`@@ -1348,9 +1348,6 @@ async def sample_delete_instance():`
`1348`	`1348`
`1349`	`1349`	`}`
`1350`	`1350`
`1351`		`- The JSON representation for Empty is empty JSON`
`1352`		`- object {}.`
`1353`		`-`
`1354`	`1351`	`"""`
`1355`	`1352`	`# Create or coerce a protobuf request object.`
`1356`	`1353`	`# Quick check: If we got a request object, we should not have`
Original file line number	Diff line number	Diff line change
`@@ -1542,9 +1542,6 @@ def sample_delete_instance():`
`1542`	`1542`
`1543`	`1543`	`}`
`1544`	`1544`
`1545`		`- The JSON representation for Empty is empty JSON`
`1546`		`- object {}.`
`1547`		`-`
`1548`	`1545`	`"""`
`1549`	`1546`	`# Create or coerce a protobuf request object.`
`1550`	`1547`	`# Quick check: If we got a request object, we should not have`