Merge branch 'main' into test-auth-change-ci

Author: blakeli0

.github/workflows/ci.yaml

@@ -34,20 +34,11 @@ jobs:
     - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
       id: filter
       with:
-        # we want to run tests if source code is changed or the scripts
-        # used to run the unit tests
         filters: |
           src:
-            - '**/*.java'
-            - '**/pom.xml'
-            - '!java-bigquery/**'
-            - '!java-bigquerystorage/**'
-            - '!java-datastore/**'
-            - '!java-logging-logback/**'
-            - '!java-logging/**'
-            - '!java-spanner/**'
-            - '!java-storage/**'
-            - '!google-auth-library-java/**'
+            - '!(java-bigquery|java-bigquerystorage|java-datastore|java-logging-logback|java-logging|java-spanner|java-storage|google-auth-library-java)/**/*.java'
+            - '!(java-bigquery|java-bigquerystorage|java-datastore|java-logging-logback|java-logging|java-spanner|java-storage|google-auth-library-java)/**/pom.xml'
+            - 'pom.xml'
           ci:
             - '.github/workflows/ci.yaml'
             - '.kokoro/**'
@@ -134,42 +125,49 @@ jobs:
           java-bigquery:
             - 'java-bigquery/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-bigquerystorage:
             - 'java-bigquerystorage/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-datastore:
             - 'java-datastore/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-logging-logback:
             - 'java-logging-logback/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-logging:
             - 'java-logging/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-spanner:
             - 'java-spanner/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-storage:
             - 'java-storage/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'

.github/workflows/java-spanner-jdbc-ci.yaml

@@ -35,6 +35,11 @@ jobs:
           library:
             - 'java-spanner-jdbc/**'
             - '.github/workflows/java-spanner-jdbc-ci.yaml'
+            - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
+            - 'sdk-platform-java/**/*.java'
+            - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
+            - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
   units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/java-storage-nio-ci.yaml

@@ -35,6 +35,11 @@ jobs:
           library:
             - 'java-storage-nio/**'
             - '.github/workflows/java-storage-nio-ci.yaml'
+            - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
+            - 'sdk-platform-java/**/*.java'
+            - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
+            - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
   units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

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

@@ -29,6 +29,8 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - 'google-auth-library-java/**'
+            - '.github/workflows/sdk-platform-java-dependency-compatibility-test.yaml'
   dependency-compatibility-test:
     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/**'
+            - 'google-auth-library-java/**'
             - .kokoro/downstream-compatibility.sh
             - .github/workflows/sdk-platform-java-downstream.yaml
   downstream-compatibility:

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

@@ -55,19 +55,17 @@ jobs:
           cache: maven
       - name: Install the modules of sdk-platform-java
         shell: bash
-        working-directory: google-cloud-java/sdk-platform-java
-        run: |
-          set -euo pipefail
-          # gapic-generator-java is irrelevant
-          mvn -q -B -ntp install \
-            -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
+        run: .kokoro/build.sh
+        env:
+          BUILD_SUBDIR: sdk-platform-java
+          JOB_TYPE: install
+        working-directory: google-cloud-java
       - name: Build unmanaged dependency check
         shell: bash
         working-directory: google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
         run: |
           set -euo pipefail
           pwd
-          pwd
           echo "Install Unmanaged Dependency Check in $(pwd)"
           mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
       - name: Install the modules of the downstream repository

.github/workflows/unmanaged_dependency_check.yaml

@@ -14,7 +14,6 @@ jobs:
       shell: bash
       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

generation_config.yaml

@@ -1,5 +1,5 @@
-googleapis_commitish: 62e4ecb2f4390728990514fea14aad0431881a52
-libraries_bom_version: 26.79.0
+googleapis_commitish: 260e3f5d5dcf9692c77d14b01b47c16ef01837e9
+libraries_bom_version: 26.80.0
 is_monorepo: true
 libraries:
 - api_shortname: accessapproval
@@ -1558,7 +1558,6 @@ libraries:
   api_id: managedidentities.googleapis.com
   GAPICs:
   - proto_path: google/cloud/managedidentities/v1
-  - proto_path: google/cloud/managedidentities/v1beta1
 - api_shortname: managedkafka
   name_pretty: Managed Service for Apache Kafka
   product_documentation: https://cloud.google.com/managed-kafka

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

@@ -36,7 +36,6 @@
 import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.util.Data;
-import com.google.api.core.InternalApi;
 import com.google.auth.RequestMetadataCallback;
 import com.google.auth.http.HttpTransportFactory;
 import com.google.common.base.MoreObjects;
@@ -99,9 +98,6 @@ public abstract class ExternalAccountCredentials extends GoogleCredentials {
   private EnvironmentProvider environmentProvider;
   private PropertyProvider propertyProvider;
 
-  private int connectTimeout;
-  private int readTimeout;
-
   /**
    * Constructor with minimum identifying information and custom HTTP transport. Does not support
    * workforce credentials.
@@ -281,8 +277,6 @@ protected ExternalAccountCredentials(ExternalAccountCredentials.Builder builder)
             : builder.metricsHandler;
 
     this.name = GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getCredentialName();
-    this.connectTimeout = builder.connectTimeout;
-    this.readTimeout = builder.readTimeout;
   }
 
   ImpersonatedCredentials buildImpersonatedCredentials() {
@@ -317,8 +311,6 @@ ImpersonatedCredentials buildImpersonatedCredentials() {
         .setScopes(new ArrayList<>(scopes))
         .setLifetime(this.serviceAccountImpersonationOptions.lifetime)
         .setIamEndpointOverride(serviceAccountImpersonationUrl)
-        .setConnectTimeout(connectTimeout)
-        .setReadTimeout(readTimeout)
         .build();
   }
 
@@ -547,9 +539,7 @@ protected AccessToken exchangeExternalCredentialForAccessToken(
 
     StsRequestHandler.Builder requestHandler =
         StsRequestHandler.newBuilder(
-                tokenUrl, stsTokenExchangeRequest, transportFactory.create().createRequestFactory())
-            .setConnectTimeout(connectTimeout)
-            .setReadTimeout(readTimeout);
+            tokenUrl, stsTokenExchangeRequest, transportFactory.create().createRequestFactory());
 
     // If this credential was initialized with a Workforce configuration then the
     // workforcePoolUserProject must be passed to the Security Token Service via the internal
@@ -792,9 +782,6 @@ public abstract static class Builder extends GoogleCredentials.Builder {
     @Nullable protected String workforcePoolUserProject;
     @Nullable protected ServiceAccountImpersonationOptions serviceAccountImpersonationOptions;
 
-    protected int connectTimeout = 20000; // Default to 20000ms = 20s
-    protected int readTimeout = 20000; // Default to 20000ms = 20s
-
     /* The field is not being used and value not set. Superseded by the same field in the
     {@link GoogleCredentials.Builder}.
     */
@@ -821,8 +808,6 @@ protected Builder(ExternalAccountCredentials credentials) {
       this.workforcePoolUserProject = credentials.workforcePoolUserProject;
       this.serviceAccountImpersonationOptions = credentials.serviceAccountImpersonationOptions;
       this.metricsHandler = credentials.metricsHandler;
-      this.connectTimeout = credentials.connectTimeout;
-      this.readTimeout = credentials.readTimeout;
     }
 
     /**
@@ -1015,20 +1000,6 @@ public Builder setUniverseDomain(String universeDomain) {
       return this;
     }
 
-    /** Warning: Not for public use and can be removed at any time. */
-    @InternalApi
-    public Builder setConnectTimeout(int connectTimeout) {
-      this.connectTimeout = connectTimeout;
-      return this;
-    }
-
-    /** Warning: Not for public use and can be removed at any time. */
-    @InternalApi
-    public Builder setReadTimeout(int readTimeout) {
-      this.readTimeout = readTimeout;
-      return this;
-    }
-
     /**
      * Sets the optional Environment Provider.
      *

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

@@ -44,7 +44,6 @@
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.GenericData;
-import com.google.api.core.InternalApi;
 import com.google.api.core.ObsoleteApi;
 import com.google.auth.CredentialTypeForMetrics;
 import com.google.auth.ServiceAccountSigner;
@@ -118,9 +117,6 @@ public class ImpersonatedCredentials extends GoogleCredentials
 
   private transient Calendar calendar;
 
-  private int connectTimeout;
-  private int readTimeout;
-
   /**
    * @param sourceCredentials the source credential used to acquire the impersonated credentials. It
    *     should be either a user account credential or a service account credential.
@@ -567,8 +563,6 @@ private ImpersonatedCredentials(Builder builder) throws IOException {
                   + "does not match %s universe domain set for impersonated credentials.",
               this.sourceCredentials.getUniverseDomain(), builder.getUniverseDomain()));
     }
-    this.connectTimeout = builder.connectTimeout;
-    this.readTimeout = builder.readTimeout;
   }
 
   /**
@@ -597,12 +591,6 @@ public AccessToken refreshAccessToken() throws IOException {
         || (isDefaultUniverseDomain()
             && ((ServiceAccountCredentials) this.sourceCredentials)
                 .shouldUseAssertionFlowForGdu())) {
-      if (this.sourceCredentials instanceof IdentityPoolCredentials) {
-        this.sourceCredentials =
-            ((IdentityPoolCredentials) this.sourceCredentials)
-                .toBuilder().setConnectTimeout(connectTimeout).setReadTimeout(readTimeout).build();
-      }
-
       try {
         this.sourceCredentials.refreshIfExpired();
       } catch (IOException e) {
@@ -635,8 +623,6 @@ public AccessToken refreshAccessToken() throws IOException {
     // Disable automatic logging by google-http-java-client to prevent leakage of sensitive tokens.
     // Client Library Debug Logging via LoggingUtils is used instead.
     request.setLoggingEnabled(false);
-    request.setConnectTimeout(connectTimeout);
-    request.setReadTimeout(readTimeout);
     adapter.initialize(request);
     request.setParser(parser);
     MetricsUtils.setMetricsHeader(
@@ -783,9 +769,6 @@ public static class Builder extends GoogleCredentials.Builder {
     private String iamEndpointOverride;
     private Calendar calendar = Calendar.getInstance();
 
-    private int connectTimeout = 20000; // Default to 20000ms = 20s
-    private int readTimeout = 20000; // Default to 20000ms = 20s
-
     protected Builder() {}
 
     /**
@@ -809,8 +792,6 @@ protected Builder(ImpersonatedCredentials credentials) {
       this.lifetime = credentials.lifetime;
       this.transportFactory = credentials.transportFactory;
       this.iamEndpointOverride = credentials.iamEndpointOverride;
-      this.connectTimeout = credentials.connectTimeout;
-      this.readTimeout = credentials.readTimeout;
     }
 
     @CanIgnoreReturnValue
@@ -912,20 +893,6 @@ public Builder setCalendar(Calendar calendar) {
       return this;
     }
 
-    /** Warning: Not for public use and can be removed at any time. */
-    @InternalApi
-    public Builder setConnectTimeout(int connectTimeout) {
-      this.connectTimeout = connectTimeout;
-      return this;
-    }
-
-    /** Warning: Not for public use and can be removed at any time. */
-    @InternalApi
-    public Builder setReadTimeout(int readTimeout) {
-      this.readTimeout = readTimeout;
-      return this;
-    }
-
     /**
      * This method is marked obsolete. There is no alternative to getting a custom calendar for the
      * Credential.