From c9af9101a3d16395b6ccdecdfd6676394741f686 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 10:20:19 +0000 Subject: [PATCH] fix: enable self signed jwt for grpc (#21) PiperOrigin-RevId: 386504689 Source-Link: https://github.com/googleapis/googleapis/commit/762094a99ac6e03a17516b13dfbef37927267a70 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6bfc480e1a161d5de121c2bcc3745885d33b265a --- .../eventarc_v1/services/eventarc/client.py | 4 +++ tests/unit/gapic/eventarc_v1/test_eventarc.py | 29 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/google/cloud/eventarc_v1/services/eventarc/client.py b/google/cloud/eventarc_v1/services/eventarc/client.py index 205b636..714b050 100644 --- a/google/cloud/eventarc_v1/services/eventarc/client.py +++ b/google/cloud/eventarc_v1/services/eventarc/client.py @@ -372,6 +372,10 @@ def __init__( client_cert_source_for_mtls=client_cert_source_func, quota_project_id=client_options.quota_project_id, client_info=client_info, + always_use_jwt_access=( + Transport == type(self).get_transport_class("grpc") + or Transport == type(self).get_transport_class("grpc_asyncio") + ), ) def get_trigger( diff --git a/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/unit/gapic/eventarc_v1/test_eventarc.py index c40ef1f..63535af 100644 --- a/tests/unit/gapic/eventarc_v1/test_eventarc.py +++ b/tests/unit/gapic/eventarc_v1/test_eventarc.py @@ -119,16 +119,6 @@ def test_eventarc_client_from_service_account_info(client_class): assert client.transport._host == "eventarc.googleapis.com:443" -@pytest.mark.parametrize("client_class", [EventarcClient, EventarcAsyncClient,]) -def test_eventarc_client_service_account_always_use_jwt(client_class): - with mock.patch.object( - service_account.Credentials, "with_always_use_jwt_access", create=True - ) as use_jwt: - creds = service_account.Credentials(None, None, None) - client = client_class(credentials=creds) - use_jwt.assert_not_called() - - @pytest.mark.parametrize( "transport_class,transport_name", [ @@ -136,7 +126,7 @@ def test_eventarc_client_service_account_always_use_jwt(client_class): (transports.EventarcGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_eventarc_client_service_account_always_use_jwt_true( +def test_eventarc_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -146,6 +136,13 @@ def test_eventarc_client_service_account_always_use_jwt_true( transport = transport_class(credentials=creds, always_use_jwt_access=True) use_jwt.assert_called_once_with(True) + 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=False) + use_jwt.assert_not_called() + @pytest.mark.parametrize("client_class", [EventarcClient, EventarcAsyncClient,]) def test_eventarc_client_from_service_account_file(client_class): @@ -216,6 +213,7 @@ def test_eventarc_client_client_options(client_class, transport_class, transport client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is @@ -232,6 +230,7 @@ def test_eventarc_client_client_options(client_class, transport_class, transport client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is @@ -248,6 +247,7 @@ def test_eventarc_client_client_options(client_class, transport_class, transport client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has @@ -276,6 +276,7 @@ def test_eventarc_client_client_options(client_class, transport_class, transport client_cert_source_for_mtls=None, quota_project_id="octopus", client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -340,6 +341,7 @@ def test_eventarc_client_mtls_env_auto( client_cert_source_for_mtls=expected_client_cert_source, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) # Check the case ADC client cert is provided. Whether client cert is used depends on @@ -373,6 +375,7 @@ def test_eventarc_client_mtls_env_auto( client_cert_source_for_mtls=expected_client_cert_source, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) # Check the case client_cert_source and ADC client cert are not provided. @@ -394,6 +397,7 @@ def test_eventarc_client_mtls_env_auto( client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -420,6 +424,7 @@ def test_eventarc_client_client_options_scopes( client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -446,6 +451,7 @@ def test_eventarc_client_client_options_credentials_file( client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -463,6 +469,7 @@ def test_eventarc_client_client_options_from_dict(): client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, )