Skip to content

Commit daa30e0

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: enable self signed jwt for grpc (#217)
PiperOrigin-RevId: 386504689 Source-Link: googleapis/googleapis@762094a Source-Link: googleapis/googleapis-gen@6bfc480
1 parent 534b875 commit daa30e0

6 files changed

Lines changed: 66 additions & 37 deletions

File tree

‎packages/google-cloud-python-speech/google/cloud/speech_v1/services/speech/client.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ def __init__(
338338
client_cert_source_for_mtls=client_cert_source_func,
339339
quota_project_id=client_options.quota_project_id,
340340
client_info=client_info,
341+
always_use_jwt_access=(
342+
Transport == type(self).get_transport_class("grpc")
343+
or Transport == type(self).get_transport_class("grpc_asyncio")
344+
),
341345
)
342346

343347
def recognize(

‎packages/google-cloud-python-speech/google/cloud/speech_v1p1beta1/services/adaptation/client.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@ def __init__(
360360
client_cert_source_for_mtls=client_cert_source_func,
361361
quota_project_id=client_options.quota_project_id,
362362
client_info=client_info,
363+
always_use_jwt_access=(
364+
Transport == type(self).get_transport_class("grpc")
365+
or Transport == type(self).get_transport_class("grpc_asyncio")
366+
),
363367
)
364368

365369
def create_phrase_set(

‎packages/google-cloud-python-speech/google/cloud/speech_v1p1beta1/services/speech/client.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,10 @@ def __init__(
370370
client_cert_source_for_mtls=client_cert_source_func,
371371
quota_project_id=client_options.quota_project_id,
372372
client_info=client_info,
373+
always_use_jwt_access=(
374+
Transport == type(self).get_transport_class("grpc")
375+
or Transport == type(self).get_transport_class("grpc_asyncio")
376+
),
373377
)
374378

375379
def recognize(

‎packages/google-cloud-python-speech/tests/unit/gapic/speech_v1/test_speech.py‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,33 +112,28 @@ def test_speech_client_from_service_account_info(client_class):
112112
assert client.transport._host == "speech.googleapis.com:443"
113113

114114

115-
@pytest.mark.parametrize("client_class", [SpeechClient, SpeechAsyncClient,])
116-
def test_speech_client_service_account_always_use_jwt(client_class):
117-
with mock.patch.object(
118-
service_account.Credentials, "with_always_use_jwt_access", create=True
119-
) as use_jwt:
120-
creds = service_account.Credentials(None, None, None)
121-
client = client_class(credentials=creds)
122-
use_jwt.assert_not_called()
123-
124-
125115
@pytest.mark.parametrize(
126116
"transport_class,transport_name",
127117
[
128118
(transports.SpeechGrpcTransport, "grpc"),
129119
(transports.SpeechGrpcAsyncIOTransport, "grpc_asyncio"),
130120
],
131121
)
132-
def test_speech_client_service_account_always_use_jwt_true(
133-
transport_class, transport_name
134-
):
122+
def test_speech_client_service_account_always_use_jwt(transport_class, transport_name):
135123
with mock.patch.object(
136124
service_account.Credentials, "with_always_use_jwt_access", create=True
137125
) as use_jwt:
138126
creds = service_account.Credentials(None, None, None)
139127
transport = transport_class(credentials=creds, always_use_jwt_access=True)
140128
use_jwt.assert_called_once_with(True)
141129

130+
with mock.patch.object(
131+
service_account.Credentials, "with_always_use_jwt_access", create=True
132+
) as use_jwt:
133+
creds = service_account.Credentials(None, None, None)
134+
transport = transport_class(credentials=creds, always_use_jwt_access=False)
135+
use_jwt.assert_not_called()
136+
142137

143138
@pytest.mark.parametrize("client_class", [SpeechClient, SpeechAsyncClient,])
144139
def test_speech_client_from_service_account_file(client_class):
@@ -207,6 +202,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
207202
client_cert_source_for_mtls=None,
208203
quota_project_id=None,
209204
client_info=transports.base.DEFAULT_CLIENT_INFO,
205+
always_use_jwt_access=True,
210206
)
211207

212208
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -223,6 +219,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
223219
client_cert_source_for_mtls=None,
224220
quota_project_id=None,
225221
client_info=transports.base.DEFAULT_CLIENT_INFO,
222+
always_use_jwt_access=True,
226223
)
227224

228225
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -239,6 +236,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
239236
client_cert_source_for_mtls=None,
240237
quota_project_id=None,
241238
client_info=transports.base.DEFAULT_CLIENT_INFO,
239+
always_use_jwt_access=True,
242240
)
243241

244242
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has
@@ -267,6 +265,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
267265
client_cert_source_for_mtls=None,
268266
quota_project_id="octopus",
269267
client_info=transports.base.DEFAULT_CLIENT_INFO,
268+
always_use_jwt_access=True,
270269
)
271270

272271

@@ -329,6 +328,7 @@ def test_speech_client_mtls_env_auto(
329328
client_cert_source_for_mtls=expected_client_cert_source,
330329
quota_project_id=None,
331330
client_info=transports.base.DEFAULT_CLIENT_INFO,
331+
always_use_jwt_access=True,
332332
)
333333

334334
# Check the case ADC client cert is provided. Whether client cert is used depends on
@@ -362,6 +362,7 @@ def test_speech_client_mtls_env_auto(
362362
client_cert_source_for_mtls=expected_client_cert_source,
363363
quota_project_id=None,
364364
client_info=transports.base.DEFAULT_CLIENT_INFO,
365+
always_use_jwt_access=True,
365366
)
366367

367368
# Check the case client_cert_source and ADC client cert are not provided.
@@ -383,6 +384,7 @@ def test_speech_client_mtls_env_auto(
383384
client_cert_source_for_mtls=None,
384385
quota_project_id=None,
385386
client_info=transports.base.DEFAULT_CLIENT_INFO,
387+
always_use_jwt_access=True,
386388
)
387389

388390

@@ -409,6 +411,7 @@ def test_speech_client_client_options_scopes(
409411
client_cert_source_for_mtls=None,
410412
quota_project_id=None,
411413
client_info=transports.base.DEFAULT_CLIENT_INFO,
414+
always_use_jwt_access=True,
412415
)
413416

414417

@@ -435,6 +438,7 @@ def test_speech_client_client_options_credentials_file(
435438
client_cert_source_for_mtls=None,
436439
quota_project_id=None,
437440
client_info=transports.base.DEFAULT_CLIENT_INFO,
441+
always_use_jwt_access=True,
438442
)
439443

440444

@@ -452,6 +456,7 @@ def test_speech_client_client_options_from_dict():
452456
client_cert_source_for_mtls=None,
453457
quota_project_id=None,
454458
client_info=transports.base.DEFAULT_CLIENT_INFO,
459+
always_use_jwt_access=True,
455460
)
456461

457462

‎packages/google-cloud-python-speech/tests/unit/gapic/speech_v1p1beta1/test_adaptation.py‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,14 @@ def test_adaptation_client_from_service_account_info(client_class):
115115
assert client.transport._host == "speech.googleapis.com:443"
116116

117117

118-
@pytest.mark.parametrize("client_class", [AdaptationClient, AdaptationAsyncClient,])
119-
def test_adaptation_client_service_account_always_use_jwt(client_class):
120-
with mock.patch.object(
121-
service_account.Credentials, "with_always_use_jwt_access", create=True
122-
) as use_jwt:
123-
creds = service_account.Credentials(None, None, None)
124-
client = client_class(credentials=creds)
125-
use_jwt.assert_not_called()
126-
127-
128118
@pytest.mark.parametrize(
129119
"transport_class,transport_name",
130120
[
131121
(transports.AdaptationGrpcTransport, "grpc"),
132122
(transports.AdaptationGrpcAsyncIOTransport, "grpc_asyncio"),
133123
],
134124
)
135-
def test_adaptation_client_service_account_always_use_jwt_true(
125+
def test_adaptation_client_service_account_always_use_jwt(
136126
transport_class, transport_name
137127
):
138128
with mock.patch.object(
@@ -142,6 +132,13 @@ def test_adaptation_client_service_account_always_use_jwt_true(
142132
transport = transport_class(credentials=creds, always_use_jwt_access=True)
143133
use_jwt.assert_called_once_with(True)
144134

135+
with mock.patch.object(
136+
service_account.Credentials, "with_always_use_jwt_access", create=True
137+
) as use_jwt:
138+
creds = service_account.Credentials(None, None, None)
139+
transport = transport_class(credentials=creds, always_use_jwt_access=False)
140+
use_jwt.assert_not_called()
141+
145142

146143
@pytest.mark.parametrize("client_class", [AdaptationClient, AdaptationAsyncClient,])
147144
def test_adaptation_client_from_service_account_file(client_class):
@@ -218,6 +215,7 @@ def test_adaptation_client_client_options(
218215
client_cert_source_for_mtls=None,
219216
quota_project_id=None,
220217
client_info=transports.base.DEFAULT_CLIENT_INFO,
218+
always_use_jwt_access=True,
221219
)
222220

223221
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -234,6 +232,7 @@ def test_adaptation_client_client_options(
234232
client_cert_source_for_mtls=None,
235233
quota_project_id=None,
236234
client_info=transports.base.DEFAULT_CLIENT_INFO,
235+
always_use_jwt_access=True,
237236
)
238237

239238
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -250,6 +249,7 @@ def test_adaptation_client_client_options(
250249
client_cert_source_for_mtls=None,
251250
quota_project_id=None,
252251
client_info=transports.base.DEFAULT_CLIENT_INFO,
252+
always_use_jwt_access=True,
253253
)
254254

255255
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has
@@ -278,6 +278,7 @@ def test_adaptation_client_client_options(
278278
client_cert_source_for_mtls=None,
279279
quota_project_id="octopus",
280280
client_info=transports.base.DEFAULT_CLIENT_INFO,
281+
always_use_jwt_access=True,
281282
)
282283

283284

@@ -342,6 +343,7 @@ def test_adaptation_client_mtls_env_auto(
342343
client_cert_source_for_mtls=expected_client_cert_source,
343344
quota_project_id=None,
344345
client_info=transports.base.DEFAULT_CLIENT_INFO,
346+
always_use_jwt_access=True,
345347
)
346348

347349
# Check the case ADC client cert is provided. Whether client cert is used depends on
@@ -375,6 +377,7 @@ def test_adaptation_client_mtls_env_auto(
375377
client_cert_source_for_mtls=expected_client_cert_source,
376378
quota_project_id=None,
377379
client_info=transports.base.DEFAULT_CLIENT_INFO,
380+
always_use_jwt_access=True,
378381
)
379382

380383
# Check the case client_cert_source and ADC client cert are not provided.
@@ -396,6 +399,7 @@ def test_adaptation_client_mtls_env_auto(
396399
client_cert_source_for_mtls=None,
397400
quota_project_id=None,
398401
client_info=transports.base.DEFAULT_CLIENT_INFO,
402+
always_use_jwt_access=True,
399403
)
400404

401405

@@ -426,6 +430,7 @@ def test_adaptation_client_client_options_scopes(
426430
client_cert_source_for_mtls=None,
427431
quota_project_id=None,
428432
client_info=transports.base.DEFAULT_CLIENT_INFO,
433+
always_use_jwt_access=True,
429434
)
430435

431436

@@ -456,6 +461,7 @@ def test_adaptation_client_client_options_credentials_file(
456461
client_cert_source_for_mtls=None,
457462
quota_project_id=None,
458463
client_info=transports.base.DEFAULT_CLIENT_INFO,
464+
always_use_jwt_access=True,
459465
)
460466

461467

@@ -473,6 +479,7 @@ def test_adaptation_client_client_options_from_dict():
473479
client_cert_source_for_mtls=None,
474480
quota_project_id=None,
475481
client_info=transports.base.DEFAULT_CLIENT_INFO,
482+
always_use_jwt_access=True,
476483
)
477484

478485

‎packages/google-cloud-python-speech/tests/unit/gapic/speech_v1p1beta1/test_speech.py‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,33 +116,28 @@ def test_speech_client_from_service_account_info(client_class):
116116
assert client.transport._host == "speech.googleapis.com:443"
117117

118118

119-
@pytest.mark.parametrize("client_class", [SpeechClient, SpeechAsyncClient,])
120-
def test_speech_client_service_account_always_use_jwt(client_class):
121-
with mock.patch.object(
122-
service_account.Credentials, "with_always_use_jwt_access", create=True
123-
) as use_jwt:
124-
creds = service_account.Credentials(None, None, None)
125-
client = client_class(credentials=creds)
126-
use_jwt.assert_not_called()
127-
128-
129119
@pytest.mark.parametrize(
130120
"transport_class,transport_name",
131121
[
132122
(transports.SpeechGrpcTransport, "grpc"),
133123
(transports.SpeechGrpcAsyncIOTransport, "grpc_asyncio"),
134124
],
135125
)
136-
def test_speech_client_service_account_always_use_jwt_true(
137-
transport_class, transport_name
138-
):
126+
def test_speech_client_service_account_always_use_jwt(transport_class, transport_name):
139127
with mock.patch.object(
140128
service_account.Credentials, "with_always_use_jwt_access", create=True
141129
) as use_jwt:
142130
creds = service_account.Credentials(None, None, None)
143131
transport = transport_class(credentials=creds, always_use_jwt_access=True)
144132
use_jwt.assert_called_once_with(True)
145133

134+
with mock.patch.object(
135+
service_account.Credentials, "with_always_use_jwt_access", create=True
136+
) as use_jwt:
137+
creds = service_account.Credentials(None, None, None)
138+
transport = transport_class(credentials=creds, always_use_jwt_access=False)
139+
use_jwt.assert_not_called()
140+
146141

147142
@pytest.mark.parametrize("client_class", [SpeechClient, SpeechAsyncClient,])
148143
def test_speech_client_from_service_account_file(client_class):
@@ -211,6 +206,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
211206
client_cert_source_for_mtls=None,
212207
quota_project_id=None,
213208
client_info=transports.base.DEFAULT_CLIENT_INFO,
209+
always_use_jwt_access=True,
214210
)
215211

216212
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -227,6 +223,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
227223
client_cert_source_for_mtls=None,
228224
quota_project_id=None,
229225
client_info=transports.base.DEFAULT_CLIENT_INFO,
226+
always_use_jwt_access=True,
230227
)
231228

232229
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -243,6 +240,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
243240
client_cert_source_for_mtls=None,
244241
quota_project_id=None,
245242
client_info=transports.base.DEFAULT_CLIENT_INFO,
243+
always_use_jwt_access=True,
246244
)
247245

248246
# Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has
@@ -271,6 +269,7 @@ def test_speech_client_client_options(client_class, transport_class, transport_n
271269
client_cert_source_for_mtls=None,
272270
quota_project_id="octopus",
273271
client_info=transports.base.DEFAULT_CLIENT_INFO,
272+
always_use_jwt_access=True,
274273
)
275274

276275

@@ -333,6 +332,7 @@ def test_speech_client_mtls_env_auto(
333332
client_cert_source_for_mtls=expected_client_cert_source,
334333
quota_project_id=None,
335334
client_info=transports.base.DEFAULT_CLIENT_INFO,
335+
always_use_jwt_access=True,
336336
)
337337

338338
# Check the case ADC client cert is provided. Whether client cert is used depends on
@@ -366,6 +366,7 @@ def test_speech_client_mtls_env_auto(
366366
client_cert_source_for_mtls=expected_client_cert_source,
367367
quota_project_id=None,
368368
client_info=transports.base.DEFAULT_CLIENT_INFO,
369+
always_use_jwt_access=True,
369370
)
370371

371372
# Check the case client_cert_source and ADC client cert are not provided.
@@ -387,6 +388,7 @@ def test_speech_client_mtls_env_auto(
387388
client_cert_source_for_mtls=None,
388389
quota_project_id=None,
389390
client_info=transports.base.DEFAULT_CLIENT_INFO,
391+
always_use_jwt_access=True,
390392
)
391393

392394

@@ -413,6 +415,7 @@ def test_speech_client_client_options_scopes(
413415
client_cert_source_for_mtls=None,
414416
quota_project_id=None,
415417
client_info=transports.base.DEFAULT_CLIENT_INFO,
418+
always_use_jwt_access=True,
416419
)
417420

418421

@@ -439,6 +442,7 @@ def test_speech_client_client_options_credentials_file(
439442
client_cert_source_for_mtls=None,
440443
quota_project_id=None,
441444
client_info=transports.base.DEFAULT_CLIENT_INFO,
445+
always_use_jwt_access=True,
442446
)
443447

444448

@@ -456,6 +460,7 @@ def test_speech_client_client_options_from_dict():
456460
client_cert_source_for_mtls=None,
457461
quota_project_id=None,
458462
client_info=transports.base.DEFAULT_CLIENT_INFO,
463+
always_use_jwt_access=True,
459464
)
460465

461466

0 commit comments

Comments
 (0)