Merge branch 'main' into default-checksum-json-read

Author: Dhriti07

.github/workflows/update_librarian_googleapis.yaml

@@ -57,15 +57,18 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: '>=1.20.2'
-    - name: Run librarian update
+    - name: Get librarian version
+      id: librarian
       run: |
         version=$(go run github.com/googleapis/librarian/cmd/librarian@latest config get version)
-        go run "github.com/googleapis/librarian/cmd/librarian@${version}" update sources.googleapis
+        echo "version=${version}" >> $GITHUB_OUTPUT
+    - name: Run librarian update
+      run: |
+        go run "github.com/googleapis/librarian/cmd/librarian@${{ steps.librarian.outputs.version }}" update sources.googleapis
     - name: Get latest commit
       id: commit
       run: |
-        version=$(go run github.com/googleapis/librarian/cmd/librarian@latest config get version)
-        new_commit=$(go run "github.com/googleapis/librarian/cmd/librarian@${version}" config get sources.googleapis.commit)
+        new_commit=$(go run "github.com/googleapis/librarian/cmd/librarian@${{ steps.librarian.outputs.version }}" config get sources.googleapis.commit)
         echo "new_commit=${new_commit}" >> $GITHUB_OUTPUT
         echo "short_commit=${new_commit:0:7}" >> $GITHUB_OUTPUT
     # TODO(https://github.com/googleapis/librarian/issues/6220): Remove this step.
@@ -115,14 +118,14 @@ jobs:
     - name: Run librarian install
       if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
-        go run github.com/googleapis/librarian/cmd/librarian@latest install
+        go run "github.com/googleapis/librarian/cmd/librarian@${{ steps.librarian.outputs.version }}" install
         echo "$HOME/.cache/librarian/bin/java_tools/bin" >> $GITHUB_PATH
       env:
         PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
     - name: Generate Libraries
       if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
-        go run github.com/googleapis/librarian/cmd/librarian@latest generate --all
+        go run "github.com/googleapis/librarian/cmd/librarian@${{ steps.librarian.outputs.version }}" generate --all
     - name: Commit and Create PR
       if: steps.detect_librarian.outputs.has_changes == 'true'
       env:

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

@@ -239,7 +239,7 @@ private final GoogleCredentials getDefaultCredentialsUnsynchronized(
     return credentials;
   }
 
-  private final File getWellKnownCredentialsFile() {
+  private final File getWellKnownCredentialsFile() throws IOException {
     return GoogleAuthUtils.getWellKnownCredentialsFile(this);
   }
 

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

@@ -32,6 +32,7 @@
 package com.google.auth.oauth2;
 
 import java.io.File;
+import java.io.IOException;
 
 /**
  * This public class provides shared utilities for common OAuth2 utils or ADC. It also exposes
@@ -45,7 +46,7 @@ public class GoogleAuthUtils {
    * @return the path to the well-known Application Default Credentials file location
    */
   public static final String getWellKnownCredentialsPath() {
-    return getWellKnownCredentialsFile(DefaultCredentialsProvider.DEFAULT).getAbsolutePath();
+    return getWellKnownCredentialsPath(DefaultCredentialsProvider.DEFAULT);
   }
 
   /**
@@ -54,7 +55,11 @@ public static final String getWellKnownCredentialsPath() {
    * @return the path to the well-known Application Default Credentials file location
    */
   static final String getWellKnownCredentialsPath(DefaultCredentialsProvider provider) {
-    return getWellKnownCredentialsFile(provider).getAbsolutePath();
+    try {
+      return getWellKnownCredentialsFile(provider).getAbsolutePath();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   /**
@@ -64,13 +69,18 @@ static final String getWellKnownCredentialsPath(DefaultCredentialsProvider provi
    *     purposes)
    * @return the well-known Application Default Credentials file
    */
-  static final File getWellKnownCredentialsFile(DefaultCredentialsProvider provider) {
+  static final File getWellKnownCredentialsFile(DefaultCredentialsProvider provider)
+      throws IOException {
     File cloudConfigPath;
     String envPath = provider.getEnv("CLOUDSDK_CONFIG");
     if (envPath != null) {
       cloudConfigPath = new File(envPath);
     } else if (provider.getOsName().indexOf("windows") >= 0) {
-      File appDataPath = new File(provider.getEnv("APPDATA"));
+      String appData = provider.getEnv("APPDATA");
+      if (appData == null) {
+        throw new IOException(DefaultCredentialsProvider.CLOUDSDK_MISSING_CREDENTIALS);
+      }
+      File appDataPath = new File(appData);
       cloudConfigPath = new File(appDataPath, provider.CLOUDSDK_CONFIG_DIRECTORY);
     } else {
       File configPath = new File(provider.getProperty("user.home", ""), ".config");

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

@@ -115,6 +115,20 @@ void getDefaultCredentials_noCredentials_throws() {
     assertEquals(DefaultCredentialsProvider.CLOUDSDK_MISSING_CREDENTIALS, message);
   }
 
+  @Test
+  void getDefaultCredentials_windowsMissingAppData_throws() {
+    // When APPDATA is unset on Windows, the ADC resolution should fail gracefully
+    // with a structured missing credentials exception, rather than crashing with an NPE.
+    MockHttpTransportFactory transportFactory = new MockHttpTransportFactory();
+    TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
+    testProvider.setProperty("os.name", "windows");
+    testProvider.setEnv("APPDATA", null);
+
+    IOException e =
+        assertThrows(IOException.class, () -> testProvider.getDefaultCredentials(transportFactory));
+    assertEquals(DefaultCredentialsProvider.CLOUDSDK_MISSING_CREDENTIALS, e.getMessage());
+  }
+
   @Test
   void getDefaultCredentials_noCredentialsSandbox_throwsNonSecurity() {
     MockHttpTransportFactory transportFactory = new MockHttpTransportFactory();