From 51304a327207a233e40308a8b49c9fdeda87c28b 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:28 +0000 Subject: [PATCH] fix: enable self signed jwt for grpc (#9) PiperOrigin-RevId: 386504689 Source-Link: https://github.com/googleapis/googleapis/commit/762094a99ac6e03a17516b13dfbef37927267a70 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6bfc480e1a161d5de121c2bcc3745885d33b265a --- .../client.py | 4 +++ .../client.py | 4 +++ ...test_identity_aware_proxy_admin_service.py | 34 ++++++++++--------- ...est_identity_aware_proxy_o_auth_service.py | 34 ++++++++++--------- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py index 18de015..3fd8fc6 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py @@ -338,6 +338,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 set_iam_policy( diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py index 47b49d9..2e31a8a 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py @@ -340,6 +340,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 list_brands( diff --git a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py index 4c360c6..f34f677 100644 --- a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py +++ b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py @@ -137,21 +137,6 @@ def test_identity_aware_proxy_admin_service_client_from_service_account_info( assert client.transport._host == "iap.googleapis.com:443" -@pytest.mark.parametrize( - "client_class", - [IdentityAwareProxyAdminServiceClient, IdentityAwareProxyAdminServiceAsyncClient,], -) -def test_identity_aware_proxy_admin_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", [ @@ -159,7 +144,7 @@ def test_identity_aware_proxy_admin_service_client_service_account_always_use_jw (transports.IdentityAwareProxyAdminServiceGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_identity_aware_proxy_admin_service_client_service_account_always_use_jwt_true( +def test_identity_aware_proxy_admin_service_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -169,6 +154,13 @@ def test_identity_aware_proxy_admin_service_client_service_account_always_use_jw 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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_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_identity_aware_proxy_admin_service_client_client_options_credentials_fi 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_identity_aware_proxy_admin_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/iap_v1/test_identity_aware_proxy_o_auth_service.py b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py index db1a796..428e965 100644 --- a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py +++ b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py @@ -132,21 +132,6 @@ def test_identity_aware_proxy_o_auth_service_client_from_service_account_info( assert client.transport._host == "iap.googleapis.com:443" -@pytest.mark.parametrize( - "client_class", - [IdentityAwareProxyOAuthServiceClient, IdentityAwareProxyOAuthServiceAsyncClient,], -) -def test_identity_aware_proxy_o_auth_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", [ @@ -154,7 +139,7 @@ def test_identity_aware_proxy_o_auth_service_client_service_account_always_use_j (transports.IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_identity_aware_proxy_o_auth_service_client_service_account_always_use_jwt_true( +def test_identity_aware_proxy_o_auth_service_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -164,6 +149,13 @@ def test_identity_aware_proxy_o_auth_service_client_service_account_always_use_j 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", @@ -255,6 +247,7 @@ def test_identity_aware_proxy_o_auth_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 @@ -271,6 +264,7 @@ def test_identity_aware_proxy_o_auth_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 @@ -287,6 +281,7 @@ def test_identity_aware_proxy_o_auth_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 @@ -315,6 +310,7 @@ def test_identity_aware_proxy_o_auth_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, ) @@ -391,6 +387,7 @@ def test_identity_aware_proxy_o_auth_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 @@ -424,6 +421,7 @@ def test_identity_aware_proxy_o_auth_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. @@ -445,6 +443,7 @@ def test_identity_aware_proxy_o_auth_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, ) @@ -479,6 +478,7 @@ def test_identity_aware_proxy_o_auth_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, ) @@ -513,6 +513,7 @@ def test_identity_aware_proxy_o_auth_service_client_client_options_credentials_f client_cert_source_for_mtls=None, quota_project_id=None, client_info=transports.base.DEFAULT_CLIENT_INFO, + always_use_jwt_access=True, ) @@ -532,6 +533,7 @@ def test_identity_aware_proxy_o_auth_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, )