Skip to content

Commit

Permalink
fix: enable self signed jwt for grpc (#397)
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 6e91e7d commit 9d43a38
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 37 deletions.
4 changes: 4 additions & 0 deletions google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py
View file
Expand Up @@ -408,6 +408,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_instance(
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/bigtable_admin_v2/services/bigtable_table_admin/client.py
View file
Expand Up @@ -446,6 +446,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_table(
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/bigtable_v2/services/bigtable/client.py
View file
Expand Up @@ -344,6 +344,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 read_rows(
Expand Down
31 changes: 18 additions & 13 deletions tests/unit/gapic/bigtable_admin_v2/test_bigtable_instance_admin.py
View file
Expand Up @@ -135,26 +135,14 @@ def test_bigtable_instance_admin_client_from_service_account_info(client_class):
assert client.transport._host == "bigtableadmin.googleapis.com:443"


@pytest.mark.parametrize(
"client_class", [BigtableInstanceAdminClient, BigtableInstanceAdminAsyncClient,]
)
def test_bigtable_instance_admin_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.BigtableInstanceAdminGrpcTransport, "grpc"),
(transports.BigtableInstanceAdminGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_bigtable_instance_admin_client_service_account_always_use_jwt_true(
def test_bigtable_instance_admin_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -164,6 +152,13 @@ def test_bigtable_instance_admin_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", [BigtableInstanceAdminClient, BigtableInstanceAdminAsyncClient,]
Expand Down Expand Up @@ -248,6 +243,7 @@ def test_bigtable_instance_admin_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 @@ -264,6 +260,7 @@ def test_bigtable_instance_admin_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 @@ -280,6 +277,7 @@ def test_bigtable_instance_admin_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 @@ -308,6 +306,7 @@ def test_bigtable_instance_admin_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 @@ -384,6 +383,7 @@ def test_bigtable_instance_admin_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 @@ -417,6 +417,7 @@ def test_bigtable_instance_admin_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 @@ -438,6 +439,7 @@ def test_bigtable_instance_admin_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 @@ -472,6 +474,7 @@ def test_bigtable_instance_admin_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 @@ -506,6 +509,7 @@ def test_bigtable_instance_admin_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 @@ -525,6 +529,7 @@ def test_bigtable_instance_admin_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/bigtable_admin_v2/test_bigtable_table_admin.py
View file
Expand Up @@ -138,26 +138,14 @@ def test_bigtable_table_admin_client_from_service_account_info(client_class):
assert client.transport._host == "bigtableadmin.googleapis.com:443"


@pytest.mark.parametrize(
"client_class", [BigtableTableAdminClient, BigtableTableAdminAsyncClient,]
)
def test_bigtable_table_admin_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.BigtableTableAdminGrpcTransport, "grpc"),
(transports.BigtableTableAdminGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_bigtable_table_admin_client_service_account_always_use_jwt_true(
def test_bigtable_table_admin_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -167,6 +155,13 @@ def test_bigtable_table_admin_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", [BigtableTableAdminClient, BigtableTableAdminAsyncClient,]
Expand Down Expand Up @@ -247,6 +242,7 @@ def test_bigtable_table_admin_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 @@ -263,6 +259,7 @@ def test_bigtable_table_admin_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 @@ -279,6 +276,7 @@ def test_bigtable_table_admin_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 @@ -307,6 +305,7 @@ def test_bigtable_table_admin_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 @@ -383,6 +382,7 @@ def test_bigtable_table_admin_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 @@ -416,6 +416,7 @@ def test_bigtable_table_admin_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 @@ -437,6 +438,7 @@ def test_bigtable_table_admin_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 @@ -467,6 +469,7 @@ def test_bigtable_table_admin_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 @@ -497,6 +500,7 @@ def test_bigtable_table_admin_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 @@ -516,6 +520,7 @@ def test_bigtable_table_admin_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
29 changes: 18 additions & 11 deletions tests/unit/gapic/bigtable_v2/test_bigtable.py
View file
Expand Up @@ -111,24 +111,14 @@ def test_bigtable_client_from_service_account_info(client_class):
assert client.transport._host == "bigtable.googleapis.com:443"


@pytest.mark.parametrize("client_class", [BigtableClient, BigtableAsyncClient,])
def test_bigtable_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.BigtableGrpcTransport, "grpc"),
(transports.BigtableGrpcAsyncIOTransport, "grpc_asyncio"),
],
)
def test_bigtable_client_service_account_always_use_jwt_true(
def test_bigtable_client_service_account_always_use_jwt(
transport_class, transport_name
):
with mock.patch.object(
Expand All @@ -138,6 +128,13 @@ def test_bigtable_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", [BigtableClient, BigtableAsyncClient,])
def test_bigtable_client_from_service_account_file(client_class):
Expand Down Expand Up @@ -208,6 +205,7 @@ def test_bigtable_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
Expand All @@ -224,6 +222,7 @@ def test_bigtable_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
Expand All @@ -240,6 +239,7 @@ def test_bigtable_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
Expand Down Expand Up @@ -268,6 +268,7 @@ def test_bigtable_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,
)


Expand Down Expand Up @@ -332,6 +333,7 @@ def test_bigtable_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 @@ -365,6 +367,7 @@ def test_bigtable_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 @@ -386,6 +389,7 @@ def test_bigtable_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 All @@ -412,6 +416,7 @@ def test_bigtable_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 All @@ -438,6 +443,7 @@ def test_bigtable_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 @@ -455,6 +461,7 @@ def test_bigtable_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 9d43a38

Please sign in to comment.