Skip to content
This repository was archived by the owner on Nov 29, 2023. It is now read-only.

Commit 452460f

Browse files
chore: use gapic-generator-python 0.62.1 (#340)
- [x] Regenerate this pull request now. fix: resolve DuplicateCredentialArgs error when using credentials_file committer: parthea PiperOrigin-RevId: 425964861 Source-Link: googleapis/googleapis@84b1a5a Source-Link: https://github.com/googleapis/googleapis-gen/commit/4fb761bbd8506ac156f49bac5f18306aa8eb3aa8 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9
1 parent 59a1afc commit 452460f

File tree

27 files changed

+498
-109
lines changed

27 files changed

+498
-109
lines changed

google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ async def create_autoscaling_policy(
269269
270270
"""
271271
# Create or coerce a protobuf request object.
272-
# Sanity check: If we got a request object, we should *not* have
272+
# Quick check: If we got a request object, we should *not* have
273273
# gotten any keyword arguments that map to the request.
274274
has_flattened_params = any([parent, policy])
275275
if request is not None and has_flattened_params:
@@ -347,7 +347,7 @@ async def update_autoscaling_policy(
347347
348348
"""
349349
# Create or coerce a protobuf request object.
350-
# Sanity check: If we got a request object, we should *not* have
350+
# Quick check: If we got a request object, we should *not* have
351351
# gotten any keyword arguments that map to the request.
352352
has_flattened_params = any([policy])
353353
if request is not None and has_flattened_params:
@@ -440,7 +440,7 @@ async def get_autoscaling_policy(
440440
441441
"""
442442
# Create or coerce a protobuf request object.
443-
# Sanity check: If we got a request object, we should *not* have
443+
# Quick check: If we got a request object, we should *not* have
444444
# gotten any keyword arguments that map to the request.
445445
has_flattened_params = any([name])
446446
if request is not None and has_flattened_params:
@@ -536,7 +536,7 @@ async def list_autoscaling_policies(
536536
537537
"""
538538
# Create or coerce a protobuf request object.
539-
# Sanity check: If we got a request object, we should *not* have
539+
# Quick check: If we got a request object, we should *not* have
540540
# gotten any keyword arguments that map to the request.
541541
has_flattened_params = any([parent])
542542
if request is not None and has_flattened_params:
@@ -635,7 +635,7 @@ async def delete_autoscaling_policy(
635635
sent along with the request as metadata.
636636
"""
637637
# Create or coerce a protobuf request object.
638-
# Sanity check: If we got a request object, we should *not* have
638+
# Quick check: If we got a request object, we should *not* have
639639
# gotten any keyword arguments that map to the request.
640640
has_flattened_params = any([name])
641641
if request is not None and has_flattened_params:

google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def create_autoscaling_policy(
461461
462462
"""
463463
# Create or coerce a protobuf request object.
464-
# Sanity check: If we got a request object, we should *not* have
464+
# Quick check: If we got a request object, we should *not* have
465465
# gotten any keyword arguments that map to the request.
466466
has_flattened_params = any([parent, policy])
467467
if request is not None and has_flattened_params:
@@ -541,7 +541,7 @@ def update_autoscaling_policy(
541541
542542
"""
543543
# Create or coerce a protobuf request object.
544-
# Sanity check: If we got a request object, we should *not* have
544+
# Quick check: If we got a request object, we should *not* have
545545
# gotten any keyword arguments that map to the request.
546546
has_flattened_params = any([policy])
547547
if request is not None and has_flattened_params:
@@ -626,7 +626,7 @@ def get_autoscaling_policy(
626626
627627
"""
628628
# Create or coerce a protobuf request object.
629-
# Sanity check: If we got a request object, we should *not* have
629+
# Quick check: If we got a request object, we should *not* have
630630
# gotten any keyword arguments that map to the request.
631631
has_flattened_params = any([name])
632632
if request is not None and has_flattened_params:
@@ -712,7 +712,7 @@ def list_autoscaling_policies(
712712
713713
"""
714714
# Create or coerce a protobuf request object.
715-
# Sanity check: If we got a request object, we should *not* have
715+
# Quick check: If we got a request object, we should *not* have
716716
# gotten any keyword arguments that map to the request.
717717
has_flattened_params = any([parent])
718718
if request is not None and has_flattened_params:
@@ -803,7 +803,7 @@ def delete_autoscaling_policy(
803803
sent along with the request as metadata.
804804
"""
805805
# Create or coerce a protobuf request object.
806-
# Sanity check: If we got a request object, we should *not* have
806+
# Quick check: If we got a request object, we should *not* have
807807
# gotten any keyword arguments that map to the request.
808808
has_flattened_params = any([name])
809809
if request is not None and has_flattened_params:

google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,11 @@ def __init__(
160160
if not self._grpc_channel:
161161
self._grpc_channel = type(self).create_channel(
162162
self._host,
163+
# use the credentials which are saved
163164
credentials=self._credentials,
164-
credentials_file=credentials_file,
165+
# Set ``credentials_file`` to ``None`` here as
166+
# the credentials that we saved earlier should be used.
167+
credentials_file=None,
165168
scopes=self._scopes,
166169
ssl_credentials=self._ssl_channel_credentials,
167170
quota_project_id=quota_project_id,

google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,11 @@ def __init__(
205205
if not self._grpc_channel:
206206
self._grpc_channel = type(self).create_channel(
207207
self._host,
208+
# use the credentials which are saved
208209
credentials=self._credentials,
209-
credentials_file=credentials_file,
210+
# Set ``credentials_file`` to ``None`` here as
211+
# the credentials that we saved earlier should be used.
212+
credentials_file=None,
210213
scopes=self._scopes,
211214
ssl_credentials=self._ssl_channel_credentials,
212215
quota_project_id=quota_project_id,

google/cloud/dataproc_v1/services/batch_controller/async_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ async def create_batch(
265265
266266
"""
267267
# Create or coerce a protobuf request object.
268-
# Sanity check: If we got a request object, we should *not* have
268+
# Quick check: If we got a request object, we should *not* have
269269
# gotten any keyword arguments that map to the request.
270270
has_flattened_params = any([parent, batch, batch_id])
271271
if request is not None and has_flattened_params:
@@ -348,7 +348,7 @@ async def get_batch(
348348
349349
"""
350350
# Create or coerce a protobuf request object.
351-
# Sanity check: If we got a request object, we should *not* have
351+
# Quick check: If we got a request object, we should *not* have
352352
# gotten any keyword arguments that map to the request.
353353
has_flattened_params = any([name])
354354
if request is not None and has_flattened_params:
@@ -421,7 +421,7 @@ async def list_batches(
421421
422422
"""
423423
# Create or coerce a protobuf request object.
424-
# Sanity check: If we got a request object, we should *not* have
424+
# Quick check: If we got a request object, we should *not* have
425425
# gotten any keyword arguments that map to the request.
426426
has_flattened_params = any([parent])
427427
if request is not None and has_flattened_params:
@@ -494,7 +494,7 @@ async def delete_batch(
494494
sent along with the request as metadata.
495495
"""
496496
# Create or coerce a protobuf request object.
497-
# Sanity check: If we got a request object, we should *not* have
497+
# Quick check: If we got a request object, we should *not* have
498498
# gotten any keyword arguments that map to the request.
499499
has_flattened_params = any([name])
500500
if request is not None and has_flattened_params:

google/cloud/dataproc_v1/services/batch_controller/client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ def create_batch(
462462
463463
"""
464464
# Create or coerce a protobuf request object.
465-
# Sanity check: If we got a request object, we should *not* have
465+
# Quick check: If we got a request object, we should *not* have
466466
# gotten any keyword arguments that map to the request.
467467
has_flattened_params = any([parent, batch, batch_id])
468468
if request is not None and has_flattened_params:
@@ -545,7 +545,7 @@ def get_batch(
545545
546546
"""
547547
# Create or coerce a protobuf request object.
548-
# Sanity check: If we got a request object, we should *not* have
548+
# Quick check: If we got a request object, we should *not* have
549549
# gotten any keyword arguments that map to the request.
550550
has_flattened_params = any([name])
551551
if request is not None and has_flattened_params:
@@ -618,7 +618,7 @@ def list_batches(
618618
619619
"""
620620
# Create or coerce a protobuf request object.
621-
# Sanity check: If we got a request object, we should *not* have
621+
# Quick check: If we got a request object, we should *not* have
622622
# gotten any keyword arguments that map to the request.
623623
has_flattened_params = any([parent])
624624
if request is not None and has_flattened_params:
@@ -691,7 +691,7 @@ def delete_batch(
691691
sent along with the request as metadata.
692692
"""
693693
# Create or coerce a protobuf request object.
694-
# Sanity check: If we got a request object, we should *not* have
694+
# Quick check: If we got a request object, we should *not* have
695695
# gotten any keyword arguments that map to the request.
696696
has_flattened_params = any([name])
697697
if request is not None and has_flattened_params:

google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,11 @@ def __init__(
163163
if not self._grpc_channel:
164164
self._grpc_channel = type(self).create_channel(
165165
self._host,
166+
# use the credentials which are saved
166167
credentials=self._credentials,
167-
credentials_file=credentials_file,
168+
# Set ``credentials_file`` to ``None`` here as
169+
# the credentials that we saved earlier should be used.
170+
credentials_file=None,
168171
scopes=self._scopes,
169172
ssl_credentials=self._ssl_channel_credentials,
170173
quota_project_id=quota_project_id,
@@ -237,7 +240,7 @@ def operations_client(self) -> operations_v1.OperationsClient:
237240
This property caches on the instance; repeated calls return the same
238241
client.
239242
"""
240-
# Sanity check: Only create a new client if we do not already have one.
243+
# Quick check: Only create a new client if we do not already have one.
241244
if self._operations_client is None:
242245
self._operations_client = operations_v1.OperationsClient(self.grpc_channel)
243246

google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,11 @@ def __init__(
208208
if not self._grpc_channel:
209209
self._grpc_channel = type(self).create_channel(
210210
self._host,
211+
# use the credentials which are saved
211212
credentials=self._credentials,
212-
credentials_file=credentials_file,
213+
# Set ``credentials_file`` to ``None`` here as
214+
# the credentials that we saved earlier should be used.
215+
credentials_file=None,
213216
scopes=self._scopes,
214217
ssl_credentials=self._ssl_channel_credentials,
215218
quota_project_id=quota_project_id,
@@ -239,7 +242,7 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
239242
This property caches on the instance; repeated calls return the same
240243
client.
241244
"""
242-
# Sanity check: Only create a new client if we do not already have one.
245+
# Quick check: Only create a new client if we do not already have one.
243246
if self._operations_client is None:
244247
self._operations_client = operations_v1.OperationsAsyncClient(
245248
self.grpc_channel

google/cloud/dataproc_v1/services/cluster_controller/async_client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ async def create_cluster(
265265
266266
"""
267267
# Create or coerce a protobuf request object.
268-
# Sanity check: If we got a request object, we should *not* have
268+
# Quick check: If we got a request object, we should *not* have
269269
# gotten any keyword arguments that map to the request.
270270
has_flattened_params = any([project_id, region, cluster])
271271
if request is not None and has_flattened_params:
@@ -446,7 +446,7 @@ async def update_cluster(
446446
447447
"""
448448
# Create or coerce a protobuf request object.
449-
# Sanity check: If we got a request object, we should *not* have
449+
# Quick check: If we got a request object, we should *not* have
450450
# gotten any keyword arguments that map to the request.
451451
has_flattened_params = any(
452452
[project_id, region, cluster_name, cluster, update_mask]
@@ -672,7 +672,7 @@ async def delete_cluster(
672672
673673
"""
674674
# Create or coerce a protobuf request object.
675-
# Sanity check: If we got a request object, we should *not* have
675+
# Quick check: If we got a request object, we should *not* have
676676
# gotten any keyword arguments that map to the request.
677677
has_flattened_params = any([project_id, region, cluster_name])
678678
if request is not None and has_flattened_params:
@@ -775,7 +775,7 @@ async def get_cluster(
775775
776776
"""
777777
# Create or coerce a protobuf request object.
778-
# Sanity check: If we got a request object, we should *not* have
778+
# Quick check: If we got a request object, we should *not* have
779779
# gotten any keyword arguments that map to the request.
780780
has_flattened_params = any([project_id, region, cluster_name])
781781
if request is not None and has_flattened_params:
@@ -897,7 +897,7 @@ async def list_clusters(
897897
898898
"""
899899
# Create or coerce a protobuf request object.
900-
# Sanity check: If we got a request object, we should *not* have
900+
# Quick check: If we got a request object, we should *not* have
901901
# gotten any keyword arguments that map to the request.
902902
has_flattened_params = any([project_id, region, filter])
903903
if request is not None and has_flattened_params:
@@ -1008,7 +1008,7 @@ async def diagnose_cluster(
10081008
10091009
"""
10101010
# Create or coerce a protobuf request object.
1011-
# Sanity check: If we got a request object, we should *not* have
1011+
# Quick check: If we got a request object, we should *not* have
10121012
# gotten any keyword arguments that map to the request.
10131013
has_flattened_params = any([project_id, region, cluster_name])
10141014
if request is not None and has_flattened_params:

google/cloud/dataproc_v1/services/cluster_controller/client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ def create_cluster(
478478
479479
"""
480480
# Create or coerce a protobuf request object.
481-
# Sanity check: If we got a request object, we should *not* have
481+
# Quick check: If we got a request object, we should *not* have
482482
# gotten any keyword arguments that map to the request.
483483
has_flattened_params = any([project_id, region, cluster])
484484
if request is not None and has_flattened_params:
@@ -650,7 +650,7 @@ def update_cluster(
650650
651651
"""
652652
# Create or coerce a protobuf request object.
653-
# Sanity check: If we got a request object, we should *not* have
653+
# Quick check: If we got a request object, we should *not* have
654654
# gotten any keyword arguments that map to the request.
655655
has_flattened_params = any(
656656
[project_id, region, cluster_name, cluster, update_mask]
@@ -869,7 +869,7 @@ def delete_cluster(
869869
870870
"""
871871
# Create or coerce a protobuf request object.
872-
# Sanity check: If we got a request object, we should *not* have
872+
# Quick check: If we got a request object, we should *not* have
873873
# gotten any keyword arguments that map to the request.
874874
has_flattened_params = any([project_id, region, cluster_name])
875875
if request is not None and has_flattened_params:
@@ -963,7 +963,7 @@ def get_cluster(
963963
964964
"""
965965
# Create or coerce a protobuf request object.
966-
# Sanity check: If we got a request object, we should *not* have
966+
# Quick check: If we got a request object, we should *not* have
967967
# gotten any keyword arguments that map to the request.
968968
has_flattened_params = any([project_id, region, cluster_name])
969969
if request is not None and has_flattened_params:
@@ -1074,7 +1074,7 @@ def list_clusters(
10741074
10751075
"""
10761076
# Create or coerce a protobuf request object.
1077-
# Sanity check: If we got a request object, we should *not* have
1077+
# Quick check: If we got a request object, we should *not* have
10781078
# gotten any keyword arguments that map to the request.
10791079
has_flattened_params = any([project_id, region, filter])
10801080
if request is not None and has_flattened_params:
@@ -1174,7 +1174,7 @@ def diagnose_cluster(
11741174
11751175
"""
11761176
# Create or coerce a protobuf request object.
1177-
# Sanity check: If we got a request object, we should *not* have
1177+
# Quick check: If we got a request object, we should *not* have
11781178
# gotten any keyword arguments that map to the request.
11791179
has_flattened_params = any([project_id, region, cluster_name])
11801180
if request is not None and has_flattened_params:

0 commit comments

Comments
 (0)