Skip to content

Commit 8683520

Browse files
fix: fix vm universe_domain bug (#1433)
1 parent b6b2b2c commit 8683520

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

google/auth/compute_engine/credentials.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
from google.auth import jwt
2929
from google.auth import metrics
3030
from google.auth.compute_engine import _metadata
31+
from google.auth.transport import requests as google_auth_requests
3132
from google.oauth2 import _client
3233

3334

@@ -74,6 +75,7 @@ def __init__(
7475
self._scopes = scopes
7576
self._default_scopes = default_scopes
7677
self._universe_domain_cached = False
78+
self._universe_domain_request = google_auth_requests.Request()
7779

7880
def _retrieve_info(self, request):
7981
"""Retrieve information about the service account.
@@ -136,7 +138,9 @@ def requires_scopes(self):
136138
def universe_domain(self):
137139
if self._universe_domain_cached:
138140
return self._universe_domain
139-
self._universe_domain = _metadata.get_universe_domain()
141+
self._universe_domain = _metadata.get_universe_domain(
142+
self._universe_domain_request
143+
)
140144
self._universe_domain_cached = True
141145
return self._universe_domain
142146

system_tests/secrets.tar.enc

0 Bytes
Binary file not shown.

tests/compute_engine/test_credentials.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,16 @@ def test_universe_domain(self, get_universe_domain):
221221
assert self.credentials.universe_domain == "fake_universe_domain"
222222
assert self.credentials._universe_domain == "fake_universe_domain"
223223
assert self.credentials._universe_domain_cached
224-
get_universe_domain.assert_called_once()
224+
get_universe_domain.assert_called_once_with(
225+
self.credentials._universe_domain_request
226+
)
225227

226228
# calling the universe_domain property the second time should use the
227229
# cached value instead of calling get_universe_domain
228230
assert self.credentials.universe_domain == "fake_universe_domain"
229-
get_universe_domain.assert_called_once()
231+
get_universe_domain.assert_called_once_with(
232+
self.credentials._universe_domain_request
233+
)
230234

231235

232236
class TestIDTokenCredentials(object):

0 commit comments

Comments
 (0)