Skip to content
Permalink
Browse files
fix: enable self signed jwt for grpc (#10)
  • Loading branch information
gcf-owl-bot[bot] committed Jul 24, 2021
1 parent b78d14c commit 0ec82261f2c4fab58a2a52ec9d3c49d043598f2c
Showing with 22 additions and 11 deletions.
  1. +4 −0 google/cloud/data_fusion_v1/services/data_fusion/client.py
  2. +18 −11 tests/unit/gapic/data_fusion_v1/test_data_fusion.py
@@ -350,6 +350,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_available_versions(
@@ -119,24 +119,14 @@ def test_data_fusion_client_from_service_account_info(client_class):
assert client.transport._host == "datafusion.googleapis.com:443"


@pytest.mark.parametrize("client_class", [DataFusionClient, DataFusionAsyncClient,])
def test_data_fusion_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.DataFusionGrpcTransport, "grpc"),
(transports.DataFusionGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_data_fusion_client_service_account_always_use_jwt_true(
def test_data_fusion_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
@@ -146,6 +136,13 @@ def test_data_fusion_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", [DataFusionClient, DataFusionAsyncClient,])
def test_data_fusion_client_from_service_account_file(client_class):
@@ -222,6 +219,7 @@ def test_data_fusion_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
@@ -238,6 +236,7 @@ def test_data_fusion_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
@@ -254,6 +253,7 @@ def test_data_fusion_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
@@ -282,6 +282,7 @@ def test_data_fusion_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,
)


@@ -346,6 +347,7 @@ def test_data_fusion_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
@@ -379,6 +381,7 @@ def test_data_fusion_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.
@@ -400,6 +403,7 @@ def test_data_fusion_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,
)


@@ -430,6 +434,7 @@ def test_data_fusion_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,
)


@@ -460,6 +465,7 @@ def test_data_fusion_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,
)


@@ -477,6 +483,7 @@ def test_data_fusion_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 0ec8226

Please sign in to comment.