Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
Type,
Union,
)
import uuid

from google.cloud.logging_v2 import gapic_version as package_version

Expand Down Expand Up @@ -2967,7 +2968,7 @@ async def sample_get_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3110,7 +3111,7 @@ async def sample_create_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3267,7 +3268,7 @@ async def sample_update_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3505,7 +3506,7 @@ async def sample_get_cmek_settings():
the Google Cloud organization.

See [Enabling CMEK for Log
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
for more information.

"""
Expand Down Expand Up @@ -3619,7 +3620,7 @@ async def sample_update_cmek_settings():
the Google Cloud organization.

See [Enabling CMEK for Log
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
for more information.

"""
Expand Down
11 changes: 6 additions & 5 deletions google/cloud/logging_v2/services/config_service_v2/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
Union,
cast,
)
import uuid
import warnings

from google.cloud.logging_v2 import gapic_version as package_version
Expand Down Expand Up @@ -3431,7 +3432,7 @@ def sample_get_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3571,7 +3572,7 @@ def sample_create_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3725,7 +3726,7 @@ def sample_update_exclusion():
chargeable logs. Note that exclusions on
organization-level and folder-level sinks don't apply
to child resources. Note also that you cannot modify
the \_Required sink or exclude logs from it.
the Required sink or exclude logs from it.

"""
# Create or coerce a protobuf request object.
Expand Down Expand Up @@ -3957,7 +3958,7 @@ def sample_get_cmek_settings():
the Google Cloud organization.

See [Enabling CMEK for Log
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
for more information.

"""
Expand Down Expand Up @@ -4069,7 +4070,7 @@ def sample_update_cmek_settings():
the Google Cloud organization.

See [Enabling CMEK for Log
Router](\ https://cloud.google.com/logging/docs/routing/managed-encryption)
Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
for more information.

"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ def __init__(
credentials identify the application to the service; if none
are specified, the client will attempt to ascertain the
credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is mutually exclusive with credentials.
This argument is mutually exclusive with credentials. This argument will be
removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A list of scopes.
quota_project_id (Optional[str]): An optional project to use for billing
and quota.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@ def __init__(
are specified, the client will attempt to ascertain the
credentials from the environment.
This argument is ignored if a ``channel`` instance is provided.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is ignored if a ``channel`` instance is provided.
This argument will be removed in the next major version of this library.
scopes (Optional(Sequence[str])): A list of scopes. This argument is
ignored if a ``channel`` instance is provided.
channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
Expand Down Expand Up @@ -290,9 +291,10 @@ def create_channel(
credentials identify this application to the service. If
none are specified, the client will attempt to ascertain
the credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is mutually exclusive with credentials.
This argument is mutually exclusive with credentials. This argument will be
removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
service. These are only used when credentials are not specified and
are passed to :func:`google.auth.default`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,9 @@ def create_channel(
credentials identify this application to the service. If
none are specified, the client will attempt to ascertain
the credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`. This argument will be
removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
service. These are only used when credentials are not specified and
are passed to :func:`google.auth.default`.
Expand Down Expand Up @@ -203,9 +204,10 @@ def __init__(
are specified, the client will attempt to ascertain the
credentials from the environment.
This argument is ignored if a ``channel`` instance is provided.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is ignored if a ``channel`` instance is provided.
This argument will be removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
service. These are only used when credentials are not specified and
are passed to :func:`google.auth.default`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
Type,
Union,
)
import uuid

from google.cloud.logging_v2 import gapic_version as package_version

Expand Down Expand Up @@ -339,10 +340,10 @@ async def sample_delete_log():
log_name (:class:`str`):
Required. The resource name of the log to delete:

- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``

``[LOG_ID]`` must be URL-encoded. For example,
``"projects/my-project-id/logs/syslog"``,
Expand Down Expand Up @@ -465,10 +466,10 @@ async def sample_write_log_entries():
to all log entries in ``entries`` that do not specify a
value for ``log_name``:

- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``

``[LOG_ID]`` must be URL-encoded. For example:

Expand Down Expand Up @@ -658,17 +659,17 @@ async def sample_list_log_entries():
Required. Names of one or more parent resources from
which to retrieve log entries:

- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``
- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``

May alternatively be one or more views:

- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``

Projects listed in the ``project_ids`` field are added
to this list. A maximum of 100 resources may be
Expand Down Expand Up @@ -918,10 +919,10 @@ async def sample_list_logs():
parent (:class:`str`):
Required. The resource name to list logs for:

- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``
- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``

This corresponds to the ``parent`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down
41 changes: 21 additions & 20 deletions google/cloud/logging_v2/services/logging_service_v2/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
Union,
cast,
)
import uuid
import warnings

from google.cloud.logging_v2 import gapic_version as package_version
Expand Down Expand Up @@ -754,10 +755,10 @@ def sample_delete_log():
log_name (str):
Required. The resource name of the log to delete:

- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``

``[LOG_ID]`` must be URL-encoded. For example,
``"projects/my-project-id/logs/syslog"``,
Expand Down Expand Up @@ -877,10 +878,10 @@ def sample_write_log_entries():
to all log entries in ``entries`` that do not specify a
value for ``log_name``:

- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``
- ``projects/[PROJECT_ID]/logs/[LOG_ID]``
- ``organizations/[ORGANIZATION_ID]/logs/[LOG_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]``
- ``folders/[FOLDER_ID]/logs/[LOG_ID]``

``[LOG_ID]`` must be URL-encoded. For example:

Expand Down Expand Up @@ -1066,17 +1067,17 @@ def sample_list_log_entries():
Required. Names of one or more parent resources from
which to retrieve log entries:

- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``
- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``

May alternatively be one or more views:

- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``projects/[PROJECT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``
- ``folders/[FOLDER_ID]/locations/[LOCATION_ID]/buckets/[BUCKET_ID]/views/[VIEW_ID]``

Projects listed in the ``project_ids`` field are added
to this list. A maximum of 100 resources may be
Expand Down Expand Up @@ -1323,10 +1324,10 @@ def sample_list_logs():
parent (str):
Required. The resource name to list logs for:

- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``
- ``projects/[PROJECT_ID]``
- ``organizations/[ORGANIZATION_ID]``
- ``billingAccounts/[BILLING_ACCOUNT_ID]``
- ``folders/[FOLDER_ID]``

This corresponds to the ``parent`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ def __init__(
credentials identify the application to the service; if none
are specified, the client will attempt to ascertain the
credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is mutually exclusive with credentials.
This argument is mutually exclusive with credentials. This argument will be
removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A list of scopes.
quota_project_id (Optional[str]): An optional project to use for billing
and quota.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ def __init__(
are specified, the client will attempt to ascertain the
credentials from the environment.
This argument is ignored if a ``channel`` instance is provided.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is ignored if a ``channel`` instance is provided.
This argument will be removed in the next major version of this library.
scopes (Optional(Sequence[str])): A list of scopes. This argument is
ignored if a ``channel`` instance is provided.
channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
Expand Down Expand Up @@ -288,9 +289,10 @@ def create_channel(
credentials identify this application to the service. If
none are specified, the client will attempt to ascertain
the credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
credentials_file (Optional[str]): Deprecated. A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is mutually exclusive with credentials.
This argument is mutually exclusive with credentials. This argument will be
removed in the next major version of this library.
scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
service. These are only used when credentials are not specified and
are passed to :func:`google.auth.default`.
Expand Down
Loading
Loading