Merge remote-tracking branch 'googleapis/main' into spanner-read-lock-mode

Author: diegomarquezp

.bazelrc

@@ -35,16 +35,13 @@ build --experimental_convenience_symlinks=ignore
 # We mirror critical tarballs from several sources in case the canonical source
 # is temporarily unavailable, e.g., github.com being down. This option and flag
 # automatically rewrites the URLs.
-build --experimental_downloader_config=bazel/downloader.cfg
+# TODO(#15549) - re-enable once the downloader config is fixed.
+# build --experimental_downloader_config=bazel/downloader.cfg
 
 # It is frustrating when long-running builds/tests fail, but it is even more
 # frustrating when they fail and don't give any output. So, remove the limit.
 build --experimental_ui_max_stdouterr_bytes=-1
 
-# TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using
-#     `apple_rules`.
-common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
-
 # Inject ${GTEST_SHUFFLE} and ${GTEST_RANDOM_SEED} into the test environment
 # if they are set in the enclosing environment. This allows for running tests
 # in a random order to help expose undesirable interdependencies.

.github/workflows/codeql-analysis.yml

@@ -22,9 +22,9 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - name: Checkout vcpkg
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           path: "build/vcpkg"
           repository: "microsoft/vcpkg"

.github/workflows/external-account-integration.yml

@@ -26,7 +26,7 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - id: auth

.github/workflows/macos-bazel.yml

@@ -31,165 +31,13 @@ jobs:
       matrix:
         os: [ macos-14 ]
         shard:
-        - Core
-        - Bigtable
-        - Pub/Sub
-        - Spanner
         - Storage
-        - Compute
-        - AIPlatform
-        - Shard1
-        - Shard2
-        - Other
         include:
-        - shard: Core
-          targets:
-          - //google/cloud:all
-          # - //generator/...  # Does not build on macOS
-          # - //docfx/...      # Does not build on macOS
-          - +//examples/...
-        - shard: Bigtable
-          targets:
-          - //google/cloud/bigtable/...
-        - shard: Pub/Sub
-          targets:
-          - //google/cloud/pubsub/...
-          - +//google/cloud/pubsublite/...
-        - shard: Spanner
-          targets:
-          - //google/cloud/spanner/...
         - shard: Storage
           targets:
           - //google/cloud/storage/...
-          # Include the top-level examples because they require the libs anyway.
-        - shard: Compute
-          targets:
-          - //google/cloud/compute/...
-        - shard: AIPlatform
-          targets:
-          - //google/cloud/aiplatform/...
-        - shard: Shard1
-          targets:
-          # Run this:
-          #
-          # git grep -l 'class.*Client' 'google/cloud/**_client.h' |
-          #    egrep -v "(bigtable/|internal/|pubsub/|spanner/|storage/)" |
-          #    cut -f -3 -d/| sort | uniq -c | sort -n |
-          #    awk '{ s += $1; print s, $0}'
-          #
-          # and pick the approximate midpoint
-          #
-          # Also, it is a good idea to keep `sql` and `bigquerycontrol`
-          # together, as they both require our internal REST libraries.
-          - //google/cloud/bigquerycontrol/...
-          - +//google/cloud/appengine/...
-          - +//google/cloud/dataproc/...
-          - +//google/cloud/monitoring/...
-          - +//google/cloud/retail/...
-          - +//google/cloud/discoveryengine/...
-          - +//google/cloud/sql/...
-          - +//google/cloud/dialogflow_cx/...
-          - +//google/cloud/dialogflow_es/...
-        - shard: Shard2
-          targets:
-          - //google/cloud/networkconnectivity/...
-          - +//google/cloud/networkservices/...
-          - +//google/cloud/policytroubleshooter/...
-          - +//google/cloud/profiler/...
-          - +//google/cloud/redis/...
-          - +//google/cloud/securitycenter/...
-          - +//google/cloud/servicedirectory/...
-          - +//google/cloud/tpu/...
-          - +//google/cloud/trace/...
-          - +//google/cloud/vision/...
-          - +//google/cloud/workflows/...
-          - +//google/cloud/beyondcorp/...
-          - +//google/cloud/billing/...
-          - +//google/cloud/binaryauthorization/...
-          - +//google/cloud/gkemulticloud/...
-          - +//google/cloud/logging/...
-          - +//google/cloud/notebooks/...
-          - +//google/cloud/osconfig/...
-          - +//google/cloud/servicecontrol/...
-          - +//google/cloud/speech/...
-          - +//google/cloud/support/...
-          - +//google/cloud/video/...
-          - +//google/cloud/datacatalog/...
-          - +//google/cloud/iam/...
-          - +//google/cloud/run/...
-          - +//google/cloud/talent/...
-          - +//google/cloud/contentwarehouse/...
-          - +//google/cloud/dataplex/...
-          - +//google/cloud/kms/...
-          - +//google/cloud/bigquery/...
-          - +//google/cloud/resourcemanager/...
-        - shard: Other
-          targets:
-          - //...
-          # Skip top-level targets (e.g. //:bigtable).
-          - -//:all
-          # From Core
-          - -//generator/...
-          - -//docfx/...
-          - -//google/cloud:all
-          - -//examples/...
-          # From Bigtable
-          - -//google/cloud/bigtable/...
-          # From Pub/Sub
-          - -//google/cloud/pubsub/...
-          - -//google/cloud/pubsublite/...
-          # From Spanner
-          - -//google/cloud/spanner/...
-          # From Storage
-          - -//google/cloud/storage/...
-          # From Compute
-          - -//google/cloud/compute/...
-          # From AIPlatform
-          - -//google/cloud/aiplatform/...
-          # From Shard1
-          - -//google/cloud/appengine/...
-          - -//google/cloud/dataproc/...
-          - -//google/cloud/monitoring/...
-          - -//google/cloud/retail/...
-          - -//google/cloud/discoveryengine/...
-          - -//google/cloud/sql/...
-          - -//google/cloud/dialogflow_cx/...
-          - -//google/cloud/dialogflow_es/...
-          # From Shard2
-          - -//google/cloud/networkconnectivity/...
-          - -//google/cloud/networkservices/...
-          - -//google/cloud/policytroubleshooter/...
-          - -//google/cloud/profiler/...
-          - -//google/cloud/redis/...
-          - -//google/cloud/securitycenter/...
-          - -//google/cloud/servicedirectory/...
-          - -//google/cloud/tpu/...
-          - -//google/cloud/trace/...
-          - -//google/cloud/vision/...
-          - -//google/cloud/workflows/...
-          - -//google/cloud/beyondcorp/...
-          - -//google/cloud/billing/...
-          - -//google/cloud/binaryauthorization/...
-          - -//google/cloud/gkemulticloud/...
-          - -//google/cloud/logging/...
-          - -//google/cloud/notebooks/...
-          - -//google/cloud/osconfig/...
-          - -//google/cloud/servicecontrol/...
-          - -//google/cloud/speech/...
-          - -//google/cloud/support/...
-          - -//google/cloud/video/...
-          - -//google/cloud/datacatalog/...
-          - -//google/cloud/iam/...
-          - -//google/cloud/run/...
-          - -//google/cloud/talent/...
-          - -//google/cloud/contentwarehouse/...
-          - -//google/cloud/dataplex/...
-          - -//google/cloud/kms/...
-          - -//google/cloud/bigquery/...
-          - -//google/cloud/bigquerycontrol/...
-          - -//google/cloud/resourcemanager/...
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2

.github/workflows/macos-cmake.yml

@@ -39,7 +39,7 @@ jobs:
       matrix:
         exclude-from-full-trick: [ true ]
         os: [ macos-14 ]
-        shard: [ Core1, Core2, Compute, AIPlatform, Shard1, Shard2, Shard3, Shard4, Shard5, Other ]
+        shard: [ Core2 ]
         exclude:
         # Only full builds include shards with generated code.
         - exclude-from-full-trick: ${{ ! inputs.full-matrix }}
@@ -59,7 +59,7 @@ jobs:
         - exclude-from-full-trick: ${{ ! inputs.full-matrix }}
           shard: Other
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2
@@ -89,6 +89,10 @@ jobs:
           storage
           storage_grpc
         )
+        core3_features=(
+          pubsub
+          pubsublite
+        )
         # These are the libraries with the most "clients". To build the list
         # run something like this and find the midpoint:
         #
@@ -214,6 +218,9 @@ jobs:
         elif [[ "${{ matrix.shard }}" == "Core2" ]]; then
           features="$(printf ",%s" "${core2_features[@]}")"
           echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
+        elif [[ "${{ matrix.shard }}" == "Core3" ]]; then
+          features="$(printf ",%s" "${core3_features[@]}")"
+          echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
         elif [[ "${{matrix.shard}}" == "Compute" ]]; then
           echo "features=compute" >> "${GITHUB_OUTPUT}"
         elif [[ "${{matrix.shard}}" == "AIPlatform" ]]; then
@@ -236,6 +243,7 @@ jobs:
         else
           skipped_features=("${core1_features[@]}")
           skipped_features+=("${core2_features[@]}")
+          skipped_features+=("${core3_features[@]}")
           skipped_features+=(compute)
           skipped_features+=(aiplatform)
           skipped_features+=("${shard1_features[@]}")
@@ -255,9 +263,26 @@ jobs:
       run: |
         # Remove the older CMake version
         brew unlink cmake
+
+        # Create a temporary local tap
+        cd "${{runner.temp}}"
+        mkdir -p user/homebrew-tap/Formula
+        cd user/homebrew-tap
+        git init
+
         # Download the Homebrew formula for CMake==3.27.2
         curl -fsSL -o cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/fd21fcf239bcd0231c9fed5719403ec128151af4/Formula/cmake.rb
-        brew install cmake.rb
+        mv cmake.rb ./Formula/
+
+        git add .
+        git commit -m "Add CMake formula"
+
+        # Tap the local repository
+        brew tap user/homebrew-tap "${{runner.temp}}/user/homebrew-tap"
+
+        # Uninstall existing CMake and install CMake from the local tap
+        brew uninstall cmake
+        brew install --build-from-source user/homebrew-tap/cmake
     - name: Download and Install sccache
       if: ${{ inputs.sccache-mode != 'DISABLED' }}
       working-directory: "${{runner.temp}}"

.github/workflows/test-runner-untrusted.yml

@@ -28,7 +28,7 @@ jobs:
     # `ref` of the pull request, so downstream jobs know what to checkout.
     environment: 'external'
     name: Require Approval for External PRs
-    if: ${{ github.event.pull_request.author_association != 'MEMBER' && github.event.pull_request.author_association != 'COLLABORATOR' }}
+    if: ${{ github.event.pull_request.author_association != 'OWNER' && github.event.pull_request.author_association != 'MEMBER' && github.event.pull_request.author_association != 'COLLABORATOR' }}
     runs-on: ubuntu-latest
     outputs:
       checkout-sha: ${{ steps.save-pull-request.outputs.sha }}

.github/workflows/test-runner.yml

@@ -54,7 +54,8 @@ jobs:
     needs: [debug]
     if: >-
       ${{
-          ((github.event.pull_request.author_association == 'MEMBER' ||
+          ((github.event.pull_request.author_association == 'OWNER' ||
+           github.event.pull_request.author_association == 'MEMBER' ||
            github.event.pull_request.author_association == 'COLLABORATOR') &&
           github.event_name == 'pull_request_target') ||
           github.event_name == 'push' ||
@@ -112,6 +113,8 @@ jobs:
       execute-integration-tests: true
     secrets: inherit
   macos-cmake:
+    # Disabled
+    if: false
     name: macOS-CMake
     needs: [pre-flight]
     uses: ./.github/workflows/macos-cmake.yml
@@ -154,7 +157,7 @@ jobs:
     # Wait until all the other jobs have completed.
     needs:
       - macos-bazel
-      - macos-cmake
+      # macos-cmake is disabled
       - windows-bazel
       - windows-cmake
     # Run even if the other jobs failed or were skipped.

.github/workflows/windows-bazel.yml

@@ -29,48 +29,18 @@ jobs:
       # Continue other builds even if one fails
       fail-fast: false
       matrix:
+        exclude-from-full-trick: [ true ]
         msvc: [ msvc-2022 ]
         # - dbg creates very large debugging files and GHA has limited storage.
         # - fastbuild also takes too much storage.
         compilation_mode: [ opt ]
-        shard: [ Core, Compute, AIPlatform, Other ]
+        shard: [ Core ]
         include:
         - shard: Core
           targets:
-          - //google/cloud:all
-          # - //generator/...  # Does not build on Windows
-          # - //docfx/...      # Does not build on Windows
-          - //google/cloud/bigtable/...
-          - //google/cloud/pubsub/...
-          - //google/cloud/pubsublite/...
-          - //google/cloud/spanner/...
           - //google/cloud/storage/...
-        - shard: Compute
-          targets:
-          - //google/cloud/compute/...
-        - shard: AIPlatform
-          targets:
-          - //google/cloud/aiplatform/...
-        - shard: Other
-          targets:
-          - //...
-          # Skip top-level targets (e.g. //:bigtable).
-          - -//:all
-          # From Core
-          - -//google/cloud:all
-          - -//generator/...
-          - -//docfx/...
-          - -//google/cloud/bigtable/...
-          - -//google/cloud/pubsub/...
-          - -//google/cloud/pubsublite/...
-          - -//google/cloud/spanner/...
-          - -//google/cloud/storage/...
-          # From Compute
-          - -//google/cloud/compute/...
-          # From AIPlatform
-          - -//google/cloud/aiplatform/...
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2

.github/workflows/windows-cmake.yml

@@ -39,9 +39,9 @@ jobs:
       matrix:
         exclude-from-full-trick: [ true ]
         msvc: [ msvc-2022 ]
-        build_type: [ Debug, Release ]
-        arch: [ x64, x86 ]
-        shard: [Core1, Core2, Core3, Core4, Core5, Compute, AIPlatform, Shard1, Shard2, Shard3, Shard4, Other]
+        build_type: [ Release ]
+        arch: [ x64 ]
+        shard: [ Core3, Core4 ]
         exclude:
         # Also skip shards (Compute and Other) that contain only generated code.
         - exclude-from-full-trick: ${{ ! inputs.full-matrix }}
@@ -65,7 +65,7 @@ jobs:
         - shard: Core4
           build_type: Debug
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2