Skip to content

Commit 7d9b827

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.62.1 (#478)
- [ ] 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 a7919f5 commit 7d9b827

File tree

16 files changed

+320
-67
lines changed

16 files changed

+320
-67
lines changed

‎packages/google-cloud-logging/google/cloud/logging_v2/services/config_service_v2/async_client.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ async def list_buckets(
263263
264264
"""
265265
# Create or coerce a protobuf request object.
266-
# Sanity check: If we got a request object, we should *not* have
266+
# Quick check: If we got a request object, we should *not* have
267267
# gotten any keyword arguments that map to the request.
268268
has_flattened_params = any([parent])
269269
if request is not None and has_flattened_params:
@@ -579,7 +579,7 @@ async def list_views(
579579
580580
"""
581581
# Create or coerce a protobuf request object.
582-
# Sanity check: If we got a request object, we should *not* have
582+
# Quick check: If we got a request object, we should *not* have
583583
# gotten any keyword arguments that map to the request.
584584
has_flattened_params = any([parent])
585585
if request is not None and has_flattened_params:
@@ -851,7 +851,7 @@ async def list_sinks(
851851
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([parent])
857857
if request is not None and has_flattened_params:
@@ -953,7 +953,7 @@ async def get_sink(
953953
954954
"""
955955
# Create or coerce a protobuf request object.
956-
# Sanity check: If we got a request object, we should *not* have
956+
# Quick check: If we got a request object, we should *not* have
957957
# gotten any keyword arguments that map to the request.
958958
has_flattened_params = any([sink_name])
959959
if request is not None and has_flattened_params:
@@ -1064,7 +1064,7 @@ async def create_sink(
10641064
10651065
"""
10661066
# Create or coerce a protobuf request object.
1067-
# Sanity check: If we got a request object, we should *not* have
1067+
# Quick check: If we got a request object, we should *not* have
10681068
# gotten any keyword arguments that map to the request.
10691069
has_flattened_params = any([parent, sink])
10701070
if request is not None and has_flattened_params:
@@ -1186,7 +1186,7 @@ async def update_sink(
11861186
11871187
"""
11881188
# Create or coerce a protobuf request object.
1189-
# Sanity check: If we got a request object, we should *not* have
1189+
# Quick check: If we got a request object, we should *not* have
11901190
# gotten any keyword arguments that map to the request.
11911191
has_flattened_params = any([sink_name, sink, update_mask])
11921192
if request is not None and has_flattened_params:
@@ -1277,7 +1277,7 @@ async def delete_sink(
12771277
sent along with the request as metadata.
12781278
"""
12791279
# Create or coerce a protobuf request object.
1280-
# Sanity check: If we got a request object, we should *not* have
1280+
# Quick check: If we got a request object, we should *not* have
12811281
# gotten any keyword arguments that map to the request.
12821282
has_flattened_params = any([sink_name])
12831283
if request is not None and has_flattened_params:
@@ -1368,7 +1368,7 @@ async def list_exclusions(
13681368
13691369
"""
13701370
# Create or coerce a protobuf request object.
1371-
# Sanity check: If we got a request object, we should *not* have
1371+
# Quick check: If we got a request object, we should *not* have
13721372
# gotten any keyword arguments that map to the request.
13731373
has_flattened_params = any([parent])
13741374
if request is not None and has_flattened_params:
@@ -1473,7 +1473,7 @@ async def get_exclusion(
14731473
14741474
"""
14751475
# Create or coerce a protobuf request object.
1476-
# Sanity check: If we got a request object, we should *not* have
1476+
# Quick check: If we got a request object, we should *not* have
14771477
# gotten any keyword arguments that map to the request.
14781478
has_flattened_params = any([name])
14791479
if request is not None and has_flattened_params:
@@ -1585,7 +1585,7 @@ async def create_exclusion(
15851585
15861586
"""
15871587
# Create or coerce a protobuf request object.
1588-
# Sanity check: If we got a request object, we should *not* have
1588+
# Quick check: If we got a request object, we should *not* have
15891589
# gotten any keyword arguments that map to the request.
15901590
has_flattened_params = any([parent, exclusion])
15911591
if request is not None and has_flattened_params:
@@ -1700,7 +1700,7 @@ async def update_exclusion(
17001700
17011701
"""
17021702
# Create or coerce a protobuf request object.
1703-
# Sanity check: If we got a request object, we should *not* have
1703+
# Quick check: If we got a request object, we should *not* have
17041704
# gotten any keyword arguments that map to the request.
17051705
has_flattened_params = any([name, exclusion, update_mask])
17061706
if request is not None and has_flattened_params:
@@ -1778,7 +1778,7 @@ async def delete_exclusion(
17781778
sent along with the request as metadata.
17791779
"""
17801780
# Create or coerce a protobuf request object.
1781-
# Sanity check: If we got a request object, we should *not* have
1781+
# Quick check: If we got a request object, we should *not* have
17821782
# gotten any keyword arguments that map to the request.
17831783
has_flattened_params = any([name])
17841784
if request is not None and has_flattened_params:
@@ -1847,8 +1847,8 @@ async def get_cmek_settings(
18471847
The request object. The parameters to
18481848
[GetCmekSettings][google.logging.v2.ConfigServiceV2.GetCmekSettings].
18491849
See [Enabling CMEK for Logs
1850-
Router](https://cloud.google.com/logging/docs/routing/managed-
1851-
encryption) for more information.
1850+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
1851+
for more information.
18521852
retry (google.api_core.retry.Retry): Designation of what errors, if any,
18531853
should be retried.
18541854
timeout (float): The timeout for this request.
@@ -1923,8 +1923,8 @@ async def update_cmek_settings(
19231923
The request object. The parameters to
19241924
[UpdateCmekSettings][google.logging.v2.ConfigServiceV2.UpdateCmekSettings].
19251925
See [Enabling CMEK for Logs
1926-
Router](https://cloud.google.com/logging/docs/routing/managed-
1927-
encryption) for more information.
1926+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
1927+
for more information.
19281928
retry (google.api_core.retry.Retry): Designation of what errors, if any,
19291929
should be retried.
19301930
timeout (float): The timeout for this request.

‎packages/google-cloud-logging/google/cloud/logging_v2/services/config_service_v2/client.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ def list_buckets(
499499
500500
"""
501501
# Create or coerce a protobuf request object.
502-
# Sanity check: If we got a request object, we should *not* have
502+
# Quick check: If we got a request object, we should *not* have
503503
# gotten any keyword arguments that map to the request.
504504
has_flattened_params = any([parent])
505505
if request is not None and has_flattened_params:
@@ -820,7 +820,7 @@ def list_views(
820820
821821
"""
822822
# Create or coerce a protobuf request object.
823-
# Sanity check: If we got a request object, we should *not* have
823+
# Quick check: If we got a request object, we should *not* have
824824
# gotten any keyword arguments that map to the request.
825825
has_flattened_params = any([parent])
826826
if request is not None and has_flattened_params:
@@ -1096,7 +1096,7 @@ def list_sinks(
10961096
10971097
"""
10981098
# Create or coerce a protobuf request object.
1099-
# Sanity check: If we got a request object, we should *not* have
1099+
# Quick check: If we got a request object, we should *not* have
11001100
# gotten any keyword arguments that map to the request.
11011101
has_flattened_params = any([parent])
11021102
if request is not None and has_flattened_params:
@@ -1187,7 +1187,7 @@ def get_sink(
11871187
11881188
"""
11891189
# Create or coerce a protobuf request object.
1190-
# Sanity check: If we got a request object, we should *not* have
1190+
# Quick check: If we got a request object, we should *not* have
11911191
# gotten any keyword arguments that map to the request.
11921192
has_flattened_params = any([sink_name])
11931193
if request is not None and has_flattened_params:
@@ -1287,7 +1287,7 @@ def create_sink(
12871287
12881288
"""
12891289
# Create or coerce a protobuf request object.
1290-
# Sanity check: If we got a request object, we should *not* have
1290+
# Quick check: If we got a request object, we should *not* have
12911291
# gotten any keyword arguments that map to the request.
12921292
has_flattened_params = any([parent, sink])
12931293
if request is not None and has_flattened_params:
@@ -1409,7 +1409,7 @@ def update_sink(
14091409
14101410
"""
14111411
# Create or coerce a protobuf request object.
1412-
# Sanity check: If we got a request object, we should *not* have
1412+
# Quick check: If we got a request object, we should *not* have
14131413
# gotten any keyword arguments that map to the request.
14141414
has_flattened_params = any([sink_name, sink, update_mask])
14151415
if request is not None and has_flattened_params:
@@ -1489,7 +1489,7 @@ def delete_sink(
14891489
sent along with the request as metadata.
14901490
"""
14911491
# Create or coerce a protobuf request object.
1492-
# Sanity check: If we got a request object, we should *not* have
1492+
# Quick check: If we got a request object, we should *not* have
14931493
# gotten any keyword arguments that map to the request.
14941494
has_flattened_params = any([sink_name])
14951495
if request is not None and has_flattened_params:
@@ -1569,7 +1569,7 @@ def list_exclusions(
15691569
15701570
"""
15711571
# Create or coerce a protobuf request object.
1572-
# Sanity check: If we got a request object, we should *not* have
1572+
# Quick check: If we got a request object, we should *not* have
15731573
# gotten any keyword arguments that map to the request.
15741574
has_flattened_params = any([parent])
15751575
if request is not None and has_flattened_params:
@@ -1663,7 +1663,7 @@ def get_exclusion(
16631663
16641664
"""
16651665
# Create or coerce a protobuf request object.
1666-
# Sanity check: If we got a request object, we should *not* have
1666+
# Quick check: If we got a request object, we should *not* have
16671667
# gotten any keyword arguments that map to the request.
16681668
has_flattened_params = any([name])
16691669
if request is not None and has_flattened_params:
@@ -1764,7 +1764,7 @@ def create_exclusion(
17641764
17651765
"""
17661766
# Create or coerce a protobuf request object.
1767-
# Sanity check: If we got a request object, we should *not* have
1767+
# Quick check: If we got a request object, we should *not* have
17681768
# gotten any keyword arguments that map to the request.
17691769
has_flattened_params = any([parent, exclusion])
17701770
if request is not None and has_flattened_params:
@@ -1879,7 +1879,7 @@ def update_exclusion(
18791879
18801880
"""
18811881
# Create or coerce a protobuf request object.
1882-
# Sanity check: If we got a request object, we should *not* have
1882+
# Quick check: If we got a request object, we should *not* have
18831883
# gotten any keyword arguments that map to the request.
18841884
has_flattened_params = any([name, exclusion, update_mask])
18851885
if request is not None and has_flattened_params:
@@ -1957,7 +1957,7 @@ def delete_exclusion(
19571957
sent along with the request as metadata.
19581958
"""
19591959
# Create or coerce a protobuf request object.
1960-
# Sanity check: If we got a request object, we should *not* have
1960+
# Quick check: If we got a request object, we should *not* have
19611961
# gotten any keyword arguments that map to the request.
19621962
has_flattened_params = any([name])
19631963
if request is not None and has_flattened_params:
@@ -2015,8 +2015,8 @@ def get_cmek_settings(
20152015
The request object. The parameters to
20162016
[GetCmekSettings][google.logging.v2.ConfigServiceV2.GetCmekSettings].
20172017
See [Enabling CMEK for Logs
2018-
Router](https://cloud.google.com/logging/docs/routing/managed-
2019-
encryption) for more information.
2018+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
2019+
for more information.
20202020
retry (google.api_core.retry.Retry): Designation of what errors, if any,
20212021
should be retried.
20222022
timeout (float): The timeout for this request.
@@ -2092,8 +2092,8 @@ def update_cmek_settings(
20922092
The request object. The parameters to
20932093
[UpdateCmekSettings][google.logging.v2.ConfigServiceV2.UpdateCmekSettings].
20942094
See [Enabling CMEK for Logs
2095-
Router](https://cloud.google.com/logging/docs/routing/managed-
2096-
encryption) for more information.
2095+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
2096+
for more information.
20972097
retry (google.api_core.retry.Retry): Designation of what errors, if any,
20982098
should be retried.
20992099
timeout (float): The timeout for this request.

‎packages/google-cloud-logging/google/cloud/logging_v2/services/config_service_v2/transports/grpc.py‎

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

‎packages/google-cloud-logging/google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py‎

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

‎packages/google-cloud-logging/google/cloud/logging_v2/services/logging_service_v2/async_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ async def delete_log(
258258
sent along with the request as metadata.
259259
"""
260260
# Create or coerce a protobuf request object.
261-
# Sanity check: If we got a request object, we should *not* have
261+
# Quick check: If we got a request object, we should *not* have
262262
# gotten any keyword arguments that map to the request.
263263
has_flattened_params = any([log_name])
264264
if request is not None and has_flattened_params:
@@ -426,7 +426,7 @@ async def write_log_entries(
426426
Result returned from WriteLogEntries.
427427
"""
428428
# Create or coerce a protobuf request object.
429-
# Sanity check: If we got a request object, we should *not* have
429+
# Quick check: If we got a request object, we should *not* have
430430
# gotten any keyword arguments that map to the request.
431431
has_flattened_params = any([log_name, resource, labels, entries])
432432
if request is not None and has_flattened_params:
@@ -558,7 +558,7 @@ async def list_log_entries(
558558
559559
"""
560560
# Create or coerce a protobuf request object.
561-
# Sanity check: If we got a request object, we should *not* have
561+
# Quick check: If we got a request object, we should *not* have
562562
# gotten any keyword arguments that map to the request.
563563
has_flattened_params = any([resource_names, filter, order_by])
564564
if request is not None and has_flattened_params:
@@ -717,7 +717,7 @@ async def list_logs(
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:

‎packages/google-cloud-logging/google/cloud/logging_v2/services/logging_service_v2/client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ def delete_log(
440440
sent along with the request as metadata.
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([log_name])
446446
if request is not None and has_flattened_params:
@@ -597,7 +597,7 @@ def write_log_entries(
597597
Result returned from WriteLogEntries.
598598
"""
599599
# Create or coerce a protobuf request object.
600-
# Sanity check: If we got a request object, we should *not* have
600+
# Quick check: If we got a request object, we should *not* have
601601
# gotten any keyword arguments that map to the request.
602602
has_flattened_params = any([log_name, resource, labels, entries])
603603
if request is not None and has_flattened_params:
@@ -717,7 +717,7 @@ def list_log_entries(
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([resource_names, filter, order_by])
723723
if request is not None and has_flattened_params:
@@ -857,7 +857,7 @@ def list_logs(
857857
858858
"""
859859
# Create or coerce a protobuf request object.
860-
# Sanity check: If we got a request object, we should *not* have
860+
# Quick check: If we got a request object, we should *not* have
861861
# gotten any keyword arguments that map to the request.
862862
has_flattened_params = any([parent])
863863
if request is not None and has_flattened_params:

‎packages/google-cloud-logging/google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py‎

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

‎packages/google-cloud-logging/google/cloud/logging_v2/services/logging_service_v2/transports/grpc_asyncio.py‎

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

0 commit comments

Comments
 (0)