From 674dd8595b9165fec92097d5bb168357ac7ab1ee 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:31 +0000 Subject: [PATCH] fix: enable self signed jwt for grpc (#91) PiperOrigin-RevId: 386504689 Source-Link: https://github.com/googleapis/googleapis/commit/762094a99ac6e03a17516b13dfbef37927267a70 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6bfc480e1a161d5de121c2bcc3745885d33b265a --- .../certificate_authority_service/client.py | 4 +++ .../certificate_authority_service/client.py | 4 +++ .../test_certificate_authority_service.py | 34 ++++++++++--------- .../test_certificate_authority_service.py | 34 ++++++++++--------- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py index bdb9599..8885183 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py @@ -450,6 +450,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 create_certificate( diff --git a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py index 4187da0..153e5d9 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py @@ -426,6 +426,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 create_certificate( diff --git a/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py index 4131fdf..300d18b 100644 --- a/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py @@ -139,21 +139,6 @@ def test_certificate_authority_service_client_from_service_account_info(client_c assert client.transport._host == "privateca.googleapis.com:443" -@pytest.mark.parametrize( - "client_class", - [CertificateAuthorityServiceClient, CertificateAuthorityServiceAsyncClient,], -) -def test_certificate_authority_service_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", [ @@ -161,7 +146,7 @@ def test_certificate_authority_service_client_service_account_always_use_jwt( (transports.CertificateAuthorityServiceGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_certificate_authority_service_client_service_account_always_use_jwt_true( +def test_certificate_authority_service_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -171,6 +156,13 @@ def test_certificate_authority_service_client_service_account_always_use_jwt_tru 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", @@ -260,6 +252,7 @@ def test_certificate_authority_service_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 @@ -276,6 +269,7 @@ def test_certificate_authority_service_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 @@ -292,6 +286,7 @@ def test_certificate_authority_service_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 @@ -320,6 +315,7 @@ def test_certificate_authority_service_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, ) @@ -396,6 +392,7 @@ def test_certificate_authority_service_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 @@ -429,6 +426,7 @@ def test_certificate_authority_service_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. @@ -450,6 +448,7 @@ def test_certificate_authority_service_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, ) @@ -484,6 +483,7 @@ def test_certificate_authority_service_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, ) @@ -518,6 +518,7 @@ def test_certificate_authority_service_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, ) @@ -537,6 +538,7 @@ def test_certificate_authority_service_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, ) diff --git a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py index 9ab157e..e963056 100644 --- a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py @@ -139,21 +139,6 @@ def test_certificate_authority_service_client_from_service_account_info(client_c assert client.transport._host == "privateca.googleapis.com:443" -@pytest.mark.parametrize( - "client_class", - [CertificateAuthorityServiceClient, CertificateAuthorityServiceAsyncClient,], -) -def test_certificate_authority_service_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", [ @@ -161,7 +146,7 @@ def test_certificate_authority_service_client_service_account_always_use_jwt( (transports.CertificateAuthorityServiceGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_certificate_authority_service_client_service_account_always_use_jwt_true( +def test_certificate_authority_service_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -171,6 +156,13 @@ def test_certificate_authority_service_client_service_account_always_use_jwt_tru 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", @@ -260,6 +252,7 @@ def test_certificate_authority_service_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 @@ -276,6 +269,7 @@ def test_certificate_authority_service_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 @@ -292,6 +286,7 @@ def test_certificate_authority_service_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 @@ -320,6 +315,7 @@ def test_certificate_authority_service_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, ) @@ -396,6 +392,7 @@ def test_certificate_authority_service_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 @@ -429,6 +426,7 @@ def test_certificate_authority_service_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. @@ -450,6 +448,7 @@ def test_certificate_authority_service_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, ) @@ -484,6 +483,7 @@ def test_certificate_authority_service_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, ) @@ -518,6 +518,7 @@ def test_certificate_authority_service_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, ) @@ -537,6 +538,7 @@ def test_certificate_authority_service_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, )