Skip to content

Commit 9e803ba

Browse files
yuanweizcopybara-github
authored andcommitted
[Bzlmod] upgrade googleapis to fix build failure with envoy_apis. (grpc#41363)
What happened: * An upgrade of envoy_api was introduced grpc#41242 * Bazel now pick googleapis@0.0.0-20251003-2193a2bf because envoy_api requested it. * googleapis has gone through a refactor somewhere in between 0.0.0-20240819-fe8ba054a and googleapis@0.0.0-20251003-2193a2bf. As a result `switched_rules` became completely broken for bzlmod. The new recommended approach for bzlmod is to use `googleapis-{cc,python,grpc-cc}` * v1.78.0-pre1 BCR release is blocked, I had to add an overlay [patch](https://github.com/bazelbuild/bazel-central-registry/blob/main/modules/grpc/1.78.0-pre1/patches/add_deps_for_googleapis_switched_rules.patch) to unblock release. * This PR is created to integrate the change to master. Related discussion: bazelbuild/bazel-central-registry#3941 <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> Closes grpc#41363 PiperOrigin-RevId: 856792330
1 parent 1bd3c5b commit 9e803ba

29 files changed

Lines changed: 456 additions & 169 deletions

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MODULE.bazel

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ bazel_dep(name = "bazel_skylib", version = "1.8.1")
2828
bazel_dep(name = "boringssl", version = "0.20241024.0") # mistmatched 20241211
2929
bazel_dep(name = "c-ares", version = "1.19.1", repo_name = "com_github_cares_cares")
3030
bazel_dep(name = "envoy_api", version = "0.0.0-20251216-6ef568c")
31-
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
32-
33-
# TODO(weizheyuan): These two dependencies needed to be added when the
34-
# xDS protos were updated, possibly due to bzlmod picking up a new
35-
# version of googleapis. As part of our bzlmod migration, figure out why
36-
# they are needed and try to figure out a better alternative.
31+
bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf", repo_name = "com_google_googleapis")
3732
bazel_dep(name = "googleapis-cc", version = "1.0.0")
3833
bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0")
34+
bazel_dep(name = "googleapis-python", version = "1.0.0")
3935
bazel_dep(name = "googletest", version = "1.17.0", repo_name = "com_google_googletest")
4036
bazel_dep(name = "opencensus-cpp", version = "0.0.0-20230502-50eb5de.bcr.2", repo_name = "io_opencensus_cpp")
4137
bazel_dep(name = "openssl", version = "3.3.1.bcr.1")
@@ -50,13 +46,6 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
5046
bazel_dep(name = "xds", version = "0.0.0-20240423-555b57e", repo_name = "com_github_cncf_xds") # mismatched 20231116
5147
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
5248

53-
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
54-
switched_rules.use_languages(
55-
cc = True,
56-
grpc = True,
57-
python = True,
58-
)
59-
6049
# Development dependencies
6150
# ========================
6251
bazel_dep(name = "google_benchmark", version = "1.9.0", dev_dependency = True, repo_name = "com_github_google_benchmark")

bazel/grpc_deps.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ def grpc_deps():
307307
if "com_google_googleapis" not in native.existing_rules():
308308
http_archive(
309309
name = "com_google_googleapis",
310-
sha256 = "0513f0f40af63bd05dc789cacc334ab6cec27cc89db596557cb2dfe8919463e4",
311-
strip_prefix = "googleapis-fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0",
310+
sha256 = "3de3a199400eea7a766091aeb96c4b84c86266ad1f933f9933bbb7c359e727fe",
311+
strip_prefix = "googleapis-2193a2bfcecb92b92aad7a4d81baa428cafd7dfd",
312312
build_file = Label("//bazel:googleapis.BUILD"),
313313
urls = [
314-
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz",
315-
"https://github.com/googleapis/googleapis/archive/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz",
314+
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2193a2bfcecb92b92aad7a4d81baa428cafd7dfd.tar.gz",
315+
"https://github.com/googleapis/googleapis/archive/2193a2bfcecb92b92aad7a4d81baa428cafd7dfd.tar.gz",
316316
],
317317
)
318318

build_autogenerated.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

py_xds_protos/generated_file_import_test.py

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)