feat: multi universe support, adding universe_domain field #1282

TimurSadykov · 2023-09-12T18:06:14Z

This adds a multi-universe support to all the credentials.
Also adds reading a universe_domain field from ServiceAccount and modifies it for ExternalAccounts

A related change is to manage (builder, toString/hashCode/equals) common fields: universeDomain and quotaProjectId in the base GoogleCredentials class so we don't manage them in all the Credentials like before.

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

lsirac

I didn't comment on all of them, but lets be consistent with our java docs (capitalization, periods, etc)

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

Co-authored-by: Leo <39062083+lsirac@users.noreply.github.com>

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

sonarqubecloud · 2023-09-13T19:32:48Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

…ate tests

TimurSadykov · 2023-11-20T08:38:18Z

I didn't comment on all of them, but lets be consistent with our java docs (capitalization, periods, etc)

Agree for the javadocs body, except single sentence @params and other keywords.. its is mostly lowcaps, no period now.

Co-authored-by: Leo <39062083+lsirac@users.noreply.github.com>

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

credentials/java/com/google/auth/Credentials.java

westarle

feel free to ignore nits; noticing that use of explicit "this." is pretty common and comes down to personal preference :)

westarle · 2023-12-13T16:44:07Z

credentials/java/com/google/auth/Credentials.java

@@ -54,6 +56,19 @@ public abstract class Credentials implements Serializable {
   */
  public abstract String getAuthenticationType();

+  /**
+   * Returns the universe domain for the credential.


Similar to other APIs this should indicate that the call is blocking, and may refresh tokens as necessary to align them to the universe domain.

Added, thanks!

Not sure I understand why we mention token refreshes or that is it blocking? Seems reasonable that all calls are blocking unless the API specifies otherwise.

oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java

westarle · 2023-12-13T21:31:20Z

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

@@ -71,7 +77,10 @@ public class GoogleCredentials extends OAuth2Credentials implements QuotaProject
   * @return the credentials instance
   */
  public static GoogleCredentials create(AccessToken accessToken) {
-    return GoogleCredentials.newBuilder().setAccessToken(accessToken).build();
+    return GoogleCredentials.newBuilder()


deprecate this constructor in favor of the builder?

I think you forgot to deprecate it?

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

westarle

Just left a couple more nits to address, thank you.

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

sonarqubecloud · 2023-12-19T19:48:05Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

feat: first draft of tpc support, adding universe_domain field

4ddad12

TimurSadykov requested review from a team as code owners September 12, 2023 18:06

product-auto-label bot added the size: m Pull request size is medium. label Sep 12, 2023

🦉 Updates from OwlBot post-processor

c41f542

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

lsirac reviewed Sep 12, 2023

View reviewed changes

TimurSadykov and others added 2 commits September 13, 2023 05:23

Update oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

3957bd0

Co-authored-by: Leo <39062083+lsirac@users.noreply.github.com>

fix: adding tests

41de188

product-auto-label bot added size: l Pull request size is large. and removed size: m Pull request size is medium. labels Sep 13, 2023

🦉 Updates from OwlBot post-processor

efe23b1

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

TimurSadykov changed the title ~~feat: first draft of tpc support, adding universe_domain field~~ feat: first draft of multi universe support, adding universe_domain field Sep 21, 2023

TimurSadykov and others added 9 commits November 2, 2023 00:52

fix: move universe_domain to very base Credential, tests cleanup

090674f

fix: resolve a conflict in tests

3eb4047

🦉 Updates from OwlBot post-processor

da7e1b7

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Merge branch 'main' into tpc-stage1

72e4dd0

Merge branch 'main' into tpc-stage1

c192155

feat: updates for ToString, hashCode and equals

35f79d0

🦉 Updates from OwlBot post-processor

0749124

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

feat: refactor ExternalAccount to use base class universe domain, upd…

763f6b0

…ate tests

fix: test fixes

309312d

product-auto-label bot added size: xl Pull request size is extra large. and removed size: l Pull request size is large. labels Nov 20, 2023

TimurSadykov requested review from blakeli0 and westarle November 20, 2023 09:51

TimurSadykov self-assigned this Nov 20, 2023

fix: javadoc updates and other nits

c63ed36

TimurSadykov requested a review from arithmetic1728 November 20, 2023 10:23

TimurSadykov and others added 4 commits December 8, 2023 05:18

fix: docs update for Credentials.java

1bc4d3f

Co-authored-by: Leo <39062083+lsirac@users.noreply.github.com>

Update docs GoogleCredentials.java constructor

c671f0d

Co-authored-by: Leo <39062083+lsirac@users.noreply.github.com>

fix: javadoc fixes

64b9d0a

🦉 Updates from OwlBot post-processor

bc51410

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

TimurSadykov changed the title ~~feat: first draft of multi universe support, adding universe_domain field~~ feat: multi universe support, adding universe_domain field Dec 12, 2023

lqiu96 reviewed Dec 12, 2023

View reviewed changes

oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java Show resolved Hide resolved

lqiu96 reviewed Dec 12, 2023

View reviewed changes

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java Outdated Show resolved Hide resolved

getUniverseDomain throws IOExcpetion, more tests

a4c4a09

product-auto-label bot added size: xl Pull request size is extra large. and removed size: l Pull request size is large. labels Dec 12, 2023

gcf-owl-bot bot and others added 2 commits December 12, 2023 16:02

🦉 Updates from OwlBot post-processor

439b486

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

fix: universeDomain from deprecated constructors

69c966e

TimurSadykov added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 12, 2023

yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 12, 2023

lqiu96 reviewed Dec 12, 2023

View reviewed changes

credentials/java/com/google/auth/Credentials.java Outdated Show resolved Hide resolved

westarle reviewed Dec 13, 2023

View reviewed changes

TimurSadykov and others added 2 commits December 14, 2023 05:17

fix: revert common json parsing, other comments addressed

18e1429

🦉 Updates from OwlBot post-processor

8c21b7e

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

lqiu96 approved these changes Dec 14, 2023

View reviewed changes

westarle approved these changes Dec 14, 2023

View reviewed changes

TimurSadykov and others added 3 commits December 19, 2023 04:23

fix: few nits addressed

eceba5a

🦉 Updates from OwlBot post-processor

bfbd4fc

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Merge branch 'main' into tpc-stage1

6a3b81c

lsirac approved these changes Dec 19, 2023

View reviewed changes

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java Show resolved Hide resolved

TimurSadykov added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 20, 2023

yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Dec 20, 2023

TimurSadykov merged commit 7eb322e into main Dec 20, 2023
21 checks passed

TimurSadykov deleted the tpc-stage1 branch December 20, 2023 16:46

release-please bot mentioned this pull request Dec 20, 2023

chore(main): release 1.21.0 #1298

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: multi universe support, adding universe_domain field #1282

feat: multi universe support, adding universe_domain field #1282

TimurSadykov commented Sep 12, 2023 •

edited

Loading

lsirac left a comment

sonarqubecloud bot commented Sep 13, 2023

TimurSadykov commented Nov 20, 2023

westarle left a comment

westarle Dec 13, 2023

TimurSadykov Dec 14, 2023

lsirac Dec 19, 2023

westarle Dec 13, 2023

TimurSadykov Dec 14, 2023

lsirac Dec 19, 2023

westarle left a comment

sonarqubecloud bot commented Dec 19, 2023

feat: multi universe support, adding universe_domain field #1282

feat: multi universe support, adding universe_domain field #1282

Conversation

TimurSadykov commented Sep 12, 2023 • edited Loading

lsirac left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 13, 2023

TimurSadykov commented Nov 20, 2023

westarle left a comment

Choose a reason for hiding this comment

westarle Dec 13, 2023

Choose a reason for hiding this comment

TimurSadykov Dec 14, 2023

Choose a reason for hiding this comment

lsirac Dec 19, 2023

Choose a reason for hiding this comment

westarle Dec 13, 2023

Choose a reason for hiding this comment

TimurSadykov Dec 14, 2023

Choose a reason for hiding this comment

lsirac Dec 19, 2023

Choose a reason for hiding this comment

westarle left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 19, 2023

Quality Gate passed

TimurSadykov commented Sep 12, 2023 •

edited

Loading