Merge remote-tracking branch 'origin/main' into observability/tracing-attr/url.domain

Author: diegomarquezp

.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

@@ -88,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-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
@@ -58,6 +58,9 @@ jobs:
     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
+    defaults:
+      run:
+        working-directory: sdk-platform-java
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -86,12 +89,15 @@ jobs:
     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
+    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: 
@@ -100,6 +106,9 @@ jobs:
     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
+    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

.kokoro/common.sh

@@ -32,6 +32,7 @@ excluded_modules=(
   'java-spanner'
   'java-spanner-jdbc'
   'google-auth-library-java'
+  'java-storage'
 )
 
 function retry_with_backoff {

.kokoro/presubmit/storage-graalvm-native-presubmit.cfg

@@ -0,0 +1,42 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-storage"
+}

.kokoro/presubmit/storage-integration.cfg

@@ -0,0 +1,44 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account,client-library-test-universe-domain-credential"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+
+
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-storage"
+}