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

mpeddada1 · 2025-05-27T01:38:20Z

Follow-up PR to googleapis/google-auth-library-java#1754
For java-bigtable's use case, when GOOGLE_APPLICATION_CREDENTIALS is set to a service account's JSON path, these lines get exercised when creating ServiceAccountJwtAccessCredentials:

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java

Lines 82 to 92 in 49a7ae5

    
           if (credentials instanceof ServiceAccountCredentials && hasJwtEnabledScope) { 
        
             ServiceAccountCredentials serviceAccount = (ServiceAccountCredentials) credentials; 
        
             return ServiceAccountJwtAccessCredentials.newBuilder() 
        
                 .setClientEmail(serviceAccount.getClientEmail()) 
        
                 .setClientId(serviceAccount.getClientId()) 
        
                 .setPrivateKey(serviceAccount.getPrivateKey()) 
        
                 .setPrivateKeyId(serviceAccount.getPrivateKeyId()) 
        
                 .setQuotaProjectId(serviceAccount.getQuotaProjectId()) 
        
                 .build(); 
        
           }

See https://github.com/mpeddada1/sa-universe-domain for full test setup.

…form-java into sajc-universe-domain

mpeddada1 · 2025-05-30T17:28:48Z

/gcbrun

mpeddada1 · 2025-05-30T17:33:40Z

/gcbrun

sonarqubecloud · 2025-05-30T17:35:56Z

Quality Gate passed for 'gapic-generator-java-root'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sonarqubecloud · 2025-05-30T17:39:46Z

Quality Gate failed for 'java_showcase_integration_tests'

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

🤖 I have created a release *beep* *boop* --- <details><summary>2.59.0</summary> ## [2.59.0](v2.58.0...v2.59.0) (2025-06-02) ### Features * add logic to set universe domain to ServiceAccountJwtAccessCredentials ([#3806](#3806)) ([5b45708](5b45708)) * use debian base image for `java-library-generation` ([#3817](#3817)) ([94d0b30](94d0b30)) ### Bug Fixes * manage graalvm image versions via Hermetic Build templates _only_ ([#3800](#3800)) ([244c5dc](244c5dc)) ### Dependencies * update dependency com.google.oauth-client:google-oauth-client-bom to v1.39.0 ([#3813](#3813)) ([196a7ca](196a7ca)) * update google api dependencies ([#3791](#3791)) ([45ef2e0](45ef2e0)) * update google auth library dependencies to v1.36.0 ([#3814](#3814)) ([07f834a](07f834a)) * update grpc dependencies to 1.71.0 ([#3807](#3807)) ([49a7ae5](49a7ae5)) * Upgrade Protobuf-Java to v3.25.8 ([#3810](#3810)) ([ab90662](ab90662)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

…entials (#3806) Follow-up PR to googleapis/google-auth-library-java#1754 For java-bigtable's use case, when GOOGLE_APPLICATION_CREDENTIALS is set to a service account's JSON path, these lines get exercised when creating `ServiceAccountJwtAccessCredentials`: https://github.com/googleapis/sdk-platform-java/blob/49a7ae50071e75fe0d161a4eb9360a4fe4e6147b/gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java#L82-L92 See https://github.com/mpeddada1/sa-universe-domain for full test setup.

🤖 I have created a release *beep* *boop* --- <details><summary>2.59.0</summary> ## [2.59.0](v2.58.0...v2.59.0) (2025-06-02) ### Features * add logic to set universe domain to ServiceAccountJwtAccessCredentials ([#3806](#3806)) ([5b45708](5b45708)) * use debian base image for `java-library-generation` ([#3817](#3817)) ([94d0b30](94d0b30)) ### Bug Fixes * manage graalvm image versions via Hermetic Build templates _only_ ([#3800](#3800)) ([244c5dc](244c5dc)) ### Dependencies * update dependency com.google.oauth-client:google-oauth-client-bom to v1.39.0 ([#3813](#3813)) ([196a7ca](196a7ca)) * update google api dependencies ([#3791](#3791)) ([45ef2e0](45ef2e0)) * update google auth library dependencies to v1.36.0 ([#3814](#3814)) ([07f834a](07f834a)) * update grpc dependencies to 1.71.0 ([#3807](#3807)) ([49a7ae5](49a7ae5)) * Upgrade Protobuf-Java to v3.25.8 ([#3810](#3810)) ([ab90662](ab90662)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

| Package | Type | Package file | Manager | Update | Change | |---|---|---|---|---|---| | [com.google.api.grpc:proto-google-common-protos](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.58.2` -> `2.59.0` | | [com.google.api:gax](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.67.2` -> `2.68.0` | | [com.google.errorprone:error_prone_annotations](https://errorprone.info) ([source](https://github.com/google/error-prone)) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.38.0` -> `2.39.0` | | [org.jetbrains.kotlinx.binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) | plugin | misk/gradle/libs.versions.toml | gradle | minor | `0.17.0` -> `0.18.0` | | [com.autonomousapps.dependency-analysis](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin) | plugin | misk/gradle/libs.versions.toml | gradle | minor | `2.18.0` -> `2.19.0` | | [software.amazon.awssdk:sdk-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:sqs](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:dynamodb-enhanced](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:dynamodb](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:aws-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:bom](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | | [software.amazon.awssdk:auth](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.69` -> `2.31.70` | --- ### Release Notes <details> <summary>googleapis/sdk-platform-java (com.google.api.grpc:proto-google-common-protos)</summary> ### [`v2.59.0`](https://github.com/googleapis/sdk-platform-java/blob/HEAD/CHANGELOG.md#2590-2025-06-02) ##### Features - add logic to set universe domain to ServiceAccountJwtAccessCredentials ([#3806](googleapis/sdk-platform-java#3806)) ([5b45708](googleapis/sdk-platform-java@5b45708)) - use debian base image for `java-library-generation` ([#3817](googleapis/sdk-platform-java#3817)) ([94d0b30](googleapis/sdk-platform-java@94d0b30)) ##### Bug Fixes - manage graalvm image versions via Hermetic Build templates *only* ([#3800](googleapis/sdk-platform-java#3800)) ([244c5dc](googleapis/sdk-platform-java@244c5dc)) ##### Dependencies - update dependency com.google.oauth-client:google-oauth-client-bom to v1.39.0 ([#3813](googleapis/sdk-platform-java#3813)) ([196a7ca](googleapis/sdk-platform-java@196a7ca)) - update google api dependencies ([#3791](googleapis/sdk-platform-java#3791)) ([45ef2e0](googleapis/sdk-platform-java@45ef2e0)) - update google auth library dependencies to v1.36.0 ([#3814](googleapis/sdk-platform-java#3814)) ([07f834a](googleapis/sdk-platform-java@07f834a)) - update grpc dependencies to 1.71.0 ([#3807](googleapis/sdk-platform-java#3807)) ([49a7ae5](googleapis/sdk-platform-java@49a7ae5)) - Upgrade Protobuf-Java to v3.25.8 ([#3810](googleapis/sdk-platform-java#3810)) ([ab90662](googleapis/sdk-platform-java@ab90662)) </details> <details> <summary>google/error-prone (com.google.errorprone:error_prone_annotations)</summary> ### [`v2.39.0`](https://github.com/google/error-prone/releases/tag/v2.39.0): Error Prone 2.39.0 Changes: - Temporarily downgrade to Guava 33.4.0 ([#5108](google/error-prone#5108)) Checks: - [`BooleanLiteral`](https://errorprone.info/bugpattern/BooleanLiteral): Prefer `true` to `Boolean.TRUE` - [`ExpensiveLenientFormatString`](https://errorprone.info/bugpattern/ExpensiveLenientFormatString): Renamed from `PreconditionsExpensiveString`, detects unnecessary calls to `String.format` in the arguments of lenient formatting methods. - [`UnnecessaryQualifier`](https://errorprone.info/bugpattern/UnnecessaryQualifier): Detects `@Qualifier` or `@BindingAnnotation` annotations that have no effect, and can be removed Issues: [#4996](google/error-prone#4996), [#5045](google/error-prone#5045) Full changelog: google/error-prone@v2.38.0...v2.39.0 </details> <details> <summary>Kotlin/binary-compatibility-validator (org.jetbrains.kotlinx.binary-compatibility-validator)</summary> ### [`v0.18.0`](https://github.com/Kotlin/binary-compatibility-validator/releases/tag/0.18.0) [Compare Source](Kotlin/binary-compatibility-validator@0.17.0...0.18.0) #### What's Changed - Supported KLIB cross compilation enabled in Kotlin 2.1.0 [#299](Kotlin/binary-compatibility-validator#299) - Fixed issue with early properties evaluation [#286](Kotlin/binary-compatibility-validator#286) - Started excluding local classes created by Parcelize [#300](Kotlin/binary-compatibility-validator#300) Thanks to [@TheMrMilchmann](https://github.com/TheMrMilchmann), [@osipxd](https://github.com/osipxd), and [@Goooler](https://github.com/Goooler) for their contributions! </details> <details> <summary>autonomousapps/dependency-analysis-android-gradle-plugin (com.autonomousapps.dependency-analysis)</summary> ### [`v2.19.0`](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/blob/HEAD/CHANGELOG.md#Version-2190) - \[Feat]: support advices for Android test fixtures source sets - \[Feat]: support typesafe project accessors in IssueHandler - \[Fix]: bump kotlin-metadata-jvm to 2.1.21 to support K2.2 projects. - \[Chore]: move publishing to new `central.sonatype.com` repo. </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6pm every weekday,before 2am every weekday" in timezone Australia/Melbourne, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). GitOrigin-RevId: d85db8eca9307834b88f72100e0026a94e3b4aa2

feat: add logic to set universe domain to sa jwt credentials

e3b6176

product-auto-label bot added the size: xs Pull request size is extra small. label May 27, 2025

mpeddada1 mentioned this pull request May 27, 2025

feat: support ability to set universe domain in ServiceAccountJwtAccessCredentials googleapis/google-auth-library-java#1754

Merged

mpeddada1 and others added 3 commits May 29, 2025 17:44

Merge branch 'main' into sajc-universe-domain

d349983

add testing

7ed18f2

Merge branch 'sajc-universe-domain' of github.com:googleapis/sdk-plat…

72a4313

…form-java into sajc-universe-domain

product-auto-label bot added size: s Pull request size is small. and removed size: xs Pull request size is extra small. labels May 30, 2025

mpeddada1 marked this pull request as ready for review May 30, 2025 00:23

mpeddada1 changed the title ~~feat: add logic to set universe domain to sa jwt credentials~~ feat: add logic to set universe domain to ServiceAccountJwtAccessCredentials May 30, 2025

additional verification for empty domain

b849850

product-auto-label bot added size: m Pull request size is medium. and removed size: s Pull request size is small. labels May 30, 2025

mpeddada1 requested a review from lqiu96 May 30, 2025 00:36

lqiu96 approved these changes May 30, 2025

View reviewed changes

Merge branch 'main' into sajc-universe-domain

509f6d4

lqiu96 approved these changes May 30, 2025

View reviewed changes

zhumin8 merged commit 5b45708 into main May 30, 2025
57 of 59 checks passed

zhumin8 deleted the sajc-universe-domain branch May 30, 2025 18:44

release-please bot mentioned this pull request May 30, 2025

chore(main): release 2.59.0 #3804

Merged

lqiu96 mentioned this pull request Jun 4, 2025

Universe domain validation error #3612

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

mpeddada1 commented May 27, 2025 •

edited

Loading

Uh oh!

mpeddada1 commented May 30, 2025

Uh oh!

mpeddada1 commented May 30, 2025

Uh oh!

sonarqubecloud bot commented May 30, 2025

Uh oh!

sonarqubecloud bot commented May 30, 2025

Uh oh!

Uh oh!

Uh oh!

	if (credentials instanceof ServiceAccountCredentials && hasJwtEnabledScope) {
	ServiceAccountCredentials serviceAccount = (ServiceAccountCredentials) credentials;

	return ServiceAccountJwtAccessCredentials.newBuilder()
	.setClientEmail(serviceAccount.getClientEmail())
	.setClientId(serviceAccount.getClientId())
	.setPrivateKey(serviceAccount.getPrivateKey())
	.setPrivateKeyId(serviceAccount.getPrivateKeyId())
	.setQuotaProjectId(serviceAccount.getQuotaProjectId())
	.build();
	}

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

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

Conversation

mpeddada1 commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mpeddada1 commented May 30, 2025

Uh oh!

mpeddada1 commented May 30, 2025

Uh oh!

sonarqubecloud bot commented May 30, 2025

Quality Gate passed for 'gapic-generator-java-root'

Uh oh!

sonarqubecloud bot commented May 30, 2025

Quality Gate failed for 'java_showcase_integration_tests'

Uh oh!

Uh oh!

Uh oh!

mpeddada1 commented May 27, 2025 •

edited

Loading