Skip to content
This repository has been archived by the owner on Jul 6, 2023. It is now read-only.

fix: enable self signed jwt for grpc #27

Merged
merged 2 commits into from
Jul 24, 2021
Merged

fix: enable self signed jwt for grpc #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db5db5
fix: enable self signed jwt for grpc chore: use gapic-generator-pytho…
gcf-owl-bot[bot] Jul 23, 2021
307974b
🦉 Updates from OwlBot
gcf-owl-bot[bot] Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,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_contact(
Expand Down
32 changes: 18 additions & 14 deletions tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,14 @@ def test_essential_contacts_service_client_from_service_account_info(client_clas
assert client.transport._host == "essentialcontacts.googleapis.com:443"


@pytest.mark.parametrize(
"client_class",
[EssentialContactsServiceClient, EssentialContactsServiceAsyncClient,],
)
def test_essential_contacts_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",
[
(transports.EssentialContactsServiceGrpcTransport, "grpc"),
(transports.EssentialContactsServiceGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_essential_contacts_service_client_service_account_always_use_jwt_true(
def test_essential_contacts_service_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -161,6 +148,13 @@ def test_essential_contacts_service_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",
Expand Down Expand Up @@ -250,6 +244,7 @@ def test_essential_contacts_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
Expand All @@ -266,6 +261,7 @@ def test_essential_contacts_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
Expand All @@ -282,6 +278,7 @@ def test_essential_contacts_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
Expand Down Expand Up @@ -310,6 +307,7 @@ def test_essential_contacts_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,
)


Expand Down Expand Up @@ -386,6 +384,7 @@ def test_essential_contacts_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
Expand Down Expand Up @@ -419,6 +418,7 @@ def test_essential_contacts_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.
Expand All @@ -440,6 +440,7 @@ def test_essential_contacts_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,
)


Expand Down Expand Up @@ -474,6 +475,7 @@ def test_essential_contacts_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,
)


Expand Down Expand Up @@ -508,6 +510,7 @@ def test_essential_contacts_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,
)


Expand All @@ -527,6 +530,7 @@ def test_essential_contacts_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,
)


Expand Down