Skip to content

feat: use self-signed JWTs in Spanner MutableCredentials #13381

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

Draft
whowes wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Draft

feat: use self-signed JWTs in Spanner MutableCredentials #13381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...anner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/MutableCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ public MutableCredentials(
throw new IllegalArgumentException("Scopes must not be empty");
}
this.scopes = new java.util.HashSet<>(scopes);
delegate = (ServiceAccountCredentials) credentials.createScoped(this.scopes);
delegate =
((ServiceAccountCredentials) credentials.createScoped(this.scopes))
.createWithUseJwtAccessWithScope(true);
Comment on lines +61 to +63

@gemini-code-assist gemini-code-assist Bot Jun 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The cast to ServiceAccountCredentials is redundant because credentials is already of type ServiceAccountCredentials, and its createScoped method returns ServiceAccountCredentials via covariant return type. Removing the redundant cast and extra parentheses improves code readability.

Suggested change
delegate =
((ServiceAccountCredentials) credentials.createScoped(this.scopes))
.createWithUseJwtAccessWithScope(true);
delegate = credentials.createScoped(this.scopes).createWithUseJwtAccessWithScope(true);

@whowes whowes Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cast is necessary - ServiceAccountCredentials.createScoped returns an instance of GoogleCredentials, not ServiceAccountCredentials

Comment on lines +61 to +63

@gemini-code-assist gemini-code-assist Bot Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The cast to ServiceAccountCredentials is redundant because ServiceAccountCredentials.createScoped already returns ServiceAccountCredentials (via covariant return type). Removing the redundant cast and extra parentheses simplifies the code and improves readability.

Suggested change
delegate =
((ServiceAccountCredentials) credentials.createScoped(this.scopes))
.createWithUseJwtAccessWithScope(true);
delegate = credentials.createScoped(this.scopes).createWithUseJwtAccessWithScope(true);

}

/**
Expand All @@ -74,7 +76,9 @@ public MutableCredentials(
*/
public void updateCredentials(@Nonnull ServiceAccountCredentials credentials) {
Objects.requireNonNull(credentials, "credentials must not be null");
delegate = (ServiceAccountCredentials) credentials.createScoped(scopes);
delegate =
((ServiceAccountCredentials) credentials.createScoped(scopes))
.createWithUseJwtAccessWithScope(true);
Comment on lines +79 to +81

@gemini-code-assist gemini-code-assist Bot Jun 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The cast to ServiceAccountCredentials is redundant here as well because credentials is of type ServiceAccountCredentials. Removing the redundant cast and extra parentheses simplifies the code.

Suggested change
delegate =
((ServiceAccountCredentials) credentials.createScoped(scopes))
.createWithUseJwtAccessWithScope(true);
delegate = credentials.createScoped(scopes).createWithUseJwtAccessWithScope(true);

@whowes whowes Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cast is necessary - see other comment

Comment on lines +79 to +81

@gemini-code-assist gemini-code-assist Bot Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The cast to ServiceAccountCredentials is redundant here as well. Removing it simplifies the expression and improves readability.

Suggested change
delegate =
((ServiceAccountCredentials) credentials.createScoped(scopes))
.createWithUseJwtAccessWithScope(true);
delegate = credentials.createScoped(scopes).createWithUseJwtAccessWithScope(true);

}

@Override
Expand Down
6 changes: 6 additions & 0 deletions ...r/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutableCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public void testCreateMutableCredentials() throws IOException {
public void testCreateMutableCredentialsWithDefaultScopes() throws IOException {
Set<String> defaultScopes = SpannerOptions.SCOPES;
when(initialCredentials.createScoped(defaultScopes)).thenReturn(initialScopedCredentials);
when(initialScopedCredentials.createWithUseJwtAccessWithScope(true))
.thenReturn(initialScopedCredentials);
when(initialScopedCredentials.getAuthenticationType()).thenReturn(initialAuthType);
when(initialScopedCredentials.getRequestMetadata(any(URI.class))).thenReturn(initialMetadata);
when(initialScopedCredentials.getUniverseDomain()).thenReturn(initialUniverseDomain);
Expand Down Expand Up @@ -172,6 +174,8 @@ private void validateInitialDelegatedCredentialsAreSet(

private void setupInitialCredentials() throws IOException {
when(initialCredentials.createScoped(scopes)).thenReturn(initialScopedCredentials);
when(initialScopedCredentials.createWithUseJwtAccessWithScope(true))
.thenReturn(initialScopedCredentials);
when(initialCredentials.createScoped(Collections.emptyList()))
.thenReturn(initialScopedCredentials);
when(initialScopedCredentials.getAuthenticationType()).thenReturn(initialAuthType);
Expand All @@ -185,6 +189,8 @@ private void setupInitialCredentials() throws IOException {

private void setupUpdatedCredentials() throws IOException {
when(updatedCredentials.createScoped(scopes)).thenReturn(updatedScopedCredentials);
when(updatedScopedCredentials.createWithUseJwtAccessWithScope(true))
.thenReturn(updatedScopedCredentials);
when(updatedScopedCredentials.getAuthenticationType()).thenReturn(updatedAuthType);
when(updatedScopedCredentials.getRequestMetadata(any(URI.class))).thenReturn(updatedMetadata);
when(updatedScopedCredentials.getUniverseDomain()).thenReturn(updatedUniverseDomain);
Expand Down
Loading