Merge branch 'main' into status

Author: scotthart

.bazelrc

@@ -18,14 +18,16 @@
 # Use host-OS-specific config lines from bazelrc files.
 build --enable_platform_specific_config=true
 
-# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which
-# disables C++14 features, even if the compilers defaults to C++ >= 14
-build:linux --cxxopt=-std=c++14
-build:macos --cxxopt=-std=c++14
-# Protobuf and gRPC require (or soon will require) C++14 to compile the "host"
+build --features=external_include_paths
+build --cxxopt=-Wno-private-header
+
+# The project requires C++ >= 17.
+build:linux --cxxopt=-std=c++17
+build:macos --cxxopt=-std=c++17
+# Protobuf and gRPC require C++17 to compile the "host"
 # targets, such as protoc and the grpc plugin.
-build:linux --host_cxxopt=-std=c++14
-build:macos --host_cxxopt=-std=c++14
+build:linux --host_cxxopt=-std=c++17
+build:macos --host_cxxopt=-std=c++17
 
 # Do not create the convenience links. They are inconvenient when the build
 # runs inside a docker image or if one builds a quickstart and then builds
@@ -35,24 +37,18 @@ 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.
 test --test_env=GTEST_SHUFFLE --test_env=GTEST_RANDOM_SEED
 
-# By default, build the library with OpenTelemetry
-build --//:enable_opentelemetry
-
 # Don't show warnings when building external dependencies. This still shows
 # warnings when using these dependencies (say in headers).
 build --output_filter='^//((?!(external):).)*$'
@@ -73,6 +69,8 @@ build:sanitizer --strip=never
 build:sanitizer --copt=-Og
 build:sanitizer --copt=-g
 build:sanitizer --copt=-fno-omit-frame-pointer
+#build:sanitizer --features=external_include_paths
+
 
 # --config asan: Address Sanitizer
 build:asan --config=sanitizer
@@ -105,6 +103,8 @@ build:ubsan --copt=-DCURL_STRICTER
 build:ubsan --linkopt=-fsanitize=undefined
 build:ubsan --linkopt=-fsanitize-link-c++-runtime
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
+#build:ubsan --features=external_include_paths
+
 
 # --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
 build:xsan --config=sanitizer
@@ -131,3 +131,4 @@ build:msan --linkopt=-L/usr/lib/x86_64-unknown-linux-gnu
 
 # --config otel2: Open Telemetery ABI version 2
 build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2
+build:otel2 --@opentelemetry-cpp//api:abi_version_no=2

.bazelversion

@@ -1 +1 @@
-7.6.1
+8.7.0

.clang-tidy

@@ -85,6 +85,7 @@ Checks: >
   performance-*,
   portability-*,
   readability-*,
+  -bugprone-exception-escape,
   -google-readability-braces-around-statements,
   -google-readability-namespace-comments,
   -google-runtime-references,

.gemini/styleguide.md

@@ -0,0 +1,19 @@
+This repository mostly follows the Google C++ style guide found at
+https://google.github.io/styleguide/cppguide.html.
+
+This repository differs from the Google C++ style guide in the following ways:
+
+- supports C++17 as its minimum C++ standard version.
+- lists local includes first, then system includes.
+- uses std::mutex instead of absl::mutex.
+- uses google::cloud::future and google::cloud::promise instead of std::future
+  and std::promise.
+- uses google::cloud::Status and google::cloud::StatusOr instead of absl::Status
+  and absl::StatusOr.
+- prefers to factor out duplicated code if it appears 3 or more times in
+  non-test files.
+- encourages duplication of salient setup and expectations in test cases to
+  increase readability.
+
+Do not make comments of suggestions on ordering of includes as a script formats
+them how we want.

.github/CODEOWNERS

@@ -3,10 +3,10 @@
 # is the same as .gitignore.
 
 # The owners for all files in the repo.
-* @googleapis/cloud-cxx-owners
+* @googleapis/cloud-sdk-cpp-team
 
 # These libraries are also owned by the GCS clients team.
-/google/cloud/storage/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storagecontrol/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storageinsights/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storagetransfer/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
+/google/cloud/storage/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storagecontrol/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storageinsights/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storagetransfer/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team

.github/renovate.json

@@ -7,7 +7,7 @@
   "python": {
     "enabled": false
   },
-  "baseBranches": ["main", "/^prepare.*v3/"],
+  "baseBranches": ["main"],
   "regexManagers": [
     {
       "fileMatch": [
@@ -90,6 +90,7 @@
   ],
   "ignoreDeps": [
     "boringssl",
-    "com_google_googleapis"
+    "com_google_googleapis",
+    "googleapis"
   ]
 }

.github/workflows/codeql-analysis.yml

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

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

@@ -7,6 +7,11 @@ on:
         required: true
         description: "The ref we want to compile"
         type: string
+  push:
+    branches:
+      - "ci-gha-*"
+  schedule:
+    - cron: '0 4 * * *'
 
 permissions:
   contents: read
@@ -26,56 +31,27 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
       with:
-        ref: ${{ inputs.checkout-ref }}
-    - id: auth
-      uses: google-github-actions/auth@v2
-      with:
-        create_credentials_file: true
-        credentials_json: ${{ secrets.BUILD_CACHE_KEY }}
-    - name: Set up Cloud SDK
-      uses: google-github-actions/setup-gcloud@v2
-    - name: vcpkg-version
-      id: vcpkg-version
-      run: |
-        echo "version=$(cat ci/etc/vcpkg-version.txt)" >> "${GITHUB_OUTPUT}"
-      shell: bash
-    - name: install ninja and CMake
-      run: |
-        rm /usr/local/bin/cmake
-        sudo apt install ninja-build cmake
-    - name: download-sccache
-      working-directory: "${{runner.temp}}"
-      run: |
-        curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.7.1/sccache-v0.7.1-x86_64-unknown-linux-musl.tar.gz | \
-          tar -zxf - --strip-components=1 && \
-        sudo mv sccache /usr/bin/sccache && \
-        sudo chmod +x /usr/bin/sccache
-    - name: download-vcpkg
-      working-directory: "${{runner.temp}}"
-      run: |
-        mkdir -p vcpkg
-        curl -fsSL "https://github.com/microsoft/vcpkg/archive/${{ steps.vcpkg-version.outputs.version }}.tar.gz" |
-            tar -C vcpkg --strip-components=1 -zxf -
-        vcpkg/bootstrap-vcpkg.sh -disableMetrics
-    # First compile the code using the identity with access to the build cache
-    - run: |
-        env VCPKG_ROOT="${{ runner.temp }}/vcpkg" ci/gha/builds/external-account.sh
-    # Then switch to the BYOID identity and run the integration test
+        ref: ${{ inputs.checkout-ref || github.sha }}
+    # Use BYOID identity and run the integration test
     - id: byoid-auth
       if: '!github.event.pull_request.head.repo.fork'
       name: 'Authenticate to GCP'
-      uses: 'google-github-actions/auth@v2'
+      uses: 'google-github-actions/auth@v3'
       with:
         create_credentials_file: true
         workload_identity_provider: 'projects/49427430084/locations/global/workloadIdentityPools/github-wif-pool/providers/github-wif-provider'
         service_account: 'github-actions@cloud-cpp-identity-federation.iam.gserviceaccount.com'
-    - run: |
-        ctest --test-dir cmake-out --output-on-failure -R common_internal_external_account_integration_test
-    env:
-      SCCACHE_GCS_BUCKET: cloud-cpp-gha-cache
-      SCCACHE_GCS_KEY_PREFIX: sccache/ubuntu-22.04/${{ github.job }}
-      SCCACHE_GCS_RW_MODE: READ_WRITE
-      SCCACHE_IGNORE_SERVER_IO_ERROR: 1
-      VCPKG_BINARY_SOURCES: x-gcs,gs://cloud-cpp-gha-cache/vcpkg-cache/ubuntu-22.04/${{ github.job }},readwrite
+    - name: Run integration tests
+      if: '!github.event.pull_request.head.repo.fork'
+      run: |
+        bazelisk test \
+          --test_output=all \
+          --verbose_failures=true \
+          --keep_going \
+          --experimental_convenience_symlinks=ignore \
+          --remote_upload_local_results=false \
+          --test_env=GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS}" \
+          --test_env=GOOGLE_CLOUD_CPP_TEST_WIF_BUCKET="cloud-cpp-wif-test-bucket" \
+          //google/cloud:internal_external_account_integration_test

.github/workflows/macos-bazel.yml

@@ -37,7 +37,7 @@ jobs:
           targets:
           - //google/cloud/storage/...
     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

@@ -59,7 +59,7 @@ jobs:
         - exclude-from-full-trick: ${{ ! inputs.full-matrix }}
           shard: Other
     steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2
@@ -70,7 +70,7 @@ jobs:
     - uses: actions/setup-python@v5
       id: py311
       with:
-        python-version: '3.11'
+        python-version: '3.14'
     - uses: google-github-actions/setup-gcloud@v2
       env:
         CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }}
@@ -84,8 +84,6 @@ jobs:
           spanner
         )
         core2_features=(
-          pubsub
-          pubsublite
           storage
           storage_grpc
         )