Merge branch 'main' into patch-2

Author: gyang-google

.github/workflows/showcase-version-check.yaml

@@ -22,13 +22,28 @@ on:
     - cron: '30 3 * * *' # Run daily at 3:30 AM UTC
   workflow_dispatch: # Allow manual trigger
   pull_request:
-    paths:
-      - 'librarian.yaml'
-      - 'java-showcase/gapic-showcase/pom.xml'
-      - '.github/workflows/showcase-version-check.yaml'
 
 jobs:
-  check-version:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          persist-credentials: false
+      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
+        id: filter
+        with:
+          filters: |
+            should_run:
+              - 'librarian.yaml'
+              - 'java-showcase/gapic-showcase/pom.xml'
+              - '.github/workflows/showcase-version-check.yaml'
+
+  check-showcase-version:
+    needs: filter
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || needs.filter.outputs.should_run == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       issues: write

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

@@ -648,6 +648,10 @@ void setProjectId(String projectId) {
   private static boolean pingComputeEngineMetadata(
       HttpTransportFactory transportFactory, DefaultCredentialsProvider provider) {
     GenericUrl tokenUrl = new GenericUrl(getMetadataServerUrl(provider));
+    // pingComputeEngineMetadata is executed heavily during startup (within isOnGce()) on non-GCE
+    // environments. We use a strict 500ms timeout and manual 3-try loop (instead of
+    // ExponentialBackOff and HttpRequest.setUnsuccessfulResponseHandler) to fail fast and avoid
+    // significantly delaying application startup for workflows running on local setups.
     for (int i = 1; i <= MAX_COMPUTE_PING_TRIES; ++i) {
       try {
         HttpRequest request =
@@ -673,6 +677,12 @@ private static boolean pingComputeEngineMetadata(
       } catch (SocketTimeoutException expected) {
         // Ignore logging timeouts which is the expected failure mode in non GCE environments.
       } catch (IOException e) {
+        if (e instanceof HttpResponseException) {
+          int statusCode = ((HttpResponseException) e).getStatusCode();
+          if (statusCode >= 400 && statusCode < 500) {
+            return false;
+          }
+        }
         LOGGER.log(
             Level.FINE,
             "Encountered an unexpected exception when checking"

google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java

@@ -58,8 +58,13 @@
 import com.google.auth.TestUtils;
 import com.google.auth.http.HttpTransportFactory;
 import com.google.auth.oauth2.DefaultCredentialsProviderTest.MockRequestCountingTransportFactory;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1177,6 +1182,60 @@ void getProjectId_explicitSet_noMDsCall() {
     assertEquals(0, transportFactory.transport.getRequestCount());
   }
 
+  @Test
+  void isOnGce_clientError_doesNotRetry_returnsFalseOnUnknownOs() {
+    MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory();
+    transportFactory.transport.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+    DefaultCredentialsProvider provider =
+        new DefaultCredentialsProvider() {
+          @Override
+          String getEnv(String name) {
+            if (DefaultCredentialsProvider.NO_GCE_CHECK_ENV_VAR.equals(name)) {
+              return "false";
+            }
+            return super.getEnv(name);
+          }
+
+          @Override
+          String getOsName() {
+            return "Unknown";
+          }
+        };
+    boolean isOnGce = ComputeEngineCredentials.isOnGce(transportFactory, provider);
+    assertFalse(isOnGce);
+    assertEquals(1, transportFactory.transport.getRequestCount());
+  }
+
+  @Test
+  void isOnGce_clientError_doesNotRetry_returnsTrueOnLinuxGce() {
+    MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory();
+    transportFactory.transport.setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
+    DefaultCredentialsProvider provider =
+        new DefaultCredentialsProvider() {
+          @Override
+          String getEnv(String name) {
+            if (DefaultCredentialsProvider.NO_GCE_CHECK_ENV_VAR.equals(name)) {
+              return "false";
+            }
+            return super.getEnv(name);
+          }
+
+          @Override
+          String getOsName() {
+            return "linux";
+          }
+
+          @Override
+          InputStream readStream(File file) throws FileNotFoundException {
+            return new ByteArrayInputStream(
+                "Google Compute Engine".getBytes(StandardCharsets.UTF_8));
+          }
+        };
+    boolean isOnGce = ComputeEngineCredentials.isOnGce(transportFactory, provider);
+    assertTrue(isOnGce);
+    assertEquals(1, transportFactory.transport.getRequestCount());
+  }
+
   static class MockMetadataServerTransportFactory implements HttpTransportFactory {
 
     MockMetadataServerTransport transport =

google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/MockMetadataServerTransport.java

@@ -71,6 +71,11 @@ public class MockMetadataServerTransport extends MockHttpTransport {
 
   private boolean emptyContent;
   private MockLowLevelHttpRequest request;
+  private int requestCount = 0;
+
+  public int getRequestCount() {
+    return requestCount;
+  }
 
   public MockMetadataServerTransport() {}
 
@@ -125,6 +130,7 @@ public MockLowLevelHttpRequest getRequest() {
 
   @Override
   public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+    requestCount++;
     if (url.startsWith(ComputeEngineCredentials.getTokenServerEncodedUrl())) {
       this.request = getMockRequestForTokenEndpoint(url);
       return this.request;

java-accessapproval/README.md

@@ -147,8 +147,6 @@ the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME`
 and on [google-cloud-java][g-c-j].
 
 ## Versioning
-
-
 This library follows [Semantic Versioning](http://semver.org/).
 
 

java-accessapproval/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminClient.java

@@ -34,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
@@ -318,7 +319,7 @@
 @NullMarked
 @Generated("by gapic-generator-java")
 public class AccessApprovalAdminClient implements BackgroundResource {
-  private final AccessApprovalAdminSettings settings;
+  private final @Nullable AccessApprovalAdminSettings settings;
   private final AccessApprovalStub stub;
 
   /** Constructs an instance of AccessApprovalAdminClient with default settings. */
@@ -358,7 +359,7 @@ protected AccessApprovalAdminClient(AccessApprovalStub stub) {
     this.stub = stub;
   }
 
-  public final AccessApprovalAdminSettings getSettings() {
+  public final @Nullable AccessApprovalAdminSettings getSettings() {
     return settings;
   }
 
@@ -392,7 +393,7 @@ public AccessApprovalStub getStub() {
    *     "organizations/{organization}".
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListApprovalRequestsPagedResponse listApprovalRequests(FolderName parent) {
+  public final ListApprovalRequestsPagedResponse listApprovalRequests(@Nullable FolderName parent) {
     ListApprovalRequestsMessage request =
         ListApprovalRequestsMessage.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -426,7 +427,8 @@ public final ListApprovalRequestsPagedResponse listApprovalRequests(FolderName p
    *     "organizations/{organization}".
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListApprovalRequestsPagedResponse listApprovalRequests(OrganizationName parent) {
+  public final ListApprovalRequestsPagedResponse listApprovalRequests(
+      @Nullable OrganizationName parent) {
     ListApprovalRequestsMessage request =
         ListApprovalRequestsMessage.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -460,7 +462,8 @@ public final ListApprovalRequestsPagedResponse listApprovalRequests(Organization
    *     "organizations/{organization}".
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListApprovalRequestsPagedResponse listApprovalRequests(ProjectName parent) {
+  public final ListApprovalRequestsPagedResponse listApprovalRequests(
+      @Nullable ProjectName parent) {
     ListApprovalRequestsMessage request =
         ListApprovalRequestsMessage.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -636,7 +639,7 @@ public final ListApprovalRequestsPagedResponse listApprovalRequests(
    *     "{projects|folders|organizations}/{id}/approvalRequests/{approval_request}"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ApprovalRequest getApprovalRequest(ApprovalRequestName name) {
+  public final ApprovalRequest getApprovalRequest(@Nullable ApprovalRequestName name) {
     GetApprovalRequestMessage request =
         GetApprovalRequestMessage.newBuilder()
             .setName(name == null ? null : name.toString())
@@ -980,7 +983,8 @@ public final ApprovalRequest invalidateApprovalRequest(InvalidateApprovalRequest
    *     "{projects|folders|organizations}/{id}/accessApprovalSettings"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final AccessApprovalSettings getAccessApprovalSettings(AccessApprovalSettingsName name) {
+  public final AccessApprovalSettings getAccessApprovalSettings(
+      @Nullable AccessApprovalSettingsName name) {
     GetAccessApprovalSettingsMessage request =
         GetAccessApprovalSettingsMessage.newBuilder()
             .setName(name == null ? null : name.toString())
@@ -1204,7 +1208,7 @@ public final AccessApprovalSettings updateAccessApprovalSettings(
    * @param name Name of the AccessApprovalSettings to delete.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final void deleteAccessApprovalSettings(AccessApprovalSettingsName name) {
+  public final void deleteAccessApprovalSettings(@Nullable AccessApprovalSettingsName name) {
     DeleteAccessApprovalSettingsMessage request =
         DeleteAccessApprovalSettingsMessage.newBuilder()
             .setName(name == null ? null : name.toString())
@@ -1457,9 +1461,10 @@ public static class ListApprovalRequestsPage
           ListApprovalRequestsPage> {
 
     private ListApprovalRequestsPage(
-        PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
+        @Nullable
+            PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
             context,
-        ListApprovalRequestsResponse response) {
+        @Nullable ListApprovalRequestsResponse response) {
       super(context, response);
     }
 
@@ -1469,15 +1474,17 @@ private static ListApprovalRequestsPage createEmptyPage() {
 
     @Override
     protected ListApprovalRequestsPage createPage(
-        PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
+        @Nullable
+            PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
             context,
-        ListApprovalRequestsResponse response) {
+        @Nullable ListApprovalRequestsResponse response) {
       return new ListApprovalRequestsPage(context, response);
     }
 
     @Override
     public ApiFuture<ListApprovalRequestsPage> createPageAsync(
-        PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
+        @Nullable
+            PageContext<ListApprovalRequestsMessage, ListApprovalRequestsResponse, ApprovalRequest>
             context,
         ApiFuture<ListApprovalRequestsResponse> futureResponse) {
       return super.createPageAsync(context, futureResponse);
@@ -1493,7 +1500,7 @@ public static class ListApprovalRequestsFixedSizeCollection
           ListApprovalRequestsFixedSizeCollection> {
 
     private ListApprovalRequestsFixedSizeCollection(
-        List<ListApprovalRequestsPage> pages, int collectionSize) {
+        @Nullable List<ListApprovalRequestsPage> pages, int collectionSize) {
       super(pages, collectionSize);
     }
 
@@ -1503,7 +1510,7 @@ private static ListApprovalRequestsFixedSizeCollection createEmptyCollection() {
 
     @Override
     protected ListApprovalRequestsFixedSizeCollection createCollection(
-        List<ListApprovalRequestsPage> pages, int collectionSize) {
+        @Nullable List<ListApprovalRequestsPage> pages, int collectionSize) {
       return new ListApprovalRequestsFixedSizeCollection(pages, collectionSize);
     }
   }

java-accessapproval/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminSettings.java

@@ -36,6 +36,7 @@
 import java.util.List;
 import javax.annotation.Generated;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
@@ -207,7 +208,7 @@ public static Builder newHttpJsonBuilder() {
   }
 
   /** Returns a new builder for this class. */
-  public static Builder newBuilder(ClientContext clientContext) {
+  public static Builder newBuilder(@Nullable ClientContext clientContext) {
     return new Builder(clientContext);
   }
 
@@ -227,7 +228,7 @@ protected Builder() throws IOException {
       this(((ClientContext) null));
     }
 
-    protected Builder(ClientContext clientContext) {
+    protected Builder(@Nullable ClientContext clientContext) {
       super(AccessApprovalStubSettings.newBuilder(clientContext));
     }
 

java-accessapproval/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java

@@ -68,6 +68,7 @@
 import java.util.List;
 import javax.annotation.Generated;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
@@ -371,7 +372,7 @@ public static Builder newHttpJsonBuilder() {
   }
 
   /** Returns a new builder for this class. */
-  public static Builder newBuilder(ClientContext clientContext) {
+  public static Builder newBuilder(@Nullable ClientContext clientContext) {
     return new Builder(clientContext);
   }
 
@@ -481,7 +482,7 @@ protected Builder() {
       this(((ClientContext) null));
     }
 
-    protected Builder(ClientContext clientContext) {
+    protected Builder(@Nullable ClientContext clientContext) {
       super(clientContext);
 
       listApprovalRequestsSettings =