Skip to content

Commit 8aff323

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: disable always_use_jwt_access (#144)
fix: disable always_use_jwt_access Committer: @busunkim96 PiperOrigin-RevId: 382142900 Source-Link: googleapis/googleapis@513440f Source-Link: googleapis/googleapis-gen@7b1e2c3
1 parent 707c3bc commit 8aff323

File tree

12 files changed

+93
-21
lines changed

12 files changed

+93
-21
lines changed

‎google/cloud/errorreporting_v1beta1/services/error_group_service/transports/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def __init__(
9999
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
100100

101101
# Save the scopes.
102-
self._scopes = scopes or self.AUTH_SCOPES
102+
self._scopes = scopes
103103

104104
# If no credentials are provided, then determine the appropriate
105105
# defaults.

‎google/cloud/errorreporting_v1beta1/services/error_group_service/transports/grpc.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def __init__(
5858
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5959
quota_project_id: Optional[str] = None,
6060
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
61+
always_use_jwt_access: Optional[bool] = False,
6162
) -> None:
6263
"""Instantiate the transport.
6364
@@ -98,6 +99,8 @@ def __init__(
9899
API requests. If ``None``, then default info will be used.
99100
Generally, you only need to set this if you're developing
100101
your own client library.
102+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
103+
be used for service account credentials.
101104
102105
Raises:
103106
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -150,7 +153,7 @@ def __init__(
150153
scopes=scopes,
151154
quota_project_id=quota_project_id,
152155
client_info=client_info,
153-
always_use_jwt_access=True,
156+
always_use_jwt_access=always_use_jwt_access,
154157
)
155158

156159
if not self._grpc_channel:

‎google/cloud/errorreporting_v1beta1/services/error_group_service/transports/grpc_asyncio.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ def __init__(
104104
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
105105
quota_project_id=None,
106106
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
107+
always_use_jwt_access: Optional[bool] = False,
107108
) -> None:
108109
"""Instantiate the transport.
109110
@@ -145,6 +146,8 @@ def __init__(
145146
API requests. If ``None``, then default info will be used.
146147
Generally, you only need to set this if you're developing
147148
your own client library.
149+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
150+
be used for service account credentials.
148151
149152
Raises:
150153
google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -196,7 +199,7 @@ def __init__(
196199
scopes=scopes,
197200
quota_project_id=quota_project_id,
198201
client_info=client_info,
199-
always_use_jwt_access=True,
202+
always_use_jwt_access=always_use_jwt_access,
200203
)
201204

202205
if not self._grpc_channel:

‎google/cloud/errorreporting_v1beta1/services/error_stats_service/transports/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def __init__(
9898
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
9999

100100
# Save the scopes.
101-
self._scopes = scopes or self.AUTH_SCOPES
101+
self._scopes = scopes
102102

103103
# If no credentials are provided, then determine the appropriate
104104
# defaults.

‎google/cloud/errorreporting_v1beta1/services/error_stats_service/transports/grpc.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def __init__(
5858
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5959
quota_project_id: Optional[str] = None,
6060
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
61+
always_use_jwt_access: Optional[bool] = False,
6162
) -> None:
6263
"""Instantiate the transport.
6364
@@ -98,6 +99,8 @@ def __init__(
9899
API requests. If ``None``, then default info will be used.
99100
Generally, you only need to set this if you're developing
100101
your own client library.
102+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
103+
be used for service account credentials.
101104
102105
Raises:
103106
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -150,7 +153,7 @@ def __init__(
150153
scopes=scopes,
151154
quota_project_id=quota_project_id,
152155
client_info=client_info,
153-
always_use_jwt_access=True,
156+
always_use_jwt_access=always_use_jwt_access,
154157
)
155158

156159
if not self._grpc_channel:

‎google/cloud/errorreporting_v1beta1/services/error_stats_service/transports/grpc_asyncio.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ def __init__(
104104
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
105105
quota_project_id=None,
106106
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
107+
always_use_jwt_access: Optional[bool] = False,
107108
) -> None:
108109
"""Instantiate the transport.
109110
@@ -145,6 +146,8 @@ def __init__(
145146
API requests. If ``None``, then default info will be used.
146147
Generally, you only need to set this if you're developing
147148
your own client library.
149+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
150+
be used for service account credentials.
148151
149152
Raises:
150153
google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -196,7 +199,7 @@ def __init__(
196199
scopes=scopes,
197200
quota_project_id=quota_project_id,
198201
client_info=client_info,
199-
always_use_jwt_access=True,
202+
always_use_jwt_access=always_use_jwt_access,
200203
)
201204

202205
if not self._grpc_channel:

‎google/cloud/errorreporting_v1beta1/services/report_errors_service/transports/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def __init__(
9898
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
9999

100100
# Save the scopes.
101-
self._scopes = scopes or self.AUTH_SCOPES
101+
self._scopes = scopes
102102

103103
# If no credentials are provided, then determine the appropriate
104104
# defaults.

‎google/cloud/errorreporting_v1beta1/services/report_errors_service/transports/grpc.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def __init__(
5757
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5858
quota_project_id: Optional[str] = None,
5959
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
60+
always_use_jwt_access: Optional[bool] = False,
6061
) -> None:
6162
"""Instantiate the transport.
6263
@@ -97,6 +98,8 @@ def __init__(
9798
API requests. If ``None``, then default info will be used.
9899
Generally, you only need to set this if you're developing
99100
your own client library.
101+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
102+
be used for service account credentials.
100103
101104
Raises:
102105
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
@@ -149,7 +152,7 @@ def __init__(
149152
scopes=scopes,
150153
quota_project_id=quota_project_id,
151154
client_info=client_info,
152-
always_use_jwt_access=True,
155+
always_use_jwt_access=always_use_jwt_access,
153156
)
154157

155158
if not self._grpc_channel:

‎google/cloud/errorreporting_v1beta1/services/report_errors_service/transports/grpc_asyncio.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def __init__(
103103
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
104104
quota_project_id=None,
105105
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
106+
always_use_jwt_access: Optional[bool] = False,
106107
) -> None:
107108
"""Instantiate the transport.
108109
@@ -144,6 +145,8 @@ def __init__(
144145
API requests. If ``None``, then default info will be used.
145146
Generally, you only need to set this if you're developing
146147
your own client library.
148+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
149+
be used for service account credentials.
147150
148151
Raises:
149152
google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport
@@ -195,7 +198,7 @@ def __init__(
195198
scopes=scopes,
196199
quota_project_id=quota_project_id,
197200
client_info=client_info,
198-
always_use_jwt_access=True,
201+
always_use_jwt_access=always_use_jwt_access,
199202
)
200203

201204
if not self._grpc_channel:

‎tests/unit/gapic/errorreporting_v1beta1/test_error_group_service.py‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ def test_error_group_service_client_service_account_always_use_jwt(client_class)
132132
) as use_jwt:
133133
creds = service_account.Credentials(None, None, None)
134134
client = client_class(credentials=creds)
135-
use_jwt.assert_called_with(True)
135+
use_jwt.assert_not_called()
136+
137+
138+
@pytest.mark.parametrize(
139+
"transport_class,transport_name",
140+
[
141+
(transports.ErrorGroupServiceGrpcTransport, "grpc"),
142+
(transports.ErrorGroupServiceGrpcAsyncIOTransport, "grpc_asyncio"),
143+
],
144+
)
145+
def test_error_group_service_client_service_account_always_use_jwt_true(
146+
transport_class, transport_name
147+
):
148+
with mock.patch.object(
149+
service_account.Credentials, "with_always_use_jwt_access", create=True
150+
) as use_jwt:
151+
creds = service_account.Credentials(None, None, None)
152+
transport = transport_class(credentials=creds, always_use_jwt_access=True)
153+
use_jwt.assert_called_once_with(True)
136154

137155

138156
@pytest.mark.parametrize(
@@ -1192,7 +1210,7 @@ def test_error_group_service_grpc_transport_client_cert_source_for_mtls(
11921210
"squid.clam.whelk:443",
11931211
credentials=cred,
11941212
credentials_file=None,
1195-
scopes=("https://www.googleapis.com/auth/cloud-platform",),
1213+
scopes=None,
11961214
ssl_credentials=mock_ssl_channel_creds,
11971215
quota_project_id=None,
11981216
options=[
@@ -1301,7 +1319,7 @@ def test_error_group_service_transport_channel_mtls_with_client_cert_source(
13011319
"mtls.squid.clam.whelk:443",
13021320
credentials=cred,
13031321
credentials_file=None,
1304-
scopes=("https://www.googleapis.com/auth/cloud-platform",),
1322+
scopes=None,
13051323
ssl_credentials=mock_ssl_cred,
13061324
quota_project_id=None,
13071325
options=[
@@ -1348,7 +1366,7 @@ def test_error_group_service_transport_channel_mtls_with_adc(transport_class):
13481366
"mtls.squid.clam.whelk:443",
13491367
credentials=mock_cred,
13501368
credentials_file=None,
1351-
scopes=("https://www.googleapis.com/auth/cloud-platform",),
1369+
scopes=None,
13521370
ssl_credentials=mock_ssl_cred,
13531371
quota_project_id=None,
13541372
options=[

0 commit comments

Comments
 (0)