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

Commit 9bd690d

Browse files
chore: use gapic-generator-python 0.62.1 (#38)
- [ ] 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 aaa957f commit 9bd690d

File tree

6 files changed

+116
-46
lines changed

6 files changed

+116
-46
lines changed

google/cloud/deploy_v1/services/cloud_deploy/async_client.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ async def list_delivery_pipelines(
261261
262262
"""
263263
# Create or coerce a protobuf request object.
264-
# Sanity check: If we got a request object, we should *not* have
264+
# Quick check: If we got a request object, we should *not* have
265265
# gotten any keyword arguments that map to the request.
266266
has_flattened_params = any([parent])
267267
if request is not None and has_flattened_params:
@@ -351,7 +351,7 @@ async def get_delivery_pipeline(
351351
352352
"""
353353
# Create or coerce a protobuf request object.
354-
# Sanity check: If we got a request object, we should *not* have
354+
# Quick check: If we got a request object, we should *not* have
355355
# gotten any keyword arguments that map to the request.
356356
has_flattened_params = any([name])
357357
if request is not None and has_flattened_params:
@@ -452,7 +452,7 @@ async def create_delivery_pipeline(
452452
453453
"""
454454
# Create or coerce a protobuf request object.
455-
# Sanity check: If we got a request object, we should *not* have
455+
# Quick check: If we got a request object, we should *not* have
456456
# gotten any keyword arguments that map to the request.
457457
has_flattened_params = any([parent, delivery_pipeline, delivery_pipeline_id])
458458
if request is not None and has_flattened_params:
@@ -553,7 +553,7 @@ async def update_delivery_pipeline(
553553
554554
"""
555555
# Create or coerce a protobuf request object.
556-
# Sanity check: If we got a request object, we should *not* have
556+
# Quick check: If we got a request object, we should *not* have
557557
# gotten any keyword arguments that map to the request.
558558
has_flattened_params = any([delivery_pipeline, update_mask])
559559
if request is not None and has_flattened_params:
@@ -650,7 +650,7 @@ async def delete_delivery_pipeline(
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([name])
656656
if request is not None and has_flattened_params:
@@ -732,7 +732,7 @@ async def list_targets(
732732
733733
"""
734734
# Create or coerce a protobuf request object.
735-
# Sanity check: If we got a request object, we should *not* have
735+
# Quick check: If we got a request object, we should *not* have
736736
# gotten any keyword arguments that map to the request.
737737
has_flattened_params = any([parent])
738738
if request is not None and has_flattened_params:
@@ -819,7 +819,7 @@ async def get_target(
819819
820820
"""
821821
# Create or coerce a protobuf request object.
822-
# Sanity check: If we got a request object, we should *not* have
822+
# Quick check: If we got a request object, we should *not* have
823823
# gotten any keyword arguments that map to the request.
824824
has_flattened_params = any([name])
825825
if request is not None and has_flattened_params:
@@ -918,7 +918,7 @@ async def create_target(
918918
919919
"""
920920
# Create or coerce a protobuf request object.
921-
# Sanity check: If we got a request object, we should *not* have
921+
# Quick check: If we got a request object, we should *not* have
922922
# gotten any keyword arguments that map to the request.
923923
has_flattened_params = any([parent, target, target_id])
924924
if request is not None and has_flattened_params:
@@ -1017,7 +1017,7 @@ async def update_target(
10171017
10181018
"""
10191019
# Create or coerce a protobuf request object.
1020-
# Sanity check: If we got a request object, we should *not* have
1020+
# Quick check: If we got a request object, we should *not* have
10211021
# gotten any keyword arguments that map to the request.
10221022
has_flattened_params = any([target, update_mask])
10231023
if request is not None and has_flattened_params:
@@ -1114,7 +1114,7 @@ async def delete_target(
11141114
11151115
"""
11161116
# Create or coerce a protobuf request object.
1117-
# Sanity check: If we got a request object, we should *not* have
1117+
# Quick check: If we got a request object, we should *not* have
11181118
# gotten any keyword arguments that map to the request.
11191119
has_flattened_params = any([name])
11201120
if request is not None and has_flattened_params:
@@ -1195,7 +1195,7 @@ async def list_releases(
11951195
11961196
"""
11971197
# Create or coerce a protobuf request object.
1198-
# Sanity check: If we got a request object, we should *not* have
1198+
# Quick check: If we got a request object, we should *not* have
11991199
# gotten any keyword arguments that map to the request.
12001200
has_flattened_params = any([parent])
12011201
if request is not None and has_flattened_params:
@@ -1282,7 +1282,7 @@ async def get_release(
12821282
12831283
"""
12841284
# Create or coerce a protobuf request object.
1285-
# Sanity check: If we got a request object, we should *not* have
1285+
# Quick check: If we got a request object, we should *not* have
12861286
# gotten any keyword arguments that map to the request.
12871287
has_flattened_params = any([name])
12881288
if request is not None and has_flattened_params:
@@ -1382,7 +1382,7 @@ async def create_release(
13821382
13831383
"""
13841384
# Create or coerce a protobuf request object.
1385-
# Sanity check: If we got a request object, we should *not* have
1385+
# Quick check: If we got a request object, we should *not* have
13861386
# gotten any keyword arguments that map to the request.
13871387
has_flattened_params = any([parent, release, release_id])
13881388
if request is not None and has_flattened_params:
@@ -1465,7 +1465,7 @@ async def approve_rollout(
14651465
The response object from ApproveRollout.
14661466
"""
14671467
# Create or coerce a protobuf request object.
1468-
# Sanity check: If we got a request object, we should *not* have
1468+
# Quick check: If we got a request object, we should *not* have
14691469
# gotten any keyword arguments that map to the request.
14701470
has_flattened_params = any([name])
14711471
if request is not None and has_flattened_params:
@@ -1539,7 +1539,7 @@ async def list_rollouts(
15391539
15401540
"""
15411541
# Create or coerce a protobuf request object.
1542-
# Sanity check: If we got a request object, we should *not* have
1542+
# Quick check: If we got a request object, we should *not* have
15431543
# gotten any keyword arguments that map to the request.
15441544
has_flattened_params = any([parent])
15451545
if request is not None and has_flattened_params:
@@ -1627,7 +1627,7 @@ async def get_rollout(
16271627
16281628
"""
16291629
# Create or coerce a protobuf request object.
1630-
# Sanity check: If we got a request object, we should *not* have
1630+
# Quick check: If we got a request object, we should *not* have
16311631
# gotten any keyword arguments that map to the request.
16321632
has_flattened_params = any([name])
16331633
if request is not None and has_flattened_params:
@@ -1727,7 +1727,7 @@ async def create_rollout(
17271727
17281728
"""
17291729
# Create or coerce a protobuf request object.
1730-
# Sanity check: If we got a request object, we should *not* have
1730+
# Quick check: If we got a request object, we should *not* have
17311731
# gotten any keyword arguments that map to the request.
17321732
has_flattened_params = any([parent, rollout, rollout_id])
17331733
if request is not None and has_flattened_params:
@@ -1807,7 +1807,7 @@ async def get_config(
18071807
Service-wide configuration.
18081808
"""
18091809
# Create or coerce a protobuf request object.
1810-
# Sanity check: If we got a request object, we should *not* have
1810+
# Quick check: If we got a request object, we should *not* have
18111811
# gotten any keyword arguments that map to the request.
18121812
has_flattened_params = any([name])
18131813
if request is not None and has_flattened_params:

google/cloud/deploy_v1/services/cloud_deploy/client.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ def list_delivery_pipelines(
568568
569569
"""
570570
# Create or coerce a protobuf request object.
571-
# Sanity check: If we got a request object, we should *not* have
571+
# Quick check: If we got a request object, we should *not* have
572572
# gotten any keyword arguments that map to the request.
573573
has_flattened_params = any([parent])
574574
if request is not None and has_flattened_params:
@@ -649,7 +649,7 @@ def get_delivery_pipeline(
649649
650650
"""
651651
# Create or coerce a protobuf request object.
652-
# Sanity check: If we got a request object, we should *not* have
652+
# Quick check: If we got a request object, we should *not* have
653653
# gotten any keyword arguments that map to the request.
654654
has_flattened_params = any([name])
655655
if request is not None and has_flattened_params:
@@ -741,7 +741,7 @@ def create_delivery_pipeline(
741741
742742
"""
743743
# Create or coerce a protobuf request object.
744-
# Sanity check: If we got a request object, we should *not* have
744+
# Quick check: If we got a request object, we should *not* have
745745
# gotten any keyword arguments that map to the request.
746746
has_flattened_params = any([parent, delivery_pipeline, delivery_pipeline_id])
747747
if request is not None and has_flattened_params:
@@ -842,7 +842,7 @@ def update_delivery_pipeline(
842842
843843
"""
844844
# Create or coerce a protobuf request object.
845-
# Sanity check: If we got a request object, we should *not* have
845+
# Quick check: If we got a request object, we should *not* have
846846
# gotten any keyword arguments that map to the request.
847847
has_flattened_params = any([delivery_pipeline, update_mask])
848848
if request is not None and has_flattened_params:
@@ -939,7 +939,7 @@ def delete_delivery_pipeline(
939939
940940
"""
941941
# Create or coerce a protobuf request object.
942-
# Sanity check: If we got a request object, we should *not* have
942+
# Quick check: If we got a request object, we should *not* have
943943
# gotten any keyword arguments that map to the request.
944944
has_flattened_params = any([name])
945945
if request is not None and has_flattened_params:
@@ -1021,7 +1021,7 @@ def list_targets(
10211021
10221022
"""
10231023
# Create or coerce a protobuf request object.
1024-
# Sanity check: If we got a request object, we should *not* have
1024+
# Quick check: If we got a request object, we should *not* have
10251025
# gotten any keyword arguments that map to the request.
10261026
has_flattened_params = any([parent])
10271027
if request is not None and has_flattened_params:
@@ -1099,7 +1099,7 @@ def get_target(
10991099
11001100
"""
11011101
# Create or coerce a protobuf request object.
1102-
# Sanity check: If we got a request object, we should *not* have
1102+
# Quick check: If we got a request object, we should *not* have
11031103
# gotten any keyword arguments that map to the request.
11041104
has_flattened_params = any([name])
11051105
if request is not None and has_flattened_params:
@@ -1189,7 +1189,7 @@ def create_target(
11891189
11901190
"""
11911191
# Create or coerce a protobuf request object.
1192-
# Sanity check: If we got a request object, we should *not* have
1192+
# Quick check: If we got a request object, we should *not* have
11931193
# gotten any keyword arguments that map to the request.
11941194
has_flattened_params = any([parent, target, target_id])
11951195
if request is not None and has_flattened_params:
@@ -1288,7 +1288,7 @@ def update_target(
12881288
12891289
"""
12901290
# Create or coerce a protobuf request object.
1291-
# Sanity check: If we got a request object, we should *not* have
1291+
# Quick check: If we got a request object, we should *not* have
12921292
# gotten any keyword arguments that map to the request.
12931293
has_flattened_params = any([target, update_mask])
12941294
if request is not None and has_flattened_params:
@@ -1385,7 +1385,7 @@ def delete_target(
13851385
13861386
"""
13871387
# Create or coerce a protobuf request object.
1388-
# Sanity check: If we got a request object, we should *not* have
1388+
# Quick check: If we got a request object, we should *not* have
13891389
# gotten any keyword arguments that map to the request.
13901390
has_flattened_params = any([name])
13911391
if request is not None and has_flattened_params:
@@ -1466,7 +1466,7 @@ def list_releases(
14661466
14671467
"""
14681468
# Create or coerce a protobuf request object.
1469-
# Sanity check: If we got a request object, we should *not* have
1469+
# Quick check: If we got a request object, we should *not* have
14701470
# gotten any keyword arguments that map to the request.
14711471
has_flattened_params = any([parent])
14721472
if request is not None and has_flattened_params:
@@ -1544,7 +1544,7 @@ def get_release(
15441544
15451545
"""
15461546
# Create or coerce a protobuf request object.
1547-
# Sanity check: If we got a request object, we should *not* have
1547+
# Quick check: If we got a request object, we should *not* have
15481548
# gotten any keyword arguments that map to the request.
15491549
has_flattened_params = any([name])
15501550
if request is not None and has_flattened_params:
@@ -1635,7 +1635,7 @@ def create_release(
16351635
16361636
"""
16371637
# Create or coerce a protobuf request object.
1638-
# Sanity check: If we got a request object, we should *not* have
1638+
# Quick check: If we got a request object, we should *not* have
16391639
# gotten any keyword arguments that map to the request.
16401640
has_flattened_params = any([parent, release, release_id])
16411641
if request is not None and has_flattened_params:
@@ -1718,7 +1718,7 @@ def approve_rollout(
17181718
The response object from ApproveRollout.
17191719
"""
17201720
# Create or coerce a protobuf request object.
1721-
# Sanity check: If we got a request object, we should *not* have
1721+
# Quick check: If we got a request object, we should *not* have
17221722
# gotten any keyword arguments that map to the request.
17231723
has_flattened_params = any([name])
17241724
if request is not None and has_flattened_params:
@@ -1792,7 +1792,7 @@ def list_rollouts(
17921792
17931793
"""
17941794
# Create or coerce a protobuf request object.
1795-
# Sanity check: If we got a request object, we should *not* have
1795+
# Quick check: If we got a request object, we should *not* have
17961796
# gotten any keyword arguments that map to the request.
17971797
has_flattened_params = any([parent])
17981798
if request is not None and has_flattened_params:
@@ -1871,7 +1871,7 @@ def get_rollout(
18711871
18721872
"""
18731873
# Create or coerce a protobuf request object.
1874-
# Sanity check: If we got a request object, we should *not* have
1874+
# Quick check: If we got a request object, we should *not* have
18751875
# gotten any keyword arguments that map to the request.
18761876
has_flattened_params = any([name])
18771877
if request is not None and has_flattened_params:
@@ -1962,7 +1962,7 @@ def create_rollout(
19621962
19631963
"""
19641964
# Create or coerce a protobuf request object.
1965-
# Sanity check: If we got a request object, we should *not* have
1965+
# Quick check: If we got a request object, we should *not* have
19661966
# gotten any keyword arguments that map to the request.
19671967
has_flattened_params = any([parent, rollout, rollout_id])
19681968
if request is not None and has_flattened_params:
@@ -2042,7 +2042,7 @@ def get_config(
20422042
Service-wide configuration.
20432043
"""
20442044
# Create or coerce a protobuf request object.
2045-
# Sanity check: If we got a request object, we should *not* have
2045+
# Quick check: If we got a request object, we should *not* have
20462046
# gotten any keyword arguments that map to the request.
20472047
has_flattened_params = any([name])
20482048
if request is not None and has_flattened_params:

google/cloud/deploy_v1/services/cloud_deploy/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/deploy_v1/services/cloud_deploy/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/deploy_v1/types/cloud_deploy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -997,9 +997,9 @@ class BuildArtifact(proto.Message):
997997
Image name in Skaffold configuration.
998998
tag (str):
999999
Image tag to use. This will generally be the
1000-
full path to an image, such as "gcr.io/my-
1001-
project/busybox:1.2.3" or "gcr.io/my-
1002-
project/busybox@sha256:abc123".
1000+
full path to an image, such as
1001+
"gcr.io/my-project/busybox:1.2.3" or
1002+
"gcr.io/my-project/busybox@sha256:abc123".
10031003
"""
10041004

10051005
image = proto.Field(proto.STRING, number=3,)

0 commit comments

Comments
 (0)