Skip to content

fix: Migrate away from GoogleCredentials.fromStream() usages #4151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 13, 2025
Merged

fix: Migrate away from GoogleCredentials.fromStream() usages #4151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
44c628e
fix: Migrate away from GoogleCredentials.fromStream() usages
lqiu96 Oct 8, 2025
974e7fa
chore: generate libraries at Wed Oct 8 17:59:33 UTC 2025
cloud-java-bot Oct 8, 2025
53ef178
Merge branch 'main' into migrate-away-fromStream
sakthivelmanii Oct 10, 2025
b31978d
Merge branch 'main' into migrate-away-fromStream
rahul2393 Oct 10, 2025
e024deb
chore: generate libraries at Fri Oct 10 04:46:45 UTC 2025
cloud-java-bot Oct 10, 2025
e3b3a62
chore: Resolve issue with Paths.get()
lqiu96 Oct 13, 2025
01d0b9e
Merge branch 'main' into migrate-away-fromStream
lqiu96 Oct 13, 2025
cb37715
chore: Add comment for fixed test
lqiu96 Oct 13, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ...oud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.cloud.spanner.ErrorCode;
import com.google.cloud.spanner.SpannerException;
import java.io.FileInputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand All @@ -35,9 +36,9 @@
@RunWith(JUnit4.class)
public class CredentialsServiceTest {
private static final String FILE_TEST_PATH =
CredentialsServiceTest.class.getResource("test-key.json").getFile();
private static final String APP_DEFAULT_FILE_TEST_PATH =
CredentialsServiceTest.class.getResource("test-key-app-default.json").getFile();
CredentialsServiceTest.class.getResource("test-key.json").getPath();
private static final String SA_APP_DEFAULT_FILE_TEST_PATH =
CredentialsServiceTest.class.getResource("test-key-app-default.json").getPath();

private static final String TEST_PROJECT_ID = "test-project";
private static final String APP_DEFAULT_PROJECT_ID = "app-default-test-project";
Expand All @@ -49,7 +50,11 @@ public class CredentialsServiceTest {
GoogleCredentials internalGetApplicationDefault() throws IOException {
// Read application default credentials directly from a specific file instead of actually
// fetching the default from the environment.
return GoogleCredentials.fromStream(new FileInputStream(APP_DEFAULT_FILE_TEST_PATH));
return ServiceAccountCredentials.fromStream(
// Calling `getResource().getPath()` on Windows returns a string that might start with
// something like `/C:/...`. Paths.get() interprets the leading / as part of the path
// and would be invalid. Use `new File().toPath()` to read from these files.
Files.newInputStream(new File(SA_APP_DEFAULT_FILE_TEST_PATH).toPath()));
}
};

Expand Down
5 changes: 1 addition & 4 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import com.google.common.base.Strings;
import com.google.longrunning.OperationsClient;
import com.google.longrunning.OperationsSettings;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -352,9 +351,7 @@ public void deniedListBackupOperations() throws IOException {
.setTransportChannelProvider(InstantiatingGrpcChannelProvider.newBuilder().build())
.setEndpoint("spanner.googleapis.com:443")
.setCredentialsProvider(
FixedCredentialsProvider.create(
GoogleCredentials.fromStream(
new FileInputStream(System.getenv("GOOGLE_APPLICATION_CREDENTIALS")))))
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault()))
.build())) {
client.listOperations(backupId.getName() + "/operations", "");
fail("Expected PermissionDeniedException");
Expand Down