From 7186a42e94fd09b663062a09dd3f7baa8906e497 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:18:41 +0000 Subject: [PATCH] fix: enable self signed jwt for grpc (#48) PiperOrigin-RevId: 386504689 Source-Link: https://github.com/googleapis/googleapis/commit/762094a99ac6e03a17516b13dfbef37927267a70 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6bfc480e1a161d5de121c2bcc3745885d33b265a --- .../services/iam_checker/client.py | 4 +++ .../test_iam_checker.py | 29 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py b/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py index 85b2b6e..9d65c24 100644 --- a/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py +++ b/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py @@ -329,6 +329,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 troubleshoot_iam_policy( diff --git a/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py b/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py index af55ca2..e824a5b 100644 --- a/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py +++ b/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py @@ -115,16 +115,6 @@ def test_iam_checker_client_from_service_account_info(client_class): assert client.transport._host == "policytroubleshooter.googleapis.com:443" -@pytest.mark.parametrize("client_class", [IamCheckerClient, IamCheckerAsyncClient,]) -def test_iam_checker_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", [ @@ -132,7 +122,7 @@ def test_iam_checker_client_service_account_always_use_jwt(client_class): (transports.IamCheckerGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_iam_checker_client_service_account_always_use_jwt_true( +def test_iam_checker_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -142,6 +132,13 @@ def test_iam_checker_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", [IamCheckerClient, IamCheckerAsyncClient,]) def test_iam_checker_client_from_service_account_file(client_class): @@ -218,6 +215,7 @@ def test_iam_checker_client_client_options( 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 @@ -234,6 +232,7 @@ def test_iam_checker_client_client_options( 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 @@ -250,6 +249,7 @@ def test_iam_checker_client_client_options( 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 @@ -278,6 +278,7 @@ def test_iam_checker_client_client_options( client_cert_source_for_mtls=None, quota_project_id="octopus", client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -342,6 +343,7 @@ def test_iam_checker_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 @@ -375,6 +377,7 @@ def test_iam_checker_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. @@ -396,6 +399,7 @@ def test_iam_checker_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, ) @@ -426,6 +430,7 @@ def test_iam_checker_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, ) @@ -456,6 +461,7 @@ def test_iam_checker_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, ) @@ -473,6 +479,7 @@ def test_iam_checker_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, )