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

Commit

Permalink
fix: enable self signed jwt for grpc (#109)
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 386504689

Source-Link: googleapis/googleapis@762094a

Source-Link: googleapis/googleapis-gen@6bfc480
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] committed Jul 24, 2021
1 parent f680b00 commit 797d46c
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 26 deletions.
4 changes: 4 additions & 0 deletions google/cloud/webrisk_v1/services/web_risk_service/client.py
View file
Expand Up @@ -330,6 +330,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 compute_threat_list_diff(
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py
View file
Expand Up @@ -332,6 +332,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 compute_threat_list_diff(
Expand Down
31 changes: 18 additions & 13 deletions tests/unit/gapic/webrisk_v1/test_web_risk_service.py
View file
Expand Up @@ -118,26 +118,14 @@ def test_web_risk_service_client_from_service_account_info(client_class):
assert client.transport._host == "webrisk.googleapis.com:443"


@pytest.mark.parametrize(
"client_class", [WebRiskServiceClient, WebRiskServiceAsyncClient,]
)
def test_web_risk_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.WebRiskServiceGrpcTransport, "grpc"),
(transports.WebRiskServiceGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_web_risk_service_client_service_account_always_use_jwt_true(
def test_web_risk_service_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -147,6 +135,13 @@ def test_web_risk_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", [WebRiskServiceClient, WebRiskServiceAsyncClient,]
Expand Down Expand Up @@ -227,6 +222,7 @@ def test_web_risk_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 @@ -243,6 +239,7 @@ def test_web_risk_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 @@ -259,6 +256,7 @@ def test_web_risk_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 @@ -287,6 +285,7 @@ def test_web_risk_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 @@ -353,6 +352,7 @@ def test_web_risk_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 @@ -386,6 +386,7 @@ def test_web_risk_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 @@ -407,6 +408,7 @@ def test_web_risk_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 @@ -437,6 +439,7 @@ def test_web_risk_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 @@ -467,6 +470,7 @@ def test_web_risk_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 @@ -486,6 +490,7 @@ def test_web_risk_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
31 changes: 18 additions & 13 deletions tests/unit/gapic/webrisk_v1beta1/test_web_risk_service_v1_beta1.py
View file
Expand Up @@ -123,26 +123,14 @@ def test_web_risk_service_v1_beta1_client_from_service_account_info(client_class
assert client.transport._host == "webrisk.googleapis.com:443"


@pytest.mark.parametrize(
"client_class", [WebRiskServiceV1Beta1Client, WebRiskServiceV1Beta1AsyncClient,]
)
def test_web_risk_service_v1_beta1_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.WebRiskServiceV1Beta1GrpcTransport, "grpc"),
(transports.WebRiskServiceV1Beta1GrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_web_risk_service_v1_beta1_client_service_account_always_use_jwt_true(
def test_web_risk_service_v1_beta1_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -152,6 +140,13 @@ def test_web_risk_service_v1_beta1_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", [WebRiskServiceV1Beta1Client, WebRiskServiceV1Beta1AsyncClient,]
Expand Down Expand Up @@ -236,6 +231,7 @@ def test_web_risk_service_v1_beta1_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 @@ -252,6 +248,7 @@ def test_web_risk_service_v1_beta1_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 @@ -268,6 +265,7 @@ def test_web_risk_service_v1_beta1_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 @@ -296,6 +294,7 @@ def test_web_risk_service_v1_beta1_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 @@ -372,6 +371,7 @@ def test_web_risk_service_v1_beta1_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 @@ -405,6 +405,7 @@ def test_web_risk_service_v1_beta1_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 @@ -426,6 +427,7 @@ def test_web_risk_service_v1_beta1_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 @@ -460,6 +462,7 @@ def test_web_risk_service_v1_beta1_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 @@ -494,6 +497,7 @@ def test_web_risk_service_v1_beta1_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 @@ -513,6 +517,7 @@ def test_web_risk_service_v1_beta1_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

0 comments on commit 797d46c

Please sign in to comment.