Skip to content
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

Jump to bottom

feat: Add Universe Domain to ClientSettings #2331

Merged
merged 3 commits into from Jan 3, 2024
Merged

feat: Add Universe Domain to ClientSettings #2331

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb0fb74
feat: Add Universe Domain to ClientSettings
lqiu96 Jan 2, 2024
edffc34
chore: Revert adding builder's getters
lqiu96 Jan 3, 2024
fa5c882
chore: Udpate tests for ClientSettingsTest
lqiu96 Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java
View file
Open in desktop
Expand Up @@ -93,6 +93,10 @@ public final ApiClock getClock() {
return stubSettings.getClock();
}

public final String getUniverseDomain() {
return stubSettings.getUniverseDomain();
}

public final String getEndpoint() {
return stubSettings.getEndpoint();
}
Expand Down Expand Up @@ -125,6 +129,7 @@ public String toString() {
.add("headerProvider", getHeaderProvider())
.add("internalHeaderProvider", getInternalHeaderProvider())
.add("clock", getClock())
.add("universeDomain", getUniverseDomain())
.add("endpoint", getEndpoint())
.add("quotaProjectId", getQuotaProjectId())
.add("watchdogProvider", getWatchdogProvider())
Expand Down Expand Up @@ -241,6 +246,12 @@ public B setClock(ApiClock clock) {
return self();
}

/** Sets the Universe Domain to configure the resolved endpoint */
public B setUniverseDomain(String universeDomain) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is probably where showcase tests can help us find issues earlier. Can you please add a few showcase tests to verify that universe domain set through ClientSettings and StubSettings can be used for resolving endpoints?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We've decided to park this. I'll create an issue to investigate aligning the stubsettings and clientsettings.

stubSettings.setUniverseDomain(universeDomain);
return self();
}

public B setEndpoint(String endpoint) {
stubSettings.setEndpoint(endpoint);
return self();
Expand Down