Merge branch 'main' into renovate/google-api-dependencies

zhumin8 · web-flow · commit 4d3124da2041 · 2025-05-30T15:32:17.000-04:00
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml b/.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml b/.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml b/.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml b/.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-c-downstream-kms.yaml b/.cloudbuild/graalvm/cloudbuild-test-c-downstream-kms.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-c-downstream-kmsinventory.yaml b/.cloudbuild/graalvm/cloudbuild-test-c-downstream-kmsinventory.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild-test-c.yaml b/.cloudbuild/graalvm/cloudbuild-test-c.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.15.4'
+  _JAVA_SHARED_CONFIG_VERSION: '1.16.0'
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker
diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -34,27 +34,7 @@ RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
   "./gapic-generator-java.jar"
 
-FROM docker.io/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099 as glibc-compat
-
-RUN apk update && apk add git sudo
-# This SHA is the latest known-to-work version of this binary compatibility tool
-ARG GLIB_MUS_SHA=e94aca542e3ab08b42aa0b0d6e72478b935bb8e8
-WORKDIR /home
-
-# Install compatibility layer to run glibc-based programs (such as the
-# grpc plugin).
-# Alpine, by default, only supports musl-based binaries, and there is no public
-# downloadable distribution of the grpc plugin that is Alpine (musl) compatible.
-# This is one of the recommended approaches to ensure glibc-compatibility
-# as per https://wiki.alpinelinux.org/wiki/Running_glibc_programs
-RUN git clone https://gitlab.com/manoel-linux1/GlibMus-HQ.git
-WORKDIR /home/GlibMus-HQ
-# We lock the tool to the latest known-to-work version
-RUN git checkout "${GLIB_MUS_SHA}"
-RUN chmod a+x compile-x86_64-alpine-linux.sh
-RUN sh compile-x86_64-alpine-linux.sh
-
-FROM docker.io/library/python:3.13.2-alpine3.20@sha256:816feb29731cdee64b15b0ae91dd9f1cbc36765984ff8ea85a3d90f064417237 as final
+FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.5
@@ -63,28 +43,10 @@ ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 
 # install OS tools
-RUN apk update && apk add unzip curl rsync openjdk17 jq bash nodejs npm git
+RUN apt update && apt install -y curl unzip rsync jq nodejs npm git openjdk-17-jdk
 
 SHELL [ "/bin/bash", "-c" ]
 
-# Copy glibc shared objects to enable execution of the grpc plugin.
-# This list was obtained via `libtree -pvvv /grpc/*` in the final container as
-# well as inspecting the modifications done by compile-x86_64-alpine-linux.sh
-# in the glibc-compat stage using the `dive` command.
-COPY --from=glibc-compat /etc/libgcc* /etc/
-COPY --from=glibc-compat /lib64/ld-linux-x86-64.so.2 /lib64/
-COPY --from=glibc-compat /lib/GLIBCFAKE.so.0 /lib/
-COPY --from=glibc-compat /lib/ld-linux-x86-64.so.2 /lib/
-COPY --from=glibc-compat /lib/libpthread* /lib/
-COPY --from=glibc-compat /lib/libucontext* /lib/
-COPY --from=glibc-compat /lib/libc.* /lib/
-COPY --from=glibc-compat /usr/lib/libgcc* /usr/lib/
-COPY --from=glibc-compat /usr/lib/libstdc* /usr/lib/
-COPY --from=glibc-compat /usr/lib/libobstack* /usr/lib/
-COPY --from=glibc-compat /lib/libm.so.6 /usr/lib/
-COPY --from=glibc-compat /usr/lib/libucontext.so.1 /usr/lib/
-
-
 # copy source code
 COPY hermetic_build/common /src/common
 COPY hermetic_build/library_generation /src/library_generation
@@ -121,7 +83,6 @@ RUN git checkout "${OWLBOT_CLI_COMMITTISH}"
 RUN npm i && npm run compile && npm link
 RUN owl-bot copy-code --version
 RUN chmod o+rx $(which owl-bot)
-RUN apk del -r npm && apk cache clean
 
 # copy the Java formatter
 COPY --from=ggj-build "/google-java-format.jar" "${HOME}"/.library_generation/google-java-format.jar
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -34,29 +34,8 @@ RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
   "./gapic-generator-java.jar"
 
-# 3.20.1
-FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/alpine@sha256:dabf91b69c191a1a0a1628fd6bdd029c0c4018041c7f052870bb13c5a222ae76 as glibc-compat
-
-RUN apk update && apk add git sudo
-# This SHA is the latest known-to-work version of this binary compatibility tool
-ARG GLIB_MUS_SHA=e94aca542e3ab08b42aa0b0d6e72478b935bb8e8
-WORKDIR /home
-
-# Install compatibility layer to run glibc-based programs (such as the
-# grpc plugin).
-# Alpine, by default, only supports musl-based binaries, and there is no public
-# downloadable distribution of the grpc plugin that is Alpine (musl) compatible.
-# This is one of the recommended approaches to ensure glibc-compatibility
-# as per https://wiki.alpinelinux.org/wiki/Running_glibc_programs
-RUN git clone https://gitlab.com/manoel-linux1/GlibMus-HQ.git
-WORKDIR /home/GlibMus-HQ
-# We lock the tool to the latest known-to-work version
-RUN git checkout "${GLIB_MUS_SHA}"
-RUN chmod a+x compile-x86_64-alpine-linux.sh
-RUN sh compile-x86_64-alpine-linux.sh
-
-# 3.12.7-alpine3.20
-FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:b83d5ec7274bee17d2f4bd0bfbb082f156241e4513f0a37c70500e1763b1d90d as final
+# 3.12.3-slim-bookworm
+FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.5
@@ -65,27 +44,10 @@ ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 
 # install OS tools
-RUN apk update && apk add unzip curl rsync openjdk17 jq bash nodejs npm git
+RUN apt update && apt install -y curl unzip rsync jq nodejs npm git openjdk-17-jdk
 
 SHELL [ "/bin/bash", "-c" ]
 
-# Copy glibc shared objects to enable execution of the grpc plugin.
-# This list was obtained via `libtree -pvvv /grpc/*` in the final container as
-# well as inspecting the modifications done by compile-x86_64-alpine-linux.sh
-# in the glibc-compat stage using the `dive` command.
-COPY --from=glibc-compat /etc/libgcc* /etc/
-COPY --from=glibc-compat /lib64/ld-linux-x86-64.so.2 /lib64/
-COPY --from=glibc-compat /lib/GLIBCFAKE.so.0 /lib/
-COPY --from=glibc-compat /lib/ld-linux-x86-64.so.2 /lib/
-COPY --from=glibc-compat /lib/libpthread* /lib/
-COPY --from=glibc-compat /lib/libucontext* /lib/
-COPY --from=glibc-compat /lib/libc.* /lib/
-COPY --from=glibc-compat /usr/lib/libgcc* /usr/lib/
-COPY --from=glibc-compat /usr/lib/libstdc* /usr/lib/
-COPY --from=glibc-compat /usr/lib/libobstack* /usr/lib/
-COPY --from=glibc-compat /lib/libm.so.6 /usr/lib/
-
-
 # copy source code
 COPY hermetic_build/common /src/common
 COPY hermetic_build/library_generation /src/library_generation
@@ -122,7 +84,6 @@ RUN git checkout "${OWLBOT_CLI_COMMITTISH}"
 RUN npm i && npm run compile && npm link
 RUN owl-bot copy-code --version
 RUN chmod o+rx $(which owl-bot)
-RUN apk del -r npm && apk cache clean
 
 # copy the Java formatter
 COPY --from=ggj-build "/google-java-format.jar" "${HOME}"/.library_generation/google-java-format.jar
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.15.4</version>
+    <version>1.16.0</version>
     <relativePath/>
   </parent>
 
diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.15.4</version>
+    <version>1.16.0</version>
     <relativePath/>
   </parent>
 
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java b/gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java
@@ -88,6 +88,7 @@ public Credentials getCredentials() throws IOException {
           .setPrivateKey(serviceAccount.getPrivateKey())
           .setPrivateKeyId(serviceAccount.getPrivateKeyId())
           .setQuotaProjectId(serviceAccount.getQuotaProjectId())
+          .setUniverseDomain(serviceAccount.getUniverseDomain())
           .build();
     }
 
diff --git a/gax-java/gax/src/test/java/com/google/api/gax/core/GoogleCredentialsProviderTest.java b/gax-java/gax/src/test/java/com/google/api/gax/core/GoogleCredentialsProviderTest.java
@@ -68,6 +68,51 @@ void serviceAccountReplacedWithJwtTokens() throws Exception {
     assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
     assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
     assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
+    assertThat(jwtCreds.getUniverseDomain()).isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
+  }
+
+  @Test
+  void serviceAccountReplacedWithJwtTokens_setEmptyDomain() throws Exception {
+    ServiceAccountCredentials serviceAccountCredentials =
+        CreateServiceAccountCredentials().toBuilder().setUniverseDomain("").build();
+
+    GoogleCredentialsProvider provider =
+        GoogleCredentialsProvider.newBuilder()
+            .setScopesToApply(ImmutableList.of("scope1", "scope2"))
+            .setJwtEnabledScopes(ImmutableList.of("scope1"))
+            .setOAuth2Credentials(serviceAccountCredentials)
+            .build();
+
+    Credentials credentials = provider.getCredentials();
+    assertThat(credentials).isInstanceOf(ServiceAccountJwtAccessCredentials.class);
+    ServiceAccountJwtAccessCredentials jwtCreds = (ServiceAccountJwtAccessCredentials) credentials;
+    assertThat(jwtCreds.getClientId()).isEqualTo(serviceAccountCredentials.getClientId());
+    assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
+    assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
+    assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
+    assertThat(jwtCreds.getUniverseDomain()).isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
+  }
+
+  @Test
+  void serviceAccountReplacedWithJwtTokens_customUniverseDomain() throws Exception {
+    ServiceAccountCredentials serviceAccountCredentials =
+        CreateServiceAccountCredentials().toBuilder().setUniverseDomain("example.com").build();
+
+    GoogleCredentialsProvider provider =
+        GoogleCredentialsProvider.newBuilder()
+            .setScopesToApply(ImmutableList.of("scope1", "scope2"))
+            .setJwtEnabledScopes(ImmutableList.of("scope1"))
+            .setOAuth2Credentials(serviceAccountCredentials)
+            .build();
+
+    Credentials credentials = provider.getCredentials();
+    assertThat(credentials).isInstanceOf(ServiceAccountJwtAccessCredentials.class);
+    ServiceAccountJwtAccessCredentials jwtCreds = (ServiceAccountJwtAccessCredentials) credentials;
+    assertThat(jwtCreds.getClientId()).isEqualTo(serviceAccountCredentials.getClientId());
+    assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
+    assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
+    assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
+    assertThat(jwtCreds.getUniverseDomain()).isEqualTo("example.com");
   }
 
   @Test
@@ -94,6 +139,8 @@ void noJwtWithoutScopeMatch() throws Exception {
     assertThat(serviceAccountCredentials2.getPrivateKey())
         .isEqualTo(serviceAccountCredentials.getPrivateKey());
     assertThat(serviceAccountCredentials2.getScopes()).containsExactly("scope1", "scope2");
+    assertThat(serviceAccountCredentials2.getUniverseDomain())
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -120,5 +167,7 @@ void useJwtAccessWithScope() throws Exception {
     assertThat(serviceAccountCredentials2.getPrivateKey())
         .isEqualTo(serviceAccountCredentials.getPrivateKey());
     assertTrue(serviceAccountCredentials2.getUseJwtAccessWithScope());
+    assertThat(serviceAccountCredentials2.getUniverseDomain())
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 }
diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,4 +1,4 @@
-googleapis_commitish: 6942862f40d7a65b8e65ec491605d90d48458eaa
+googleapis_commitish: d03cc133141975f28a66554ddbd5c0e871946044
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when
 # library.library_name is not defined.
diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.15.4</version>
+    <version>1.16.0</version>
     <relativePath />
   </parent>
 
diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml
@@ -16,7 +16,7 @@
     <groupId>com.google.cloud</groupId>
     <!-- The shared config has RequireUpperBoundDeps enforcer rule -->
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.15.4</version>
+    <version>1.16.0</version>
     <relativePath/>
   </parent>
 
diff --git a/java-showcase/pom.xml b/java-showcase/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.15.4</version>
+    <version>1.16.0</version>
     <relativePath/>
   </parent>
 
diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-config</artifactId>
-        <version>1.15.4</version>
+        <version>1.16.0</version>
     </parent>
 
     <properties>
