Skip to content

Commit b7ed9ad

Browse files
chore: use gapic-generator-python 0.62.1 (#295)
- [ ] 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: googleapis/googleapis-gen@4fb761b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9
1 parent 9db70df commit b7ed9ad

File tree

24 files changed

+546
-75
lines changed

24 files changed

+546
-75
lines changed

google/cloud/pubsublite_v1/services/admin_service/async_client.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ async def create_topic(
260260
Metadata about a topic resource.
261261
"""
262262
# Create or coerce a protobuf request object.
263-
# Sanity check: If we got a request object, we should *not* have
263+
# Quick check: If we got a request object, we should *not* have
264264
# gotten any keyword arguments that map to the request.
265265
has_flattened_params = any([parent, topic, topic_id])
266266
if request is not None and has_flattened_params:
@@ -332,7 +332,7 @@ async def get_topic(
332332
Metadata about a topic resource.
333333
"""
334334
# Create or coerce a protobuf request object.
335-
# Sanity check: If we got a request object, we should *not* have
335+
# Quick check: If we got a request object, we should *not* have
336336
# gotten any keyword arguments that map to the request.
337337
has_flattened_params = any([name])
338338
if request is not None and has_flattened_params:
@@ -401,7 +401,7 @@ async def get_topic_partitions(
401401
Response for GetTopicPartitions.
402402
"""
403403
# Create or coerce a protobuf request object.
404-
# Sanity check: If we got a request object, we should *not* have
404+
# Quick check: If we got a request object, we should *not* have
405405
# gotten any keyword arguments that map to the request.
406406
has_flattened_params = any([name])
407407
if request is not None and has_flattened_params:
@@ -474,7 +474,7 @@ async def list_topics(
474474
475475
"""
476476
# Create or coerce a protobuf request object.
477-
# Sanity check: If we got a request object, we should *not* have
477+
# Quick check: If we got a request object, we should *not* have
478478
# gotten any keyword arguments that map to the request.
479479
has_flattened_params = any([parent])
480480
if request is not None and has_flattened_params:
@@ -556,7 +556,7 @@ async def update_topic(
556556
Metadata about a topic resource.
557557
"""
558558
# Create or coerce a protobuf request object.
559-
# Sanity check: If we got a request object, we should *not* have
559+
# Quick check: If we got a request object, we should *not* have
560560
# gotten any keyword arguments that map to the request.
561561
has_flattened_params = any([topic, update_mask])
562562
if request is not None and has_flattened_params:
@@ -624,7 +624,7 @@ async def delete_topic(
624624
sent along with the request as metadata.
625625
"""
626626
# Create or coerce a protobuf request object.
627-
# Sanity check: If we got a request object, we should *not* have
627+
# Quick check: If we got a request object, we should *not* have
628628
# gotten any keyword arguments that map to the request.
629629
has_flattened_params = any([name])
630630
if request is not None and has_flattened_params:
@@ -696,7 +696,7 @@ async def list_topic_subscriptions(
696696
697697
"""
698698
# Create or coerce a protobuf request object.
699-
# Sanity check: If we got a request object, we should *not* have
699+
# Quick check: If we got a request object, we should *not* have
700700
# gotten any keyword arguments that map to the request.
701701
has_flattened_params = any([name])
702702
if request is not None and has_flattened_params:
@@ -791,7 +791,7 @@ async def create_subscription(
791791
792792
"""
793793
# Create or coerce a protobuf request object.
794-
# Sanity check: If we got a request object, we should *not* have
794+
# Quick check: If we got a request object, we should *not* have
795795
# gotten any keyword arguments that map to the request.
796796
has_flattened_params = any([parent, subscription, subscription_id])
797797
if request is not None and has_flattened_params:
@@ -866,7 +866,7 @@ async def get_subscription(
866866
867867
"""
868868
# Create or coerce a protobuf request object.
869-
# Sanity check: If we got a request object, we should *not* have
869+
# Quick check: If we got a request object, we should *not* have
870870
# gotten any keyword arguments that map to the request.
871871
has_flattened_params = any([name])
872872
if request is not None and has_flattened_params:
@@ -940,7 +940,7 @@ async def list_subscriptions(
940940
941941
"""
942942
# Create or coerce a protobuf request object.
943-
# Sanity check: If we got a request object, we should *not* have
943+
# Quick check: If we got a request object, we should *not* have
944944
# gotten any keyword arguments that map to the request.
945945
has_flattened_params = any([parent])
946946
if request is not None and has_flattened_params:
@@ -1024,7 +1024,7 @@ async def update_subscription(
10241024
10251025
"""
10261026
# Create or coerce a protobuf request object.
1027-
# Sanity check: If we got a request object, we should *not* have
1027+
# Quick check: If we got a request object, we should *not* have
10281028
# gotten any keyword arguments that map to the request.
10291029
has_flattened_params = any([subscription, update_mask])
10301030
if request is not None and has_flattened_params:
@@ -1092,7 +1092,7 @@ async def delete_subscription(
10921092
sent along with the request as metadata.
10931093
"""
10941094
# Create or coerce a protobuf request object.
1095-
# Sanity check: If we got a request object, we should *not* have
1095+
# Quick check: If we got a request object, we should *not* have
10961096
# gotten any keyword arguments that map to the request.
10971097
has_flattened_params = any([name])
10981098
if request is not None and has_flattened_params:
@@ -1265,7 +1265,7 @@ async def create_reservation(
12651265
12661266
"""
12671267
# Create or coerce a protobuf request object.
1268-
# Sanity check: If we got a request object, we should *not* have
1268+
# Quick check: If we got a request object, we should *not* have
12691269
# gotten any keyword arguments that map to the request.
12701270
has_flattened_params = any([parent, reservation, reservation_id])
12711271
if request is not None and has_flattened_params:
@@ -1340,7 +1340,7 @@ async def get_reservation(
13401340
13411341
"""
13421342
# Create or coerce a protobuf request object.
1343-
# Sanity check: If we got a request object, we should *not* have
1343+
# Quick check: If we got a request object, we should *not* have
13441344
# gotten any keyword arguments that map to the request.
13451345
has_flattened_params = any([name])
13461346
if request is not None and has_flattened_params:
@@ -1414,7 +1414,7 @@ async def list_reservations(
14141414
14151415
"""
14161416
# Create or coerce a protobuf request object.
1417-
# Sanity check: If we got a request object, we should *not* have
1417+
# Quick check: If we got a request object, we should *not* have
14181418
# gotten any keyword arguments that map to the request.
14191419
has_flattened_params = any([parent])
14201420
if request is not None and has_flattened_params:
@@ -1498,7 +1498,7 @@ async def update_reservation(
14981498
14991499
"""
15001500
# Create or coerce a protobuf request object.
1501-
# Sanity check: If we got a request object, we should *not* have
1501+
# Quick check: If we got a request object, we should *not* have
15021502
# gotten any keyword arguments that map to the request.
15031503
has_flattened_params = any([reservation, update_mask])
15041504
if request is not None and has_flattened_params:
@@ -1567,7 +1567,7 @@ async def delete_reservation(
15671567
sent along with the request as metadata.
15681568
"""
15691569
# Create or coerce a protobuf request object.
1570-
# Sanity check: If we got a request object, we should *not* have
1570+
# Quick check: If we got a request object, we should *not* have
15711571
# gotten any keyword arguments that map to the request.
15721572
has_flattened_params = any([name])
15731573
if request is not None and has_flattened_params:
@@ -1640,7 +1640,7 @@ async def list_reservation_topics(
16401640
16411641
"""
16421642
# Create or coerce a protobuf request object.
1643-
# Sanity check: If we got a request object, we should *not* have
1643+
# Quick check: If we got a request object, we should *not* have
16441644
# gotten any keyword arguments that map to the request.
16451645
has_flattened_params = any([name])
16461646
if request is not None and has_flattened_params:

google/cloud/pubsublite_v1/services/admin_service/client.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ def create_topic(
487487
Metadata about a topic resource.
488488
"""
489489
# Create or coerce a protobuf request object.
490-
# Sanity check: If we got a request object, we should *not* have
490+
# Quick check: If we got a request object, we should *not* have
491491
# gotten any keyword arguments that map to the request.
492492
has_flattened_params = any([parent, topic, topic_id])
493493
if request is not None and has_flattened_params:
@@ -559,7 +559,7 @@ def get_topic(
559559
Metadata about a topic resource.
560560
"""
561561
# Create or coerce a protobuf request object.
562-
# Sanity check: If we got a request object, we should *not* have
562+
# Quick check: If we got a request object, we should *not* have
563563
# gotten any keyword arguments that map to the request.
564564
has_flattened_params = any([name])
565565
if request is not None and has_flattened_params:
@@ -628,7 +628,7 @@ def get_topic_partitions(
628628
Response for GetTopicPartitions.
629629
"""
630630
# Create or coerce a protobuf request object.
631-
# Sanity check: If we got a request object, we should *not* have
631+
# Quick check: If we got a request object, we should *not* have
632632
# gotten any keyword arguments that map to the request.
633633
has_flattened_params = any([name])
634634
if request is not None and has_flattened_params:
@@ -701,7 +701,7 @@ def list_topics(
701701
702702
"""
703703
# Create or coerce a protobuf request object.
704-
# Sanity check: If we got a request object, we should *not* have
704+
# Quick check: If we got a request object, we should *not* have
705705
# gotten any keyword arguments that map to the request.
706706
has_flattened_params = any([parent])
707707
if request is not None and has_flattened_params:
@@ -783,7 +783,7 @@ def update_topic(
783783
Metadata about a topic resource.
784784
"""
785785
# Create or coerce a protobuf request object.
786-
# Sanity check: If we got a request object, we should *not* have
786+
# Quick check: If we got a request object, we should *not* have
787787
# gotten any keyword arguments that map to the request.
788788
has_flattened_params = any([topic, update_mask])
789789
if request is not None and has_flattened_params:
@@ -851,7 +851,7 @@ def delete_topic(
851851
sent along with the request as metadata.
852852
"""
853853
# Create or coerce a protobuf request object.
854-
# Sanity check: If we got a request object, we should *not* have
854+
# Quick check: If we got a request object, we should *not* have
855855
# gotten any keyword arguments that map to the request.
856856
has_flattened_params = any([name])
857857
if request is not None and has_flattened_params:
@@ -923,7 +923,7 @@ def list_topic_subscriptions(
923923
924924
"""
925925
# Create or coerce a protobuf request object.
926-
# Sanity check: If we got a request object, we should *not* have
926+
# Quick check: If we got a request object, we should *not* have
927927
# gotten any keyword arguments that map to the request.
928928
has_flattened_params = any([name])
929929
if request is not None and has_flattened_params:
@@ -1018,7 +1018,7 @@ def create_subscription(
10181018
10191019
"""
10201020
# Create or coerce a protobuf request object.
1021-
# Sanity check: If we got a request object, we should *not* have
1021+
# Quick check: If we got a request object, we should *not* have
10221022
# gotten any keyword arguments that map to the request.
10231023
has_flattened_params = any([parent, subscription, subscription_id])
10241024
if request is not None and has_flattened_params:
@@ -1093,7 +1093,7 @@ def get_subscription(
10931093
10941094
"""
10951095
# Create or coerce a protobuf request object.
1096-
# Sanity check: If we got a request object, we should *not* have
1096+
# Quick check: If we got a request object, we should *not* have
10971097
# gotten any keyword arguments that map to the request.
10981098
has_flattened_params = any([name])
10991099
if request is not None and has_flattened_params:
@@ -1167,7 +1167,7 @@ def list_subscriptions(
11671167
11681168
"""
11691169
# Create or coerce a protobuf request object.
1170-
# Sanity check: If we got a request object, we should *not* have
1170+
# Quick check: If we got a request object, we should *not* have
11711171
# gotten any keyword arguments that map to the request.
11721172
has_flattened_params = any([parent])
11731173
if request is not None and has_flattened_params:
@@ -1251,7 +1251,7 @@ def update_subscription(
12511251
12521252
"""
12531253
# Create or coerce a protobuf request object.
1254-
# Sanity check: If we got a request object, we should *not* have
1254+
# Quick check: If we got a request object, we should *not* have
12551255
# gotten any keyword arguments that map to the request.
12561256
has_flattened_params = any([subscription, update_mask])
12571257
if request is not None and has_flattened_params:
@@ -1319,7 +1319,7 @@ def delete_subscription(
13191319
sent along with the request as metadata.
13201320
"""
13211321
# Create or coerce a protobuf request object.
1322-
# Sanity check: If we got a request object, we should *not* have
1322+
# Quick check: If we got a request object, we should *not* have
13231323
# gotten any keyword arguments that map to the request.
13241324
has_flattened_params = any([name])
13251325
if request is not None and has_flattened_params:
@@ -1493,7 +1493,7 @@ def create_reservation(
14931493
14941494
"""
14951495
# Create or coerce a protobuf request object.
1496-
# Sanity check: If we got a request object, we should *not* have
1496+
# Quick check: If we got a request object, we should *not* have
14971497
# gotten any keyword arguments that map to the request.
14981498
has_flattened_params = any([parent, reservation, reservation_id])
14991499
if request is not None and has_flattened_params:
@@ -1568,7 +1568,7 @@ def get_reservation(
15681568
15691569
"""
15701570
# Create or coerce a protobuf request object.
1571-
# Sanity check: If we got a request object, we should *not* have
1571+
# Quick check: If we got a request object, we should *not* have
15721572
# gotten any keyword arguments that map to the request.
15731573
has_flattened_params = any([name])
15741574
if request is not None and has_flattened_params:
@@ -1642,7 +1642,7 @@ def list_reservations(
16421642
16431643
"""
16441644
# Create or coerce a protobuf request object.
1645-
# Sanity check: If we got a request object, we should *not* have
1645+
# Quick check: If we got a request object, we should *not* have
16461646
# gotten any keyword arguments that map to the request.
16471647
has_flattened_params = any([parent])
16481648
if request is not None and has_flattened_params:
@@ -1726,7 +1726,7 @@ def update_reservation(
17261726
17271727
"""
17281728
# Create or coerce a protobuf request object.
1729-
# Sanity check: If we got a request object, we should *not* have
1729+
# Quick check: If we got a request object, we should *not* have
17301730
# gotten any keyword arguments that map to the request.
17311731
has_flattened_params = any([reservation, update_mask])
17321732
if request is not None and has_flattened_params:
@@ -1795,7 +1795,7 @@ def delete_reservation(
17951795
sent along with the request as metadata.
17961796
"""
17971797
# Create or coerce a protobuf request object.
1798-
# Sanity check: If we got a request object, we should *not* have
1798+
# Quick check: If we got a request object, we should *not* have
17991799
# gotten any keyword arguments that map to the request.
18001800
has_flattened_params = any([name])
18011801
if request is not None and has_flattened_params:
@@ -1868,7 +1868,7 @@ def list_reservation_topics(
18681868
18691869
"""
18701870
# Create or coerce a protobuf request object.
1871-
# Sanity check: If we got a request object, we should *not* have
1871+
# Quick check: If we got a request object, we should *not* have
18721872
# gotten any keyword arguments that map to the request.
18731873
has_flattened_params = any([name])
18741874
if request is not None and has_flattened_params:

google/cloud/pubsublite_v1/services/admin_service/transports/grpc.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,11 @@ def __init__(
165165
if not self._grpc_channel:
166166
self._grpc_channel = type(self).create_channel(
167167
self._host,
168+
# use the credentials which are saved
168169
credentials=self._credentials,
169-
credentials_file=credentials_file,
170+
# Set ``credentials_file`` to ``None`` here as
171+
# the credentials that we saved earlier should be used.
172+
credentials_file=None,
170173
scopes=self._scopes,
171174
ssl_credentials=self._ssl_channel_credentials,
172175
quota_project_id=quota_project_id,
@@ -239,7 +242,7 @@ def operations_client(self) -> operations_v1.OperationsClient:
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.OperationsClient(self.grpc_channel)
245248

google/cloud/pubsublite_v1/services/admin_service/transports/grpc_asyncio.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,11 @@ def __init__(
210210
if not self._grpc_channel:
211211
self._grpc_channel = type(self).create_channel(
212212
self._host,
213+
# use the credentials which are saved
213214
credentials=self._credentials,
214-
credentials_file=credentials_file,
215+
# Set ``credentials_file`` to ``None`` here as
216+
# the credentials that we saved earlier should be used.
217+
credentials_file=None,
215218
scopes=self._scopes,
216219
ssl_credentials=self._ssl_channel_credentials,
217220
quota_project_id=quota_project_id,
@@ -241,7 +244,7 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
241244
This property caches on the instance; repeated calls return the same
242245
client.
243246
"""
244-
# Sanity check: Only create a new client if we do not already have one.
247+
# Quick check: Only create a new client if we do not already have one.
245248
if self._operations_client is None:
246249
self._operations_client = operations_v1.OperationsAsyncClient(
247250
self.grpc_channel

google/cloud/pubsublite_v1/services/cursor_service/async_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ async def list_partition_cursors(
357357
358358
"""
359359
# Create or coerce a protobuf request object.
360-
# Sanity check: If we got a request object, we should *not* have
360+
# Quick check: If we got a request object, we should *not* have
361361
# gotten any keyword arguments that map to the request.
362362
has_flattened_params = any([parent])
363363
if request is not None and has_flattened_params:

google/cloud/pubsublite_v1/services/cursor_service/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ def list_partition_cursors(
526526
527527
"""
528528
# Create or coerce a protobuf request object.
529-
# Sanity check: If we got a request object, we should *not* have
529+
# Quick check: If we got a request object, we should *not* have
530530
# gotten any keyword arguments that map to the request.
531531
has_flattened_params = any([parent])
532532
if request is not None and has_flattened_params:

google/cloud/pubsublite_v1/services/cursor_service/transports/grpc.py

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

0 commit comments

Comments
 (0)