Merge branch 'main' of github.com:googleapis/google-cloud-java into datastore-csm-impl-1

Author: lqiu96

.github/CODEOWNERS

@@ -12,3 +12,4 @@
 /java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
 /java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
 /google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team
+/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team

.github/requirements.in

@@ -1 +1 @@
-requests==2.32.4
+requests==2.33.0

.github/requirements.txt

@@ -104,9 +104,9 @@ idna==3.7 \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
     # via requests
-requests==2.32.4 \
-    --hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
-    --hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
+requests==2.33.0 \
+    --hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \
+    --hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652
     # via -r requirements.in
 urllib3==2.6.3 \
     --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \

.github/workflows/ci.yaml

@@ -92,9 +92,10 @@ jobs:
           java-bigquery: java-bigquery/**
           java-bigquerystorage: java-bigquerystorage/**
           java-datastore: java-datastore/**
-          java-logging: java-logging/**
           java-logging-logback: java-logging-logback/**
+          java-logging: java-logging/**
           java-spanner: java-spanner/**
+          java-storage: java-storage/**
           sdk-platform-java: sdk-platform-java/**
   split-units:
     runs-on: ubuntu-latest
@@ -236,7 +237,7 @@ jobs:
       run: |
         mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
     - name: Validate gapic-libraries-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.54.0
+      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.79.0
       with:
         bom-path: gapic-libraries-bom/pom.xml
   generation-config-check:

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

@@ -69,9 +69,8 @@ jobs:
 
       # Set up local showcase server to run the showcase ITs
       - name: Parse showcase version
-        working-directory: sdk-plaform-java/java-showcase/gapic-showcase
+        working-directory: sdk-platform-java/java-showcase/gapic-showcase
         run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
-        working-directory: sdk-platform-java
       - name: Install showcase server
         run: |
           sudo mkdir -p /usr/src/showcase
@@ -89,8 +88,8 @@ jobs:
         # Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory
         run: |
           if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
-            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
+            ../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
           else
-            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
+            ../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
           fi
         working-directory: sdk-platform-java/java-showcase

.github/workflows/sdk-platform-java-downstream_protobuf_compatibility_check_nightly.yaml

@@ -30,12 +30,11 @@ jobs:
             - 'sdk-platform-java/**'
   downstream-protobuf-test:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
     # This job runs if any of the three conditions match:
     # 1. PR is raised from Release-Please (PR comes from branch: release-please--branches-main)
     # 2. Job is invoked by the nightly job (scheduled event)
     # 3. Job is manually invoked via Github UI (workflow_dispatch event)
-    if: github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    if: needs.filter.outputs.library == 'true' && (github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false

.github/workflows/sdk-platform-java-shared_dependencies.yaml

@@ -25,10 +25,9 @@ jobs:
             - 'sdk-platform-java/**'
   upper-bound-check:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis'
     name: Shared Dependencies BOM upper-bound check
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'googleapis'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4

.github/workflows/sdk-platform-java-sonar.yaml

@@ -22,9 +22,8 @@ jobs:
             - 'sdk-platform-java/**'
   build:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request')
     name: Build
-    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

.github/workflows/sdk-platform-java-verify_library_generation.yaml

@@ -43,7 +43,7 @@ jobs:
           git checkout -b "${head_ref}" fork/${head_ref}
           changed_directories="$(git diff --name-only "fork/${head_ref}" "origin/${base_ref}")"
         fi
-        if [[ ${changed_directories} =~ "hermetic_build/" ]] || [[ ${changed_directories} =~ ".cloudbuild/library_generation/" ]]; then
+        if [[ ${changed_directories} =~ "sdk-platform-java/hermetic_build/" ]] || [[ ${changed_directories} =~ "sdk-platform-java/.cloudbuild/library_generation/" ]]; then
           echo "should_run=true" >> $GITHUB_OUTPUT
         else
           echo "should_run=false" >> $GITHUB_OUTPUT
@@ -55,11 +55,12 @@ jobs:
         head_repo_name: ${{ github.event.pull_request.head.repo.full_name  }}
         base_repo: ${{ github.repository }}
   library-generation-unit-tests:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -85,27 +86,29 @@ jobs:
         set -x
         python -m unittest discover -s hermetic_build -p "*unit_tests.py"
   library-generation-lint-shell:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - name: Run ShellCheck
       uses: ludeeus/action-shellcheck@2.0.0
       with:
-        scandir: 'hermetic_build'
+        scandir: 'sdk-platform-java/hermetic_build'
         format: tty
         severity: error
         ignore_paths: 
           .kokoro
   library-generation-lint-python:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

.gitignore

@@ -78,3 +78,5 @@ monorepo
 *.tfstate.backup
 *.tfstate.*.backup
 *.tfstate.lock.info
+
+.jqwik-database