Skip to content

fix: changing universe_domain endpoint to "universe-domain" #1613

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 2 commits into from
Oct 24, 2024
Merged

fix: changing universe_domain endpoint to "universe-domain" #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b771ce1
fix: change universe_domain to universe-domain
Oct 23, 2024
554c250
Merge branch 'main' into stim-dash
Oct 24, 2024
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
2 changes: 1 addition & 1 deletion google/auth/compute_engine/_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def get_universe_domain(request):
404 occurs while retrieving metadata.
"""
universe_domain = get(
request, "universe/universe_domain", return_none_for_not_found_error=True
request, "universe/universe-domain", return_none_for_not_found_error=True
)
if not universe_domain:
return "googleapis.com"
Expand Down
14 changes: 7 additions & 7 deletions tests/compute_engine/test__metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ def test_get_universe_domain_success():

request.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)
assert universe_domain == "fake_universe_domain"
Expand All @@ -410,7 +410,7 @@ def test_get_universe_domain_success_empty_response():

request.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)
assert universe_domain == "googleapis.com"
Expand All @@ -425,7 +425,7 @@ def test_get_universe_domain_not_found():

request.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)
assert universe_domain == "googleapis.com"
Expand All @@ -445,7 +445,7 @@ def test_get_universe_domain_retryable_error_failure():

request.assert_called_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)
assert request.call_count == 5
Expand Down Expand Up @@ -487,12 +487,12 @@ def request(self, *args, **kwargs):

request_error.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)
request_ok.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)

Expand All @@ -511,7 +511,7 @@ def test_get_universe_domain_other_error():

request.assert_called_once_with(
method="GET",
url=_metadata._METADATA_ROOT + "universe/universe_domain",
url=_metadata._METADATA_ROOT + "universe/universe-domain",
headers=_metadata._METADATA_HEADERS,
)

Expand Down
4 changes: 2 additions & 2 deletions tests/compute_engine/test_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def test_with_target_audience_integration(self):
responses.add(
responses.GET,
"http://metadata.google.internal/computeMetadata/v1/universe/"
"universe_domain",
"universe-domain",
status=200,
content_type="application/json",
json={},
Expand Down Expand Up @@ -673,7 +673,7 @@ def test_with_quota_project_integration(self):
responses.add(
responses.GET,
"http://metadata.google.internal/computeMetadata/v1/universe/"
"universe_domain",
"universe-domain",
status=200,
content_type="application/json",
json={},
Expand Down