diff --git a/google/cloud/resourcemanager_v3/services/folders/client.py b/google/cloud/resourcemanager_v3/services/folders/client.py index 7fbb7f4..5fab643 100644 --- a/google/cloud/resourcemanager_v3/services/folders/client.py +++ b/google/cloud/resourcemanager_v3/services/folders/client.py @@ -347,6 +347,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_folder( diff --git a/google/cloud/resourcemanager_v3/services/organizations/client.py b/google/cloud/resourcemanager_v3/services/organizations/client.py index d23e569..c0affbf 100644 --- a/google/cloud/resourcemanager_v3/services/organizations/client.py +++ b/google/cloud/resourcemanager_v3/services/organizations/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 get_organization( diff --git a/google/cloud/resourcemanager_v3/services/projects/client.py b/google/cloud/resourcemanager_v3/services/projects/client.py index f06fd35..abde735 100644 --- a/google/cloud/resourcemanager_v3/services/projects/client.py +++ b/google/cloud/resourcemanager_v3/services/projects/client.py @@ -343,6 +343,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_project( diff --git a/google/cloud/resourcemanager_v3/services/tag_bindings/client.py b/google/cloud/resourcemanager_v3/services/tag_bindings/client.py index c0def4d..ee73c4e 100644 --- a/google/cloud/resourcemanager_v3/services/tag_bindings/client.py +++ b/google/cloud/resourcemanager_v3/services/tag_bindings/client.py @@ -343,6 +343,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_tag_bindings( diff --git a/google/cloud/resourcemanager_v3/services/tag_keys/client.py b/google/cloud/resourcemanager_v3/services/tag_keys/client.py index f8f1c92..4db7277 100644 --- a/google/cloud/resourcemanager_v3/services/tag_keys/client.py +++ b/google/cloud/resourcemanager_v3/services/tag_keys/client.py @@ -343,6 +343,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_tag_keys( diff --git a/google/cloud/resourcemanager_v3/services/tag_values/client.py b/google/cloud/resourcemanager_v3/services/tag_values/client.py index 7134846..6aaf06c 100644 --- a/google/cloud/resourcemanager_v3/services/tag_values/client.py +++ b/google/cloud/resourcemanager_v3/services/tag_values/client.py @@ -343,6 +343,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_tag_values( diff --git a/tests/unit/gapic/resourcemanager_v3/test_folders.py b/tests/unit/gapic/resourcemanager_v3/test_folders.py index 09184fa..2004016 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_folders.py +++ b/tests/unit/gapic/resourcemanager_v3/test_folders.py @@ -120,16 +120,6 @@ def test_folders_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize("client_class", [FoldersClient, FoldersAsyncClient,]) -def test_folders_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", [ @@ -137,9 +127,7 @@ def test_folders_client_service_account_always_use_jwt(client_class): (transports.FoldersGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_folders_client_service_account_always_use_jwt_true( - transport_class, transport_name -): +def test_folders_client_service_account_always_use_jwt(transport_class, transport_name): with mock.patch.object( service_account.Credentials, "with_always_use_jwt_access", create=True ) as use_jwt: @@ -147,6 +135,13 @@ def test_folders_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", [FoldersClient, FoldersAsyncClient,]) def test_folders_client_from_service_account_file(client_class): @@ -215,6 +210,7 @@ def test_folders_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 @@ -231,6 +227,7 @@ def test_folders_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 @@ -247,6 +244,7 @@ def test_folders_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 @@ -275,6 +273,7 @@ def test_folders_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, ) @@ -337,6 +336,7 @@ def test_folders_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 @@ -370,6 +370,7 @@ def test_folders_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. @@ -391,6 +392,7 @@ def test_folders_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, ) @@ -417,6 +419,7 @@ def test_folders_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, ) @@ -443,6 +446,7 @@ def test_folders_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, ) @@ -460,6 +464,7 @@ def test_folders_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/resourcemanager_v3/test_organizations.py b/tests/unit/gapic/resourcemanager_v3/test_organizations.py index 8db7a18..df7d9de 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_organizations.py +++ b/tests/unit/gapic/resourcemanager_v3/test_organizations.py @@ -125,18 +125,6 @@ def test_organizations_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize( - "client_class", [OrganizationsClient, OrganizationsAsyncClient,] -) -def test_organizations_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", [ @@ -144,7 +132,7 @@ def test_organizations_client_service_account_always_use_jwt(client_class): (transports.OrganizationsGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_organizations_client_service_account_always_use_jwt_true( +def test_organizations_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -154,6 +142,13 @@ def test_organizations_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", [OrganizationsClient, OrganizationsAsyncClient,] @@ -234,6 +229,7 @@ def test_organizations_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 +246,7 @@ def test_organizations_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 @@ -266,6 +263,7 @@ def test_organizations_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 @@ -294,6 +292,7 @@ def test_organizations_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, ) @@ -360,6 +359,7 @@ def test_organizations_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 @@ -393,6 +393,7 @@ def test_organizations_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. @@ -414,6 +415,7 @@ def test_organizations_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, ) @@ -444,6 +446,7 @@ def test_organizations_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, ) @@ -474,6 +477,7 @@ def test_organizations_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, ) @@ -493,6 +497,7 @@ def test_organizations_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/resourcemanager_v3/test_projects.py b/tests/unit/gapic/resourcemanager_v3/test_projects.py index 5c2bdfc..61b1243 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_projects.py +++ b/tests/unit/gapic/resourcemanager_v3/test_projects.py @@ -121,16 +121,6 @@ def test_projects_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize("client_class", [ProjectsClient, ProjectsAsyncClient,]) -def test_projects_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", [ @@ -138,7 +128,7 @@ def test_projects_client_service_account_always_use_jwt(client_class): (transports.ProjectsGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_projects_client_service_account_always_use_jwt_true( +def test_projects_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -148,6 +138,13 @@ def test_projects_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", [ProjectsClient, ProjectsAsyncClient,]) def test_projects_client_from_service_account_file(client_class): @@ -218,6 +215,7 @@ def test_projects_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 @@ -234,6 +232,7 @@ def test_projects_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 @@ -250,6 +249,7 @@ def test_projects_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 @@ -278,6 +278,7 @@ def test_projects_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, ) @@ -342,6 +343,7 @@ def test_projects_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_projects_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_projects_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, ) @@ -422,6 +426,7 @@ def test_projects_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, ) @@ -448,6 +453,7 @@ def test_projects_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, ) @@ -465,6 +471,7 @@ def test_projects_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/resourcemanager_v3/test_tag_bindings.py b/tests/unit/gapic/resourcemanager_v3/test_tag_bindings.py index d31101a..181d9d9 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_tag_bindings.py +++ b/tests/unit/gapic/resourcemanager_v3/test_tag_bindings.py @@ -117,16 +117,6 @@ def test_tag_bindings_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize("client_class", [TagBindingsClient, TagBindingsAsyncClient,]) -def test_tag_bindings_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", [ @@ -134,7 +124,7 @@ def test_tag_bindings_client_service_account_always_use_jwt(client_class): (transports.TagBindingsGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_tag_bindings_client_service_account_always_use_jwt_true( +def test_tag_bindings_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -144,6 +134,13 @@ def test_tag_bindings_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", [TagBindingsClient, TagBindingsAsyncClient,]) def test_tag_bindings_client_from_service_account_file(client_class): @@ -220,6 +217,7 @@ def test_tag_bindings_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 @@ -236,6 +234,7 @@ def test_tag_bindings_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 @@ -252,6 +251,7 @@ def test_tag_bindings_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 @@ -280,6 +280,7 @@ def test_tag_bindings_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, ) @@ -344,6 +345,7 @@ def test_tag_bindings_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 @@ -377,6 +379,7 @@ def test_tag_bindings_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. @@ -398,6 +401,7 @@ def test_tag_bindings_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, ) @@ -428,6 +432,7 @@ def test_tag_bindings_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, ) @@ -458,6 +463,7 @@ def test_tag_bindings_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, ) @@ -475,6 +481,7 @@ def test_tag_bindings_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/resourcemanager_v3/test_tag_keys.py b/tests/unit/gapic/resourcemanager_v3/test_tag_keys.py index b5598a7..1d802c9 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_tag_keys.py +++ b/tests/unit/gapic/resourcemanager_v3/test_tag_keys.py @@ -120,16 +120,6 @@ def test_tag_keys_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize("client_class", [TagKeysClient, TagKeysAsyncClient,]) -def test_tag_keys_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", [ @@ -137,7 +127,7 @@ def test_tag_keys_client_service_account_always_use_jwt(client_class): (transports.TagKeysGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_tag_keys_client_service_account_always_use_jwt_true( +def test_tag_keys_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -147,6 +137,13 @@ def test_tag_keys_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", [TagKeysClient, TagKeysAsyncClient,]) def test_tag_keys_client_from_service_account_file(client_class): @@ -215,6 +212,7 @@ def test_tag_keys_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 @@ -231,6 +229,7 @@ def test_tag_keys_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 @@ -247,6 +246,7 @@ def test_tag_keys_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 @@ -275,6 +275,7 @@ def test_tag_keys_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, ) @@ -337,6 +338,7 @@ def test_tag_keys_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 @@ -370,6 +372,7 @@ def test_tag_keys_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. @@ -391,6 +394,7 @@ def test_tag_keys_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, ) @@ -417,6 +421,7 @@ def test_tag_keys_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, ) @@ -443,6 +448,7 @@ def test_tag_keys_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, ) @@ -460,6 +466,7 @@ def test_tag_keys_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/resourcemanager_v3/test_tag_values.py b/tests/unit/gapic/resourcemanager_v3/test_tag_values.py index bb0262e..4e829de 100644 --- a/tests/unit/gapic/resourcemanager_v3/test_tag_values.py +++ b/tests/unit/gapic/resourcemanager_v3/test_tag_values.py @@ -121,16 +121,6 @@ def test_tag_values_client_from_service_account_info(client_class): assert client.transport._host == "cloudresourcemanager.googleapis.com:443" -@pytest.mark.parametrize("client_class", [TagValuesClient, TagValuesAsyncClient,]) -def test_tag_values_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", [ @@ -138,7 +128,7 @@ def test_tag_values_client_service_account_always_use_jwt(client_class): (transports.TagValuesGrpcAsyncIOTransport, "grpc_asyncio"), ], ) -def test_tag_values_client_service_account_always_use_jwt_true( +def test_tag_values_client_service_account_always_use_jwt( transport_class, transport_name ): with mock.patch.object( @@ -148,6 +138,13 @@ def test_tag_values_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", [TagValuesClient, TagValuesAsyncClient,]) def test_tag_values_client_from_service_account_file(client_class): @@ -224,6 +221,7 @@ def test_tag_values_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 @@ -240,6 +238,7 @@ def test_tag_values_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 @@ -256,6 +255,7 @@ def test_tag_values_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 @@ -284,6 +284,7 @@ def test_tag_values_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, ) @@ -348,6 +349,7 @@ def test_tag_values_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 @@ -381,6 +383,7 @@ def test_tag_values_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. @@ -402,6 +405,7 @@ def test_tag_values_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, ) @@ -432,6 +436,7 @@ def test_tag_values_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, ) @@ -462,6 +467,7 @@ def test_tag_values_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, ) @@ -479,6 +485,7 @@ def test_tag_values_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, )