fix: disable always_use_jwt_access (#62)

Committer: @busunkim96 PiperOrigin-RevId: 382142900 Source-Link: googleapis/googleapis@513440f Source-Link: googleapis/googleapis-gen@7b1e2c3

Author: gcf-owl-bot[bot]

google/cloud/orgpolicy_v2/services/org_policy/transports/base.py

@@ -99,7 +99,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/orgpolicy_v2/services/org_policy/transports/grpc.py

@@ -79,6 +79,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.
 
@@ -119,6 +120,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
@@ -171,7 +174,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/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py

@@ -125,6 +125,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.
 
@@ -166,6 +167,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
@@ -217,7 +220,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/orgpolicy_v2/test_org_policy.py

@@ -121,7 +121,25 @@ def test_org_policy_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.OrgPolicyGrpcTransport, "grpc"),
+ (transports.OrgPolicyGrpcAsyncIOTransport, "grpc_asyncio"),
+ ],
+)
+def test_org_policy_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("client_class", [OrgPolicyClient, OrgPolicyAsyncClient,])
@@ -2366,7 +2384,7 @@ def test_org_policy_grpc_transport_client_cert_source_for_mtls(transport_class):
  "squid.clam.whelk:443",
  credentials=cred,
  credentials_file=None,
- scopes=("https://www.googleapis.com/auth/cloud-platform",),
+ scopes=None,
  ssl_credentials=mock_ssl_channel_creds,
  quota_project_id=None,
  options=[
@@ -2470,7 +2488,7 @@ def test_org_policy_transport_channel_mtls_with_client_cert_source(transport_cla
  "mtls.squid.clam.whelk:443",
  credentials=cred,
  credentials_file=None,
- scopes=("https://www.googleapis.com/auth/cloud-platform",),
+ scopes=None,
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
  options=[
@@ -2514,7 +2532,7 @@ def test_org_policy_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",),
+ scopes=None,
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
  options=[