Skip to content

Commit 6dfc549

Browse files
chore: use gapic-generator-python 0.62.1 (#364)
- [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: googleapis/googleapis-gen@4fb761b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9
1 parent 636dc73 commit 6dfc549

File tree

22 files changed

+458
-61
lines changed

22 files changed

+458
-61
lines changed

packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ async def list_assets(
327327
328328
"""
329329
# Create or coerce a protobuf request object.
330-
# Sanity check: If we got a request object, we should *not* have
330+
# Quick check: If we got a request object, we should *not* have
331331
# gotten any keyword arguments that map to the request.
332332
has_flattened_params = any([parent])
333333
if request is not None and has_flattened_params:
@@ -489,7 +489,7 @@ async def create_feed(
489489
490490
"""
491491
# Create or coerce a protobuf request object.
492-
# Sanity check: If we got a request object, we should *not* have
492+
# Quick check: If we got a request object, we should *not* have
493493
# gotten any keyword arguments that map to the request.
494494
has_flattened_params = any([parent])
495495
if request is not None and has_flattened_params:
@@ -566,7 +566,7 @@ async def get_feed(
566566
567567
"""
568568
# Create or coerce a protobuf request object.
569-
# Sanity check: If we got a request object, we should *not* have
569+
# Quick check: If we got a request object, we should *not* have
570570
# gotten any keyword arguments that map to the request.
571571
has_flattened_params = any([name])
572572
if request is not None and has_flattened_params:
@@ -649,7 +649,7 @@ async def list_feeds(
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([parent])
655655
if request is not None and has_flattened_params:
@@ -737,7 +737,7 @@ async def update_feed(
737737
738738
"""
739739
# Create or coerce a protobuf request object.
740-
# Sanity check: If we got a request object, we should *not* have
740+
# Quick check: If we got a request object, we should *not* have
741741
# gotten any keyword arguments that map to the request.
742742
has_flattened_params = any([feed])
743743
if request is not None and has_flattened_params:
@@ -805,7 +805,7 @@ async def delete_feed(
805805
sent along with the request as metadata.
806806
"""
807807
# Create or coerce a protobuf request object.
808-
# Sanity check: If we got a request object, we should *not* have
808+
# Quick check: If we got a request object, we should *not* have
809809
# gotten any keyword arguments that map to the request.
810810
has_flattened_params = any([name])
811811
if request is not None and has_flattened_params:
@@ -977,7 +977,7 @@ async def search_all_resources(
977977
978978
"""
979979
# Create or coerce a protobuf request object.
980-
# Sanity check: If we got a request object, we should *not* have
980+
# Quick check: If we got a request object, we should *not* have
981981
# gotten any keyword arguments that map to the request.
982982
has_flattened_params = any([scope, query, asset_types])
983983
if request is not None and has_flattened_params:
@@ -1140,7 +1140,7 @@ async def search_all_iam_policies(
11401140
11411141
"""
11421142
# Create or coerce a protobuf request object.
1143-
# Sanity check: If we got a request object, we should *not* have
1143+
# Quick check: If we got a request object, we should *not* have
11441144
# gotten any keyword arguments that map to the request.
11451145
has_flattened_params = any([scope, query])
11461146
if request is not None and has_flattened_params:

packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ def list_assets(
574574
575575
"""
576576
# Create or coerce a protobuf request object.
577-
# Sanity check: If we got a request object, we should *not* have
577+
# Quick check: If we got a request object, we should *not* have
578578
# gotten any keyword arguments that map to the request.
579579
has_flattened_params = any([parent])
580580
if request is not None and has_flattened_params:
@@ -717,7 +717,7 @@ def create_feed(
717717
718718
"""
719719
# Create or coerce a protobuf request object.
720-
# Sanity check: If we got a request object, we should *not* have
720+
# Quick check: If we got a request object, we should *not* have
721721
# gotten any keyword arguments that map to the request.
722722
has_flattened_params = any([parent])
723723
if request is not None and has_flattened_params:
@@ -794,7 +794,7 @@ def get_feed(
794794
795795
"""
796796
# Create or coerce a protobuf request object.
797-
# Sanity check: If we got a request object, we should *not* have
797+
# Quick check: If we got a request object, we should *not* have
798798
# gotten any keyword arguments that map to the request.
799799
has_flattened_params = any([name])
800800
if request is not None and has_flattened_params:
@@ -867,7 +867,7 @@ def list_feeds(
867867
868868
"""
869869
# Create or coerce a protobuf request object.
870-
# Sanity check: If we got a request object, we should *not* have
870+
# Quick check: If we got a request object, we should *not* have
871871
# gotten any keyword arguments that map to the request.
872872
has_flattened_params = any([parent])
873873
if request is not None and has_flattened_params:
@@ -945,7 +945,7 @@ def update_feed(
945945
946946
"""
947947
# Create or coerce a protobuf request object.
948-
# Sanity check: If we got a request object, we should *not* have
948+
# Quick check: If we got a request object, we should *not* have
949949
# gotten any keyword arguments that map to the request.
950950
has_flattened_params = any([feed])
951951
if request is not None and has_flattened_params:
@@ -1013,7 +1013,7 @@ def delete_feed(
10131013
sent along with the request as metadata.
10141014
"""
10151015
# Create or coerce a protobuf request object.
1016-
# Sanity check: If we got a request object, we should *not* have
1016+
# Quick check: If we got a request object, we should *not* have
10171017
# gotten any keyword arguments that map to the request.
10181018
has_flattened_params = any([name])
10191019
if request is not None and has_flattened_params:
@@ -1175,7 +1175,7 @@ def search_all_resources(
11751175
11761176
"""
11771177
# Create or coerce a protobuf request object.
1178-
# Sanity check: If we got a request object, we should *not* have
1178+
# Quick check: If we got a request object, we should *not* have
11791179
# gotten any keyword arguments that map to the request.
11801180
has_flattened_params = any([scope, query, asset_types])
11811181
if request is not None and has_flattened_params:
@@ -1329,7 +1329,7 @@ def search_all_iam_policies(
13291329
13301330
"""
13311331
# Create or coerce a protobuf request object.
1332-
# Sanity check: If we got a request object, we should *not* have
1332+
# Quick check: If we got a request object, we should *not* have
13331333
# gotten any keyword arguments that map to the request.
13341334
has_flattened_params = any([scope, query])
13351335
if request is not None and has_flattened_params:

packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py

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

packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py

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

packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ async def search_all_resources(
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([scope, query, asset_types])
267267
if request is not None and has_flattened_params:
@@ -376,7 +376,7 @@ async def search_all_iam_policies(
376376
377377
"""
378378
# Create or coerce a protobuf request object.
379-
# Sanity check: If we got a request object, we should *not* have
379+
# Quick check: If we got a request object, we should *not* have
380380
# gotten any keyword arguments that map to the request.
381381
has_flattened_params = any([scope, query])
382382
if request is not None and has_flattened_params:

packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ def search_all_resources(
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([scope, query, asset_types])
452452
if request is not None and has_flattened_params:
@@ -551,7 +551,7 @@ def search_all_iam_policies(
551551
552552
"""
553553
# Create or coerce a protobuf request object.
554-
# Sanity check: If we got a request object, we should *not* have
554+
# Quick check: If we got a request object, we should *not* have
555555
# gotten any keyword arguments that map to the request.
556556
has_flattened_params = any([scope, query])
557557
if request is not None and has_flattened_params:

packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,11 @@ def __init__(
158158
if not self._grpc_channel:
159159
self._grpc_channel = type(self).create_channel(
160160
self._host,
161+
# use the credentials which are saved
161162
credentials=self._credentials,
162-
credentials_file=credentials_file,
163+
# Set ``credentials_file`` to ``None`` here as
164+
# the credentials that we saved earlier should be used.
165+
credentials_file=None,
163166
scopes=self._scopes,
164167
ssl_credentials=self._ssl_channel_credentials,
165168
quota_project_id=quota_project_id,

packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,11 @@ def __init__(
203203
if not self._grpc_channel:
204204
self._grpc_channel = type(self).create_channel(
205205
self._host,
206+
# use the credentials which are saved
206207
credentials=self._credentials,
207-
credentials_file=credentials_file,
208+
# Set ``credentials_file`` to ``None`` here as
209+
# the credentials that we saved earlier should be used.
210+
credentials_file=None,
208211
scopes=self._scopes,
209212
ssl_credentials=self._ssl_channel_credentials,
210213
quota_project_id=quota_project_id,

packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/assets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class StandardResourceMetadata(proto.Message):
5252
attributes is subject to change. For example:
5353
project id, DNS name etc.
5454
location (str):
55-
Location can be "global", regional like "us-
56-
ast1", or zonal like "us-west1-b".
55+
Location can be "global", regional like
56+
"us-east1", or zonal like "us-west1-b".
5757
labels (Sequence[google.cloud.asset_v1p1beta1.types.StandardResourceMetadata.LabelsEntry]):
5858
Labels associated with this resource. See `Labelling and
5959
grouping GCP

packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ async def create_feed(
245245
246246
"""
247247
# Create or coerce a protobuf request object.
248-
# Sanity check: If we got a request object, we should *not* have
248+
# Quick check: If we got a request object, we should *not* have
249249
# gotten any keyword arguments that map to the request.
250250
has_flattened_params = any([parent])
251251
if request is not None and has_flattened_params:
@@ -322,7 +322,7 @@ async def get_feed(
322322
323323
"""
324324
# Create or coerce a protobuf request object.
325-
# Sanity check: If we got a request object, we should *not* have
325+
# Quick check: If we got a request object, we should *not* have
326326
# gotten any keyword arguments that map to the request.
327327
has_flattened_params = any([name])
328328
if request is not None and has_flattened_params:
@@ -405,7 +405,7 @@ async def list_feeds(
405405
406406
"""
407407
# Create or coerce a protobuf request object.
408-
# Sanity check: If we got a request object, we should *not* have
408+
# Quick check: If we got a request object, we should *not* have
409409
# gotten any keyword arguments that map to the request.
410410
has_flattened_params = any([parent])
411411
if request is not None and has_flattened_params:
@@ -493,7 +493,7 @@ async def update_feed(
493493
494494
"""
495495
# Create or coerce a protobuf request object.
496-
# Sanity check: If we got a request object, we should *not* have
496+
# Quick check: If we got a request object, we should *not* have
497497
# gotten any keyword arguments that map to the request.
498498
has_flattened_params = any([feed])
499499
if request is not None and has_flattened_params:
@@ -561,7 +561,7 @@ async def delete_feed(
561561
sent along with the request as metadata.
562562
"""
563563
# Create or coerce a protobuf request object.
564-
# Sanity check: If we got a request object, we should *not* have
564+
# Quick check: If we got a request object, we should *not* have
565565
# gotten any keyword arguments that map to the request.
566566
has_flattened_params = any([name])
567567
if request is not None and has_flattened_params:

0 commit comments

Comments
 (0)