fix: enable self signed jwt for grpc

google/cloud/logging_v2/services/config_service_v2/client.py

@@ -397,6 +397,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_buckets(

google/cloud/logging_v2/services/logging_service_v2/client.py

@@ -351,6 +351,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 delete_log(

google/cloud/logging_v2/services/metrics_service_v2/client.py

@@ -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 list_log_metrics(

tests/unit/gapic/logging_v2/test_config_service_v2.py

@@ -122,26 +122,14 @@ def test_config_service_v2_client_from_service_account_info(client_class):
  assert client.transport._host == "logging.googleapis.com:443"
 
 
-@pytest.mark.parametrize(
- "client_class", [ConfigServiceV2Client, ConfigServiceV2AsyncClient,]
-)
-def test_config_service_v2_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.ConfigServiceV2GrpcTransport, "grpc"),
  (transports.ConfigServiceV2GrpcAsyncIOTransport, "grpc_asyncio"),
  ],
 )
-def test_config_service_v2_client_service_account_always_use_jwt_true(
+def test_config_service_v2_client_service_account_always_use_jwt(
  transport_class, transport_name
 ):
  with mock.patch.object(
@@ -151,6 +139,13 @@ def test_config_service_v2_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", [ConfigServiceV2Client, ConfigServiceV2AsyncClient,]
@@ -231,6 +226,7 @@ def test_config_service_v2_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
@@ -247,6 +243,7 @@ def test_config_service_v2_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
@@ -263,6 +260,7 @@ def test_config_service_v2_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
@@ -291,6 +289,7 @@ def test_config_service_v2_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,
  )
 
 
@@ -367,6 +366,7 @@ def test_config_service_v2_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
@@ -400,6 +400,7 @@ def test_config_service_v2_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.
@@ -421,6 +422,7 @@ def test_config_service_v2_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,
  )
 
 
@@ -451,6 +453,7 @@ def test_config_service_v2_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,
  )
 
 
@@ -481,6 +484,7 @@ def test_config_service_v2_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,
  )
 
 
@@ -500,6 +504,7 @@ def test_config_service_v2_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,
  )
 
 

tests/unit/gapic/logging_v2/test_logging_service_v2.py

@@ -129,26 +129,14 @@ def test_logging_service_v2_client_from_service_account_info(client_class):
  assert client.transport._host == "logging.googleapis.com:443"
 
 
-@pytest.mark.parametrize(
- "client_class", [LoggingServiceV2Client, LoggingServiceV2AsyncClient,]
-)
-def test_logging_service_v2_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.LoggingServiceV2GrpcTransport, "grpc"),
  (transports.LoggingServiceV2GrpcAsyncIOTransport, "grpc_asyncio"),
  ],
 )
-def test_logging_service_v2_client_service_account_always_use_jwt_true(
+def test_logging_service_v2_client_service_account_always_use_jwt(
  transport_class, transport_name
 ):
  with mock.patch.object(
@@ -158,6 +146,13 @@ def test_logging_service_v2_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", [LoggingServiceV2Client, LoggingServiceV2AsyncClient,]
@@ -238,6 +233,7 @@ def test_logging_service_v2_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 +250,7 @@ def test_logging_service_v2_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
@@ -270,6 +267,7 @@ def test_logging_service_v2_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
@@ -298,6 +296,7 @@ def test_logging_service_v2_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,
  )
 
 
@@ -374,6 +373,7 @@ def test_logging_service_v2_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
@@ -407,6 +407,7 @@ def test_logging_service_v2_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.
@@ -428,6 +429,7 @@ def test_logging_service_v2_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,
  )
 
 
@@ -458,6 +460,7 @@ def test_logging_service_v2_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,
  )
 
 
@@ -488,6 +491,7 @@ def test_logging_service_v2_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,
  )
 
 
@@ -507,6 +511,7 @@ def test_logging_service_v2_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,
  )
 
 

tests/unit/gapic/logging_v2/test_metrics_service_v2.py

@@ -127,26 +127,14 @@ def test_metrics_service_v2_client_from_service_account_info(client_class):
  assert client.transport._host == "logging.googleapis.com:443"
 
 
-@pytest.mark.parametrize(
- "client_class", [MetricsServiceV2Client, MetricsServiceV2AsyncClient,]
-)
-def test_metrics_service_v2_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.MetricsServiceV2GrpcTransport, "grpc"),
  (transports.MetricsServiceV2GrpcAsyncIOTransport, "grpc_asyncio"),
  ],
 )
-def test_metrics_service_v2_client_service_account_always_use_jwt_true(
+def test_metrics_service_v2_client_service_account_always_use_jwt(
  transport_class, transport_name
 ):
  with mock.patch.object(
@@ -156,6 +144,13 @@ def test_metrics_service_v2_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", [MetricsServiceV2Client, MetricsServiceV2AsyncClient,]
@@ -236,6 +231,7 @@ def test_metrics_service_v2_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
@@ -252,6 +248,7 @@ def test_metrics_service_v2_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
@@ -268,6 +265,7 @@ def test_metrics_service_v2_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
@@ -296,6 +294,7 @@ def test_metrics_service_v2_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,
  )
 
 
@@ -372,6 +371,7 @@ def test_metrics_service_v2_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
@@ -405,6 +405,7 @@ def test_metrics_service_v2_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.
@@ -426,6 +427,7 @@ def test_metrics_service_v2_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,
  )
 
 
@@ -456,6 +458,7 @@ def test_metrics_service_v2_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,
  )
 
 
@@ -486,6 +489,7 @@ def test_metrics_service_v2_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,
  )
 
 
@@ -505,6 +509,7 @@ def test_metrics_service_v2_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,
  )