Skip to content

Commit eb189bf

Browse files
chore: update Python generator version to 1.25.1 (#1003)
- [ ] Regenerate this pull request now. fix: Deprecate credentials_file argument chore: Update gapic-generator-python to 1.28.0 PiperOrigin-RevId: 816753840 Source-Link: googleapis/googleapis@d06cf27 Source-Link: googleapis/googleapis-gen@a524e73 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTUyNGU3MzEwODgyYmJiOTliZmUxMzk5YjE4YmVkMzI4OTc5MjExYyJ9 BEGIN_NESTED_COMMIT chore: Update gapic-generator-python to 1.26.2 PiperOrigin-RevId: 802200836 Source-Link: googleapis/googleapis@d300b15 Source-Link: googleapis/googleapis-gen@a1ff0ae Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTFmZjBhZTcyZGRjYjY4YTI1OTIxNWQ4Yzc3NjYxZTJjZGJiOWIwMiJ9 END_NESTED_COMMIT BEGIN_NESTED_COMMIT chore: update Python generator version to 1.25.1 PiperOrigin-RevId: 800535761 Source-Link: googleapis/googleapis@4cf1f99 Source-Link: googleapis/googleapis-gen@133d25b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTMzZDI1YjY4ZTcxMjExNmUxYzVkYzcxZmMzZWIzYzVlNzE3MDIyYSJ9 END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent a7a28d1 commit eb189bf

File tree

23 files changed

+152
-134
lines changed

23 files changed

+152
-134
lines changed

google/cloud/logging_v2/services/config_service_v2/async_client.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
Type,
2929
Union,
3030
)
31+
import uuid
3132

3233
from google.cloud.logging_v2 import gapic_version as package_version
3334

@@ -2967,7 +2968,7 @@ async def sample_get_exclusion():
29672968
chargeable logs. Note that exclusions on
29682969
organization-level and folder-level sinks don't apply
29692970
to child resources. Note also that you cannot modify
2970-
the \_Required sink or exclude logs from it.
2971+
the Required sink or exclude logs from it.
29712972
29722973
"""
29732974
# Create or coerce a protobuf request object.
@@ -3110,7 +3111,7 @@ async def sample_create_exclusion():
31103111
chargeable logs. Note that exclusions on
31113112
organization-level and folder-level sinks don't apply
31123113
to child resources. Note also that you cannot modify
3113-
the \_Required sink or exclude logs from it.
3114+
the Required sink or exclude logs from it.
31143115
31153116
"""
31163117
# Create or coerce a protobuf request object.
@@ -3267,7 +3268,7 @@ async def sample_update_exclusion():
32673268
chargeable logs. Note that exclusions on
32683269
organization-level and folder-level sinks don't apply
32693270
to child resources. Note also that you cannot modify
3270-
the \_Required sink or exclude logs from it.
3271+
the Required sink or exclude logs from it.
32713272
32723273
"""
32733274
# Create or coerce a protobuf request object.
@@ -3505,7 +3506,7 @@ async def sample_get_cmek_settings():
35053506
the Google Cloud organization.
35063507
35073508
See [Enabling CMEK for Log
3508-
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
3509+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
35093510
for more information.
35103511
35113512
"""
@@ -3619,7 +3620,7 @@ async def sample_update_cmek_settings():
36193620
the Google Cloud organization.
36203621
36213622
See [Enabling CMEK for Log
3622-
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
3623+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
36233624
for more information.
36243625
36253626
"""

google/cloud/logging_v2/services/config_service_v2/client.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
Union,
3333
cast,
3434
)
35+
import uuid
3536
import warnings
3637

3738
from google.cloud.logging_v2 import gapic_version as package_version
@@ -3431,7 +3432,7 @@ def sample_get_exclusion():
34313432
chargeable logs. Note that exclusions on
34323433
organization-level and folder-level sinks don't apply
34333434
to child resources. Note also that you cannot modify
3434-
the \_Required sink or exclude logs from it.
3435+
the Required sink or exclude logs from it.
34353436
34363437
"""
34373438
# Create or coerce a protobuf request object.
@@ -3571,7 +3572,7 @@ def sample_create_exclusion():
35713572
chargeable logs. Note that exclusions on
35723573
organization-level and folder-level sinks don't apply
35733574
to child resources. Note also that you cannot modify
3574-
the \_Required sink or exclude logs from it.
3575+
the Required sink or exclude logs from it.
35753576
35763577
"""
35773578
# Create or coerce a protobuf request object.
@@ -3725,7 +3726,7 @@ def sample_update_exclusion():
37253726
chargeable logs. Note that exclusions on
37263727
organization-level and folder-level sinks don't apply
37273728
to child resources. Note also that you cannot modify
3728-
the \_Required sink or exclude logs from it.
3729+
the Required sink or exclude logs from it.
37293730
37303731
"""
37313732
# Create or coerce a protobuf request object.
@@ -3957,7 +3958,7 @@ def sample_get_cmek_settings():
39573958
the Google Cloud organization.
39583959
39593960
See [Enabling CMEK for Log
3960-
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
3961+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
39613962
for more information.
39623963
39633964
"""
@@ -4069,7 +4070,7 @@ def sample_update_cmek_settings():
40694070
the Google Cloud organization.
40704071
40714072
See [Enabling CMEK for Log
4072-
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
4073+
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
40734074
for more information.
40744075
40754076
"""

google/cloud/logging_v2/services/config_service_v2/transports/base.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ def __init__(
7575
credentials identify the application to the service; if none
7676
are specified, the client will attempt to ascertain the
7777
credentials from the environment.
78-
credentials_file (Optional[str]): A file with credentials that can
78+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
7979
be loaded with :func:`google.auth.load_credentials_from_file`.
80-
This argument is mutually exclusive with credentials.
80+
This argument is mutually exclusive with credentials. This argument will be
81+
removed in the next major version of this library.
8182
scopes (Optional[Sequence[str]]): A list of scopes.
8283
quota_project_id (Optional[str]): An optional project to use for billing
8384
and quota.

google/cloud/logging_v2/services/config_service_v2/transports/grpc.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,10 @@ def __init__(
154154
are specified, the client will attempt to ascertain the
155155
credentials from the environment.
156156
This argument is ignored if a ``channel`` instance is provided.
157-
credentials_file (Optional[str]): A file with credentials that can
157+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
158158
be loaded with :func:`google.auth.load_credentials_from_file`.
159159
This argument is ignored if a ``channel`` instance is provided.
160+
This argument will be removed in the next major version of this library.
160161
scopes (Optional(Sequence[str])): A list of scopes. This argument is
161162
ignored if a ``channel`` instance is provided.
162163
channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
@@ -290,9 +291,10 @@ def create_channel(
290291
credentials identify this application to the service. If
291292
none are specified, the client will attempt to ascertain
292293
the credentials from the environment.
293-
credentials_file (Optional[str]): A file with credentials that can
294+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
294295
be loaded with :func:`google.auth.load_credentials_from_file`.
295-
This argument is mutually exclusive with credentials.
296+
This argument is mutually exclusive with credentials. This argument will be
297+
removed in the next major version of this library.
296298
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
297299
service. These are only used when credentials are not specified and
298300
are passed to :func:`google.auth.default`.

google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,9 @@ def create_channel(
151151
credentials identify this application to the service. If
152152
none are specified, the client will attempt to ascertain
153153
the credentials from the environment.
154-
credentials_file (Optional[str]): A file with credentials that can
155-
be loaded with :func:`google.auth.load_credentials_from_file`.
154+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
155+
be loaded with :func:`google.auth.load_credentials_from_file`. This argument will be
156+
removed in the next major version of this library.
156157
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
157158
service. These are only used when credentials are not specified and
158159
are passed to :func:`google.auth.default`.
@@ -203,9 +204,10 @@ def __init__(
203204
are specified, the client will attempt to ascertain the
204205
credentials from the environment.
205206
This argument is ignored if a ``channel`` instance is provided.
206-
credentials_file (Optional[str]): A file with credentials that can
207+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
207208
be loaded with :func:`google.auth.load_credentials_from_file`.
208209
This argument is ignored if a ``channel`` instance is provided.
210+
This argument will be removed in the next major version of this library.
209211
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
210212
service. These are only used when credentials are not specified and
211213
are passed to :func:`google.auth.default`.

google/cloud/logging_v2/services/logging_service_v2/async_client.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
Type,
3232
Union,
3333
)
34+
import uuid
3435

3536
from google.cloud.logging_v2 import gapic_version as package_version
3637

@@ -339,10 +340,10 @@ async def sample_delete_log():
339340
log_name (:class:`str`):
340341
Required. The resource name of the log to delete:
341342
342-
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
343-
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
344-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
345-
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
343+
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
344+
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
345+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
346+
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
346347
347348
``[LOG_ID]`` must be URL-encoded. For example,
348349
``"projects/my-project-id/logs/syslog"``,
@@ -465,10 +466,10 @@ async def sample_write_log_entries():
465466
to all log entries in ``entries`` that do not specify a
466467
value for ``log_name``:
467468
468-
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
469-
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
470-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
471-
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
469+
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
470+
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
471+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
472+
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
472473
473474
``[LOG_ID]`` must be URL-encoded. For example:
474475
@@ -658,17 +659,17 @@ async def sample_list_log_entries():
658659
Required. Names of one or more parent resources from
659660
which to retrieve log entries:
660661
661-
- ``projects/[PROJECT_ID]``
662-
- ``organizations/[ORGANIZATION_ID]``
663-
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
664-
- ``folders/[FOLDER_ID]``
662+
- ``projects/[PROJECT_ID]``
663+
- ``organizations/[ORGANIZATION_ID]``
664+
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
665+
- ``folders/[FOLDER_ID]``
665666
666667
May alternatively be one or more views:
667668
668-
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
669-
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
670-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
671-
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
669+
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
670+
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
671+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
672+
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
672673
673674
Projects listed in the ``project_ids`` field are added
674675
to this list. A maximum of 100 resources may be
@@ -918,10 +919,10 @@ async def sample_list_logs():
918919
parent (:class:`str`):
919920
Required. The resource name to list logs for:
920921
921-
- ``projects/[PROJECT_ID]``
922-
- ``organizations/[ORGANIZATION_ID]``
923-
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
924-
- ``folders/[FOLDER_ID]``
922+
- ``projects/[PROJECT_ID]``
923+
- ``organizations/[ORGANIZATION_ID]``
924+
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
925+
- ``folders/[FOLDER_ID]``
925926
926927
This corresponds to the ``parent`` field
927928
on the ``request`` instance; if ``request`` is provided, this

google/cloud/logging_v2/services/logging_service_v2/client.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
Union,
3535
cast,
3636
)
37+
import uuid
3738
import warnings
3839

3940
from google.cloud.logging_v2 import gapic_version as package_version
@@ -754,10 +755,10 @@ def sample_delete_log():
754755
log_name (str):
755756
Required. The resource name of the log to delete:
756757
757-
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
758-
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
759-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
760-
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
758+
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
759+
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
760+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
761+
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
761762
762763
``[LOG_ID]`` must be URL-encoded. For example,
763764
``"projects/my-project-id/logs/syslog"``,
@@ -877,10 +878,10 @@ def sample_write_log_entries():
877878
to all log entries in ``entries`` that do not specify a
878879
value for ``log_name``:
879880
880-
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
881-
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
882-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
883-
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
881+
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
882+
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
883+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
884+
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
884885
885886
``[LOG_ID]`` must be URL-encoded. For example:
886887
@@ -1066,17 +1067,17 @@ def sample_list_log_entries():
10661067
Required. Names of one or more parent resources from
10671068
which to retrieve log entries:
10681069
1069-
- ``projects/[PROJECT_ID]``
1070-
- ``organizations/[ORGANIZATION_ID]``
1071-
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
1072-
- ``folders/[FOLDER_ID]``
1070+
- ``projects/[PROJECT_ID]``
1071+
- ``organizations/[ORGANIZATION_ID]``
1072+
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
1073+
- ``folders/[FOLDER_ID]``
10731074
10741075
May alternatively be one or more views:
10751076
1076-
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1077-
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1078-
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1079-
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1077+
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1078+
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1079+
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
1080+
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
10801081
10811082
Projects listed in the ``project_ids`` field are added
10821083
to this list. A maximum of 100 resources may be
@@ -1323,10 +1324,10 @@ def sample_list_logs():
13231324
parent (str):
13241325
Required. The resource name to list logs for:
13251326
1326-
- ``projects/[PROJECT_ID]``
1327-
- ``organizations/[ORGANIZATION_ID]``
1328-
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
1329-
- ``folders/[FOLDER_ID]``
1327+
- ``projects/[PROJECT_ID]``
1328+
- ``organizations/[ORGANIZATION_ID]``
1329+
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
1330+
- ``folders/[FOLDER_ID]``
13301331
13311332
This corresponds to the ``parent`` field
13321333
on the ``request`` instance; if ``request`` is provided, this

google/cloud/logging_v2/services/logging_service_v2/transports/base.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ def __init__(
7575
credentials identify the application to the service; if none
7676
are specified, the client will attempt to ascertain the
7777
credentials from the environment.
78-
credentials_file (Optional[str]): A file with credentials that can
78+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
7979
be loaded with :func:`google.auth.load_credentials_from_file`.
80-
This argument is mutually exclusive with credentials.
80+
This argument is mutually exclusive with credentials. This argument will be
81+
removed in the next major version of this library.
8182
scopes (Optional[Sequence[str]]): A list of scopes.
8283
quota_project_id (Optional[str]): An optional project to use for billing
8384
and quota.

google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,10 @@ def __init__(
153153
are specified, the client will attempt to ascertain the
154154
credentials from the environment.
155155
This argument is ignored if a ``channel`` instance is provided.
156-
credentials_file (Optional[str]): A file with credentials that can
156+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
157157
be loaded with :func:`google.auth.load_credentials_from_file`.
158158
This argument is ignored if a ``channel`` instance is provided.
159+
This argument will be removed in the next major version of this library.
159160
scopes (Optional(Sequence[str])): A list of scopes. This argument is
160161
ignored if a ``channel`` instance is provided.
161162
channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
@@ -288,9 +289,10 @@ def create_channel(
288289
credentials identify this application to the service. If
289290
none are specified, the client will attempt to ascertain
290291
the credentials from the environment.
291-
credentials_file (Optional[str]): A file with credentials that can
292+
credentials_file (Optional[str]): Deprecated. A file with credentials that can
292293
be loaded with :func:`google.auth.load_credentials_from_file`.
293-
This argument is mutually exclusive with credentials.
294+
This argument is mutually exclusive with credentials. This argument will be
295+
removed in the next major version of this library.
294296
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
295297
service. These are only used when credentials are not specified and
296298
are passed to :func:`google.auth.default`.

0 commit comments

Comments
 (0)