chore(bazel): get bazel 8 working (#15042)

* chore(bazel): get bazel 8 working

* enable workspace where we disable bzlmod

* patch googleapis BUILD.bazel when using workspace

* check for null json

* determine generation proto paths dynamically

* bazel quickstart version has to be changed in two phases

* update quickstart bazelrc to use c++17

Author: scotthart

.bazelversion

@@ -1 +1 @@
-7.6.1
+8.1.1

MODULE.bazel

@@ -22,9 +22,9 @@ module(
 
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "rules_cc", version = "0.0.17")
+bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "abseil-cpp")
-bazel_dep(name = "protobuf", version = "30.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf")
 bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
 bazel_dep(name = "curl", version = "8.8.0.bcr.3", repo_name = "com_github_curl_curl")

bazel/gapic.bzl

@@ -38,23 +38,23 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
 
     native.filegroup(
         name = "srcs",
-        srcs = native.glob(sources_glob),
+        srcs = native.glob(sources_glob, allow_empty = True),
     )
 
     native.filegroup(
         name = "hdrs",
-        srcs = native.glob(include = code_glob, exclude = sources_glob),
+        srcs = native.glob(include = code_glob, exclude = sources_glob, allow_empty = True),
     )
 
     native.filegroup(
         name = "public_hdrs",
-        srcs = native.glob([d + "*.h" for d in service_dirs]),
+        srcs = native.glob([d + "*.h" for d in service_dirs], allow_empty = True),
         visibility = ["//:__pkg__"],
     )
 
     native.filegroup(
         name = "mocks",
-        srcs = native.glob([d + "mocks/*.h" for d in service_dirs]),
+        srcs = native.glob([d + "mocks/*.h" for d in service_dirs], allow_empty = True),
         visibility = ["//:__pkg__"],
     )
 
@@ -84,4 +84,4 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
             "//:" + name,
             "//google/cloud/testing_util:google_cloud_cpp_testing_private",
         ],
-    ) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs])]
+    ) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs], allow_empty = True)]

bazel/googleapis.workspace.patch

@@ -0,0 +1,13 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index 95e4c12e5..83838d3f0 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -2,7 +2,7 @@ genrule(
+   name = "build_gen",
+   outs = ["build_gen.sh"],
+   executable = True,
+-  srcs = glob(["run_build_gen.sh"]),
++  srcs = glob(["run_build_gen.sh"], allow_empty=True),
+   cmd = """
+     if test -z \"$(SRCS)\"; then
+       cat <<EOD > $@

bazel/workspace0.bzl

@@ -71,10 +71,10 @@ def gl_cpp_workspace0(name = None):
         http_archive,
         name = "rules_cc",
         urls = [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz",
+            "https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz",
         ],
-        sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
-        strip_prefix = "rules_cc-0.0.17",
+        sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
+        strip_prefix = "rules_cc-0.1.1",
     )
 
     maybe(
@@ -146,7 +146,7 @@ def gl_cpp_workspace0(name = None):
         # protobuf message. No changes to `patches` should ever be
         # committed to the main branch.
         patch_tool = "patch",
-        patch_args = ["-p1"],
+        patch_args = ["-p1", "-l", "-n"],
         patches = [],
     )
 
@@ -155,10 +155,10 @@ def gl_cpp_workspace0(name = None):
         http_archive,
         name = "com_google_protobuf",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/v30.0.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/v30.2.tar.gz",
         ],
-        sha256 = "9df0e9e8ebe39f4fbbb9cf7db3d811287fe3616b2f191eb2bf5eaa12539c881f",
-        strip_prefix = "protobuf-30.0",
+        sha256 = "07a43d88fe5a38e434c7f94129cad56a4c43a51f99336074d0799c2f7d4e44c5",
+        strip_prefix = "protobuf-30.2",
     )
 
     # Load BoringSSL. This could be automatically loaded by gRPC. But as of

ci/abi-dumps/google_cloud_cpp_resourcesettings.expected.abi.dump.gz

@@ -30,6 +30,7 @@ mapfile -t args < <(bazel::common_args)
 args+=(
   # Test without bzlmod as WORKSPACE is still supported in bazel 7 LTS.
   --noenable_bzlmod
+  --enable_workspace
   # Only run the unit tests, no need to waste time running everything.
   --test_tag_filters=-integration-test
 )

ci/cloudbuild/builds/bazel-oldest.sh

@@ -22,6 +22,11 @@ source module ci/cloudbuild/builds/lib/git.sh
 
 bazel_output_base="$(bazel info output_base)"
 
+# As we support both WORKSPACE and MODULE modes for bazel, we need to determine
+# the path to these dependencies dynamically.
+read -r protobuf_proto_path < <(find "${bazel_output_base}/external" -name "empty.proto" | sed -nE 's/(.+\/src)\/google\/protobuf\/empty.proto/\1/p')
+read -r googleapis_proto_path < <(find "${bazel_output_base}/external" -name "api-index-v1.json" | sed -nE 's/(.+)\/api-index-v1.json/\1/p')
+
 if [ -z "${UPDATED_DISCOVERY_DOCUMENT}" ]; then
   io::log_h2 "Removing previously generated golden files"
   git grep -l "Generated by the Codegen C++ plugin" generator/integration_tests/golden | xargs rm
@@ -34,8 +39,8 @@ fi
 io::log_h2 "Running the generator to update the golden files"
 bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \
   //generator:google-cloud-cpp-codegen -- \
-  --protobuf_proto_path="${bazel_output_base}/external/protobuf~/src" \
-  --googleapis_proto_path="${bazel_output_base}/external/googleapis~" \
+  --protobuf_proto_path="${protobuf_proto_path}" \
+  --googleapis_proto_path="${googleapis_proto_path}" \
   --golden_proto_path="${PWD}" \
   --output_path="${PWD}" \
   --update_ci=false \
@@ -47,8 +52,8 @@ if [ -z "${GENERATE_GOLDEN_ONLY}" ]; then
   io::log_h2 "Running the generator to emit protos from discovery docs"
   bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \
     //generator:google-cloud-cpp-codegen -- \
-    --protobuf_proto_path="${bazel_output_base}"/external/protobuf~/src \
-    --googleapis_proto_path="${bazel_output_base}"/external/googleapis~ \
+    --protobuf_proto_path="${protobuf_proto_path}" \
+    --googleapis_proto_path="${googleapis_proto_path}" \
     --discovery_proto_path="${PWD}/protos" \
     --output_path="${PROJECT_ROOT}/protos" \
     --export_output_path="${PROJECT_ROOT}" \
@@ -79,8 +84,8 @@ if [ -z "${GENERATE_GOLDEN_ONLY}" ]; then
   io::log_h2 "Running the generator to update the generated libraries"
   bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \
     //generator:google-cloud-cpp-codegen -- \
-    --protobuf_proto_path="${bazel_output_base}"/external/protobuf~/src \
-    --googleapis_proto_path="${bazel_output_base}"/external/googleapis~ \
+    --protobuf_proto_path="${protobuf_proto_path}" \
+    --googleapis_proto_path="${googleapis_proto_path}" \
     --discovery_proto_path="${PWD}/protos" \
     --output_path="${PROJECT_ROOT}" \
     --check_comment_substitutions=true \

ci/cloudbuild/builds/generate-libraries.sh

@@ -263,10 +263,16 @@ function integration::bazel_with_emulators() {
   else
     io::log_h2 "Running generator integration test"
     bazel_output_base="$(bazel info output_base)"
+
+    # As we support both WORKSPACE and MODULE modes for bazel, we need to determine
+    # the path to these dependencies dynamically.
+    read -r protobuf_proto_path < <(find "${bazel_output_base}/external" -name "empty.proto" | sed -nE 's/(.+\/src)\/google\/protobuf\/empty.proto/\1/p')
+    read -r googleapis_proto_path < <(find "${bazel_output_base}/external" -name "api-index-v1.json" | sed -nE 's/(.+)\/api-index-v1.json/\1/p')
+
     bazel run --action_env=GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes \
       //generator:google-cloud-cpp-codegen -- \
-      --protobuf_proto_path="${bazel_output_base}/external/protobuf~/src" \
-      --googleapis_proto_path="${bazel_output_base}/external/googleapis~" \
+      --protobuf_proto_path="${protobuf_proto_path}" \
+      --googleapis_proto_path="${googleapis_proto_path}" \
       --golden_proto_path="${PWD}" \
       --output_path="${PWD}" \
       --update_ci=false \

ci/cloudbuild/builds/lib/integration.sh

@@ -27,6 +27,6 @@ export CXX=g++
 mapfile -t args < <(bazel::common_args)
 for lib in $(quickstart::libraries); do
   io::log_h2 "Running Bazel quickstart for ${lib}"
-  env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \
+  io::run env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \
     bazel build "${args[@]}" :quickstart
 done