Skip to content
Permalink
Browse files
fix: enable self signed jwt for grpc (#58)
  • Loading branch information
gcf-owl-bot[bot] committed Jul 24, 2021
1 parent 6c54ae1 commit 66f14c93978f97f8180ca8f0a02856d4d633a2bf
Showing with 22 additions and 13 deletions.
  1. +4 −0 google/cloud/gkehub_v1/services/gke_hub/client.py
  2. +18 −13 tests/unit/gapic/gkehub_v1/test_gke_hub.py
@@ -379,6 +379,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_memberships(
@@ -118,33 +118,28 @@ def test_gke_hub_client_from_service_account_info(client_class):
assert client.transport._host == "gkehub.googleapis.com:443"


@pytest.mark.parametrize("client_class", [GkeHubClient, GkeHubAsyncClient,])
def test_gke_hub_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.GkeHubGrpcTransport, "grpc"),
(transports.GkeHubGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_gke_hub_client_service_account_always_use_jwt_true(
transport_class, transport_name
):
def test_gke_hub_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:
creds = service_account.Credentials(None, None, None)
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", [GkeHubClient, GkeHubAsyncClient,])
def test_gke_hub_client_from_service_account_file(client_class):
@@ -213,6 +208,7 @@ def test_gke_hub_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
@@ -229,6 +225,7 @@ def test_gke_hub_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
@@ -245,6 +242,7 @@ def test_gke_hub_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
@@ -273,6 +271,7 @@ def test_gke_hub_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,
)


@@ -335,6 +334,7 @@ def test_gke_hub_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
@@ -368,6 +368,7 @@ def test_gke_hub_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.
@@ -389,6 +390,7 @@ def test_gke_hub_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,
)


@@ -415,6 +417,7 @@ def test_gke_hub_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,
)


@@ -441,6 +444,7 @@ def test_gke_hub_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,
)


@@ -458,6 +462,7 @@ def test_gke_hub_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,
)


0 comments on commit 66f14c9

Please sign in to comment.