From b03acdf41b2deac509184f9038db70a161b4f30b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 14:54:09 +0000 Subject: [PATCH] fix: disable always_use_jwt_access (#15) fix: disable always_use_jwt_access Committer: @busunkim96 PiperOrigin-RevId: 382142900 Source-Link: https://github.com/googleapis/googleapis/commit/513440fda515f3c799c22a30e3906dcda325004e Source-Link: https://github.com/googleapis/googleapis-gen/commit/7b1e2c31233f79a704ec21ca410bf661d6bc68d0 --- .../tpu_v1/services/tpu/transports/base.py | 2 +- .../tpu_v1/services/tpu/transports/grpc.py | 5 +++- .../services/tpu/transports/grpc_asyncio.py | 5 +++- tests/unit/gapic/tpu_v1/test_tpu.py | 26 ++++++++++++++++--- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/google/cloud/tpu_v1/services/tpu/transports/base.py b/google/cloud/tpu_v1/services/tpu/transports/base.py index 02dd108..5a3d9f1 100644 --- a/google/cloud/tpu_v1/services/tpu/transports/base.py +++ b/google/cloud/tpu_v1/services/tpu/transports/base.py @@ -98,7 +98,7 @@ def __init__( scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) # Save the scopes. - self._scopes = scopes or self.AUTH_SCOPES + self._scopes = scopes # If no credentials are provided, then determine the appropriate # defaults. diff --git a/google/cloud/tpu_v1/services/tpu/transports/grpc.py b/google/cloud/tpu_v1/services/tpu/transports/grpc.py index 7f5a8e9..5a5e73b 100644 --- a/google/cloud/tpu_v1/services/tpu/transports/grpc.py +++ b/google/cloud/tpu_v1/services/tpu/transports/grpc.py @@ -60,6 +60,7 @@ def __init__( client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, + always_use_jwt_access: Optional[bool] = False, ) -> None: """Instantiate the transport. @@ -100,6 +101,8 @@ def __init__( API requests. If ``None``, then default info will be used. Generally, you only need to set this if you're developing your own client library. + always_use_jwt_access (Optional[bool]): Whether self signed JWT should + be used for service account credentials. Raises: google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport @@ -153,7 +156,7 @@ def __init__( scopes=scopes, quota_project_id=quota_project_id, client_info=client_info, - always_use_jwt_access=True, + always_use_jwt_access=always_use_jwt_access, ) if not self._grpc_channel: diff --git a/google/cloud/tpu_v1/services/tpu/transports/grpc_asyncio.py b/google/cloud/tpu_v1/services/tpu/transports/grpc_asyncio.py index 0ee93fa..251d0c6 100644 --- a/google/cloud/tpu_v1/services/tpu/transports/grpc_asyncio.py +++ b/google/cloud/tpu_v1/services/tpu/transports/grpc_asyncio.py @@ -106,6 +106,7 @@ def __init__( client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, quota_project_id=None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, + always_use_jwt_access: Optional[bool] = False, ) -> None: """Instantiate the transport. @@ -147,6 +148,8 @@ def __init__( API requests. If ``None``, then default info will be used. Generally, you only need to set this if you're developing your own client library. + always_use_jwt_access (Optional[bool]): Whether self signed JWT should + be used for service account credentials. Raises: google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport @@ -199,7 +202,7 @@ def __init__( scopes=scopes, quota_project_id=quota_project_id, client_info=client_info, - always_use_jwt_access=True, + always_use_jwt_access=always_use_jwt_access, ) if not self._grpc_channel: diff --git a/tests/unit/gapic/tpu_v1/test_tpu.py b/tests/unit/gapic/tpu_v1/test_tpu.py index 15f7bc8..bba732d 100644 --- a/tests/unit/gapic/tpu_v1/test_tpu.py +++ b/tests/unit/gapic/tpu_v1/test_tpu.py @@ -117,7 +117,25 @@ def test_tpu_client_service_account_always_use_jwt(client_class): ) as use_jwt: creds = service_account.Credentials(None, None, None) client = client_class(credentials=creds) - use_jwt.assert_called_with(True) + use_jwt.assert_not_called() + + +@pytest.mark.parametrize( + "transport_class,transport_name", + [ + (transports.TpuGrpcTransport, "grpc"), + (transports.TpuGrpcAsyncIOTransport, "grpc_asyncio"), + ], +) +def test_tpu_client_service_account_always_use_jwt_true( + transport_class, transport_name +): + with mock.patch.object( + service_account.Credentials, "with_always_use_jwt_access", create=True + ) as use_jwt: + creds = service_account.Credentials(None, None, None) + transport = transport_class(credentials=creds, always_use_jwt_access=True) + use_jwt.assert_called_once_with(True) @pytest.mark.parametrize("client_class", [TpuClient, TpuAsyncClient,]) @@ -3248,7 +3266,7 @@ def test_tpu_grpc_transport_client_cert_source_for_mtls(transport_class): "squid.clam.whelk:443", credentials=cred, credentials_file=None, - scopes=("https://www.googleapis.com/auth/cloud-platform",), + scopes=None, ssl_credentials=mock_ssl_channel_creds, quota_project_id=None, options=[ @@ -3347,7 +3365,7 @@ def test_tpu_transport_channel_mtls_with_client_cert_source(transport_class): "mtls.squid.clam.whelk:443", credentials=cred, credentials_file=None, - scopes=("https://www.googleapis.com/auth/cloud-platform",), + scopes=None, ssl_credentials=mock_ssl_cred, quota_project_id=None, options=[ @@ -3390,7 +3408,7 @@ def test_tpu_transport_channel_mtls_with_adc(transport_class): "mtls.squid.clam.whelk:443", credentials=mock_cred, credentials_file=None, - scopes=("https://www.googleapis.com/auth/cloud-platform",), + scopes=None, ssl_credentials=mock_ssl_cred, quota_project_id=None, options=[