Skip to content

Commit

Permalink
remove if for creating request object
Browse files Browse the repository at this point in the history
  • Loading branch information
sai-sunder-s committed Feb 15, 2024
1 parent 3a04a3b commit 345e50a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
10 changes: 4 additions & 6 deletions google/auth/compute_engine/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def __init__(
quota_project_id=None,
scopes=None,
default_scopes=None,
universe_domain=None,
universe_domain=None
):
"""
Args:
Expand All @@ -83,7 +83,6 @@ def __init__(
self._scopes = scopes
self._default_scopes = default_scopes
self._universe_domain_cached = False
self._universe_domain_request = None
if universe_domain:
self._universe_domain = universe_domain
self._universe_domain_cached = True
Expand Down Expand Up @@ -149,11 +148,10 @@ def requires_scopes(self):
def universe_domain(self):
if self._universe_domain_cached:
return self._universe_domain
if self._universe_domain_request is None:
from google.auth.transport import requests as google_auth_requests
self._universe_domain_request = google_auth_requests.Request()

from google.auth.transport import requests as google_auth_requests
self._universe_domain = _metadata.get_universe_domain(
self._universe_domain_request
google_auth_requests.Request()
)
self._universe_domain_cached = True
return self._universe_domain
Expand Down
8 changes: 2 additions & 6 deletions tests/compute_engine/test_credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,12 @@ def test_universe_domain(self, get_universe_domain):
assert self.credentials.universe_domain == "fake_universe_domain"
assert self.credentials._universe_domain == "fake_universe_domain"
assert self.credentials._universe_domain_cached
get_universe_domain.assert_called_once_with(
self.credentials._universe_domain_request
)
get_universe_domain.assert_called_once()

# calling the universe_domain property the second time should use the
# cached value instead of calling get_universe_domain
assert self.credentials.universe_domain == "fake_universe_domain"
get_universe_domain.assert_called_once_with(
self.credentials._universe_domain_request
)
get_universe_domain.assert_called_once()

@mock.patch("google.auth.compute_engine._metadata.get_universe_domain")
def test_user_provided_universe_domain(self, get_universe_domain):
Expand Down

0 comments on commit 345e50a

Please sign in to comment.