Skip to content

feat: add logic to set universe domain to ServiceAccountJwtAccessCredentials #3806

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 6 commits into from
May 30, 2025
Merged

feat: add logic to set universe domain to ServiceAccountJwtAccessCredentials #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3b6176
feat: add logic to set universe domain to sa jwt credentials
mpeddada1 May 27, 2025
d349983
Merge branch 'main' into sajc-universe-domain
mpeddada1 May 29, 2025
7ed18f2
add testing
mpeddada1 May 30, 2025
72a4313
Merge branch 'sajc-universe-domain' of github.com:googleapis/sdk-plat…
mpeddada1 May 30, 2025
b849850
additional verification for empty domain
mpeddada1 May 30, 2025
509f6d4
Merge branch 'main' into sajc-universe-domain
mpeddada1 May 30, 2025
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
1 change: 1 addition & 0 deletions gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public Credentials getCredentials() throws IOException {
.setPrivateKey(serviceAccount.getPrivateKey())
.setPrivateKeyId(serviceAccount.getPrivateKeyId())
.setQuotaProjectId(serviceAccount.getQuotaProjectId())
.setUniverseDomain(serviceAccount.getUniverseDomain())
.build();
}

Expand Down
49 changes: 49 additions & 0 deletions gax-java/gax/src/test/java/com/google/api/gax/core/GoogleCredentialsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,51 @@ void serviceAccountReplacedWithJwtTokens() throws Exception {
assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
assertThat(jwtCreds.getUniverseDomain()).isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
}

@Test
void serviceAccountReplacedWithJwtTokens_setEmptyDomain() throws Exception {
ServiceAccountCredentials serviceAccountCredentials =
CreateServiceAccountCredentials().toBuilder().setUniverseDomain("").build();

GoogleCredentialsProvider provider =
GoogleCredentialsProvider.newBuilder()
.setScopesToApply(ImmutableList.of("scope1", "scope2"))
.setJwtEnabledScopes(ImmutableList.of("scope1"))
.setOAuth2Credentials(serviceAccountCredentials)
.build();

Credentials credentials = provider.getCredentials();
assertThat(credentials).isInstanceOf(ServiceAccountJwtAccessCredentials.class);
ServiceAccountJwtAccessCredentials jwtCreds = (ServiceAccountJwtAccessCredentials) credentials;
assertThat(jwtCreds.getClientId()).isEqualTo(serviceAccountCredentials.getClientId());
assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
assertThat(jwtCreds.getUniverseDomain()).isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
}

@Test
void serviceAccountReplacedWithJwtTokens_customUniverseDomain() throws Exception {
ServiceAccountCredentials serviceAccountCredentials =
CreateServiceAccountCredentials().toBuilder().setUniverseDomain("example.com").build();

GoogleCredentialsProvider provider =
GoogleCredentialsProvider.newBuilder()
.setScopesToApply(ImmutableList.of("scope1", "scope2"))
.setJwtEnabledScopes(ImmutableList.of("scope1"))
.setOAuth2Credentials(serviceAccountCredentials)
.build();

Credentials credentials = provider.getCredentials();
assertThat(credentials).isInstanceOf(ServiceAccountJwtAccessCredentials.class);
ServiceAccountJwtAccessCredentials jwtCreds = (ServiceAccountJwtAccessCredentials) credentials;
assertThat(jwtCreds.getClientId()).isEqualTo(serviceAccountCredentials.getClientId());
assertThat(jwtCreds.getClientEmail()).isEqualTo(serviceAccountCredentials.getClientEmail());
assertThat(jwtCreds.getPrivateKeyId()).isEqualTo(serviceAccountCredentials.getPrivateKeyId());
assertThat(jwtCreds.getPrivateKey()).isEqualTo(serviceAccountCredentials.getPrivateKey());
assertThat(jwtCreds.getUniverseDomain()).isEqualTo("example.com");
}

@Test
Expand All @@ -94,6 +139,8 @@ void noJwtWithoutScopeMatch() throws Exception {
assertThat(serviceAccountCredentials2.getPrivateKey())
.isEqualTo(serviceAccountCredentials.getPrivateKey());
assertThat(serviceAccountCredentials2.getScopes()).containsExactly("scope1", "scope2");
assertThat(serviceAccountCredentials2.getUniverseDomain())
.isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
}

@Test
Expand All @@ -120,5 +167,7 @@ void useJwtAccessWithScope() throws Exception {
assertThat(serviceAccountCredentials2.getPrivateKey())
.isEqualTo(serviceAccountCredentials.getPrivateKey());
assertTrue(serviceAccountCredentials2.getUseJwtAccessWithScope());
assertThat(serviceAccountCredentials2.getUniverseDomain())
.isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
}
}
Loading