Merge branch 'main' into observability/test/compute-integration-test

Author: blakeli0

…-java-create_additional_release_tag.yaml …flows/create_additional_release_tag.yaml.github/workflows/sdk-platform-java-create_additional_release_tag.yaml renamed to .github/workflows/create_additional_release_tag.yaml .github/workflows/sdk-platform-java-create_additional_release_tag.yaml renamed to .github/workflows/create_additional_release_tag.yaml

@@ -1,28 +1,11 @@
-name: sdk-platform-java Create additional tags for each release
+name: Create additional tags for each release
 
 on:
   release:
     types: [published]
   workflow_dispatch:
-
-env:
-  BUILD_SUBDIR: sdk-platform-java
 jobs:
-  filter:
-    runs-on: ubuntu-latest
-    outputs:
-      library: ${{ steps.filter.outputs.library }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: dorny/paths-filter@v3
-      id: filter
-      with:
-        filters: |
-          library:
-            - 'sdk-platform-java/**'
   build:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       # Permission to create tag
@@ -32,7 +15,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
     - name: Set up Git
       run: |
         git config --local user.email "[email protected]"

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

@@ -18,6 +18,7 @@ jobs:
           library:
             - 'sdk-platform-java/**'
             - 'google-auth-library-java/**'
+            - '.github/workflows/ci.yaml'
   build:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

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

@@ -23,6 +23,7 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - .kokoro/downstream-compatibility.sh
   downstream-compatibility:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/unmanaged_dependency_check.yaml

@@ -10,9 +10,12 @@ jobs:
       with:
         distribution: temurin
         java-version: 11
-    - name: Install modules
+    - name: Install all modules first
       shell: bash
-      run: mvn install -B -ntp -T 1C -DskipTests -Pquick-build
+      run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: sdk-platform-java
+        JOB_TYPE: install
     - name: Unmanaged dependency check
       uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
       with:

.kokoro/downstream-compatibility.sh

@@ -27,8 +27,6 @@ scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "${scriptDir}/.." # cd to the root of this repo
 source "$scriptDir/common.sh"
 
-setup_maven_mirror
-
 install_modules "sdk-platform-java"
 cd sdk-platform-java
 
@@ -42,6 +40,9 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
   git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
   update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION"
   pushd "$repo"
+  echo "Diff to run the test with modified dependencies:"
+  git --no-pager diff
+  echo "---------------"
   JOB_TYPE="test" ./.kokoro/build.sh
   popd
 done

generation_config.yaml

@@ -235,7 +235,7 @@ libraries:
   library_name: asset
   release_level: stable
   api_reference: https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview
-  issue_tracker: https://issuetracker.google.com/issues/new?component=187210&template=0
+  issue_tracker: https://issuetracker.google.com/issues/new?component=187210
   GAPICs:
   - proto_path: google/cloud/asset/v1
   - proto_path: google/cloud/asset/v1p1beta1
@@ -772,7 +772,7 @@ libraries:
   api_description: Database Center provides an organization-wide, cross-product fleet
     health platform to eliminate the overhead, complexity, and risk associated with
     aggregating and summarizing health signals through custom dashboards. Through
-    Database Center’s fleet health dashboard and API, database platform teams that
+    Database Center's fleet health dashboard and API, database platform teams that
     are responsible for reliability, compliance, security, cost, and administration
     of database fleets will now have a single pane of glass that pinpoints issues
     relevant to each team.
@@ -1331,7 +1331,7 @@ libraries:
     accounts.
   release_level: stable
   requires_billing: false
-  issue_tracker: https://issuetracker.google.com/issues/new?component=187161&template=0
+  issue_tracker: https://issuetracker.google.com/issues/new?component=187161
   GAPICs:
   - proto_path: google/iam/credentials/v1
 - api_shortname: iap
@@ -2924,7 +2924,7 @@ libraries:
   product_documentation: https://cloud.google.com/web-risk/docs/
   api_description: is a Google Cloud service that lets client applications check URLs
     against Google's constantly updated lists of unsafe web resources. Unsafe web
-    resources include social engineering sites—such as phishing and deceptive sites—and
+    resources include social engineering sites - such as phishing and deceptive sites - and
     sites that host malware or unwanted software. With the Web Risk API, you can quickly
     identify known bad sites, warn users before they click infected links, and prevent
     users from posting links to known infected pages from your site. The Web Risk

google-auth-library-java/credentials/BUILD.bazel

@@ -0,0 +1,5 @@
+java_library(
+    name = "credentials",
+    srcs = glob(["java/**/*.java"]),
+    visibility = ["//visibility:public"],
+)

google-auth-library-java/oauth2_http/BUILD.bazel

@@ -0,0 +1,20 @@
+java_library(
+    name = "oauth2_http",
+    srcs = glob(["java/**/*.java"]),
+    deps = [
+        "@com_google_guava_guava//jar",
+        "@com_google_guava_failureaccess//jar",
+        "//google-auth-library-java/credentials:credentials",
+        "@com_google_http_client_google_http_client//jar",
+        "@com_google_http_client_google_http_client_gson//jar",
+        "@com_google_api_api_common//jar",
+        "@com_google_code_gson_gson//jar",
+        "@com_google_errorprone_error_prone_annotations//jar",
+        "@com_google_code_findbugs_jsr305//jar",
+        "@com_google_auto_value_auto_value_annotations//jar",
+        "@com_google_auto_value_auto_value//jar",
+        "@org_slf4j_slf4j_api//jar",
+    ],
+    plugins = ["@com_google_api_gax_java//:auto_value_plugin"],
+    visibility = ["//visibility:public"],
+)

google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java

@@ -235,12 +235,8 @@ Map<String, Object> createMetadataRequestHeaders(AwsCredentialSource awsCredenti
     // Both flows work for IDMS v1 and v2. But if IDMSv2 is enabled, then if
     // session token is not present, Unauthorized exception will be thrown.
     if (awsCredentialSource.imdsv2SessionTokenUrl != null) {
-      Map<String, Object> tokenRequestHeaders =
-          new HashMap<String, Object>() {
-            {
-              put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
-            }
-          };
+      Map<String, Object> tokenRequestHeaders = new HashMap<>();
+      tokenRequestHeaders.put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
 
       String imdsv2SessionToken =
           retrieveResource(

java-asset/.repo-metadata.json

@@ -14,5 +14,5 @@
   "library_type": "GAPIC_AUTO",
   "requires_billing": true,
   "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0"
+  "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210"
 }