fix: disable always_use_jwt_access (#342)

* chore: use gapic-generator-python 0.50.3 Committer: @busunkim96 PiperOrigin-RevId: 382142900 Source-Link: googleapis/googleapis@513440f Source-Link: googleapis/googleapis-gen@7b1e2c3 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

google/cloud/logging_v2/services/config_service_v2/transports/base.py

@@ -102,7 +102,7 @@ def __init__(
  scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
 
  # Save the scopes.
- self._scopes = scopes or self.AUTH_SCOPES
+ self._scopes = scopes
 
  # If no credentials are provided, then determine the appropriate
  # defaults.

google/cloud/logging_v2/services/config_service_v2/transports/grpc.py

@@ -58,6 +58,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -98,6 +99,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -150,7 +153,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py

@@ -104,6 +104,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -145,6 +146,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -196,7 +199,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

google/cloud/logging_v2/services/logging_service_v2/transports/base.py

@@ -103,7 +103,7 @@ def __init__(
  scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
 
  # Save the scopes.
- self._scopes = scopes or self.AUTH_SCOPES
+ self._scopes = scopes
 
  # If no credentials are provided, then determine the appropriate
  # defaults.

google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py

@@ -58,6 +58,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -98,6 +99,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -150,7 +153,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

google/cloud/logging_v2/services/logging_service_v2/transports/grpc_asyncio.py

@@ -104,6 +104,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -145,6 +146,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -196,7 +199,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

google/cloud/logging_v2/services/metrics_service_v2/transports/base.py

@@ -103,7 +103,7 @@ def __init__(
  scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
 
  # Save the scopes.
- self._scopes = scopes or self.AUTH_SCOPES
+ self._scopes = scopes
 
  # If no credentials are provided, then determine the appropriate
  # defaults.

google/cloud/logging_v2/services/metrics_service_v2/transports/grpc.py

@@ -58,6 +58,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -98,6 +99,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -150,7 +153,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

google/cloud/logging_v2/services/metrics_service_v2/transports/grpc_asyncio.py

@@ -104,6 +104,7 @@ def __init__(
  client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
+ always_use_jwt_access: Optional[bool] = False,
  ) -> None:
  """Instantiate the transport.
 
@@ -145,6 +146,8 @@ def __init__(
  API requests. If ``None``, then default info will be used.
  Generally, you only need to set this if you're developing
  your own client library.
+ always_use_jwt_access (Optional[bool]): Whether self signed JWT should
+ be used for service account credentials.
 
  Raises:
  google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -196,7 +199,7 @@ def __init__(
  scopes=scopes,
  quota_project_id=quota_project_id,
  client_info=client_info,
- always_use_jwt_access=True,
+ always_use_jwt_access=always_use_jwt_access,
  )
 
  if not self._grpc_channel:

tests/unit/gapic/logging_v2/test_config_service_v2.py

@@ -131,7 +131,25 @@ def test_config_service_v2_client_service_account_always_use_jwt(client_class):
  ) as use_jwt:
  creds = service_account.Credentials(None, None, None)
  client = client_class(credentials=creds)
- use_jwt.assert_called_with(True)
+ 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(
+ 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)
 
 
 @pytest.mark.parametrize(
@@ -5625,12 +5643,7 @@ def test_config_service_v2_grpc_transport_client_cert_source_for_mtls(transport_
  "squid.clam.whelk:443",
  credentials=cred,
  credentials_file=None,
- scopes=(
- "https://www.googleapis.com/auth/cloud-platform",
- "https://www.googleapis.com/auth/cloud-platform.read-only",
- "https://www.googleapis.com/auth/logging.admin",
- "https://www.googleapis.com/auth/logging.read",
- ),
+ scopes=None,
  ssl_credentials=mock_ssl_channel_creds,
  quota_project_id=None,
  options=[
@@ -5739,12 +5752,7 @@ def test_config_service_v2_transport_channel_mtls_with_client_cert_source(
  "mtls.squid.clam.whelk:443",
  credentials=cred,
  credentials_file=None,
- scopes=(
- "https://www.googleapis.com/auth/cloud-platform",
- "https://www.googleapis.com/auth/cloud-platform.read-only",
- "https://www.googleapis.com/auth/logging.admin",
- "https://www.googleapis.com/auth/logging.read",
- ),
+ scopes=None,
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
  options=[
@@ -5791,12 +5799,7 @@ def test_config_service_v2_transport_channel_mtls_with_adc(transport_class):
  "mtls.squid.clam.whelk:443",
  credentials=mock_cred,
  credentials_file=None,
- scopes=(
- "https://www.googleapis.com/auth/cloud-platform",
- "https://www.googleapis.com/auth/cloud-platform.read-only",
- "https://www.googleapis.com/auth/logging.admin",
- "https://www.googleapis.com/auth/logging.read",
- ),
+ scopes=None,
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
  options=[