From 8e84d42c42fb37d7b11eb17ee70619124f6cd338 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 13:05:57 -0500 Subject: [PATCH] chore: Update gapic-generator-python to v1.6.1 (#241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update to gapic-generator-python 1.5.0 feat: add support for `google.cloud..__version__` PiperOrigin-RevId: 484665853 Source-Link: https://github.com/googleapis/googleapis/commit/8eb249a19db926c2fbc4ecf1dc09c0e521a88b22 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8aa327b5f478865fc3fd91e3c2768e54e26ad44 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhhYTMyN2I1ZjQ3ODg2NWZjM2ZkOTFlM2MyNzY4ZTU0ZTI2YWQ0NCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update version in gapic_version.py * add .release-please-manifest.json with correct version * add owlbot.py to exclude generated gapic_version.py * set manifest to true in .github/release-please.yml * add release-please-config.json * chore: Update to gapic-generator-python 1.6.0 feat(python): Add typing to proto.Message based class attributes feat(python): Snippetgen handling of repeated enum field PiperOrigin-RevId: 487326846 Source-Link: https://github.com/googleapis/googleapis/commit/da380c77bb87ba0f752baf07605dd1db30e1f7e1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/61ef5762ee6731a0cbbfea22fd0eecee51ab1c8e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjFlZjU3NjJlZTY3MzFhMGNiYmZlYTIyZmQwZWVjZWU1MWFiMWM4ZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: new APIs added to reflect updates to the filestore service - Add ENTERPRISE Tier - Add snapshot APIs: RevertInstance, ListSnapshots, CreateSnapshot, DeleteSnapshot, UpdateSnapshot - Add multi-share APIs: ListShares, GetShare, CreateShare, DeleteShare, UpdateShare - Add ConnectMode to NetworkConfig (for Private Service Access support) - New status codes (SUSPENDED/SUSPENDING, REVERTING/RESUMING) - Add SuspensionReason (for KMS related suspension) - Add new fields to Instance information: max_capacity_gb, capacity_step_size_gb, max_share_count, capacity_gb, multi_share_enabled PiperOrigin-RevId: 487492758 Source-Link: https://github.com/googleapis/googleapis/commit/5be5981f50322cf0c7388595e0f31ac5d0693469 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ab0e217f560cc2c1afc11441c2eab6b6950efd2b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWIwZTIxN2Y1NjBjYzJjMWFmYzExNDQxYzJlYWI2YjY5NTBlZmQyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update path to snippet metadata json * chore: Update gapic-generator-python to v1.6.1 PiperOrigin-RevId: 488036204 Source-Link: https://github.com/googleapis/googleapis/commit/08f275f5c1c0d99056e1cb68376323414459ee19 Source-Link: https://github.com/googleapis/googleapis-gen/commit/555c0945e60649e38739ae64bc45719cdf72178f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTU1YzA5NDVlNjA2NDllMzg3MzlhZTY0YmM0NTcxOWNkZjcyMTc4ZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .github/release-please.yml | 1 + .release-please-manifest.json | 3 + docs/servicedirectory_v1/types.rst | 1 - docs/servicedirectory_v1beta1/types.rst | 1 - google/cloud/servicedirectory/__init__.py | 4 + .../cloud/servicedirectory/gapic_version.py | 16 ++ google/cloud/servicedirectory_v1/__init__.py | 4 + .../services/lookup_service/async_client.py | 22 +- .../services/lookup_service/client.py | 26 ++- .../lookup_service/transports/base.py | 2 +- .../lookup_service/transports/grpc.py | 20 +- .../lookup_service/transports/grpc_asyncio.py | 16 +- .../registration_service/async_client.py | 194 ++++++++++-------- .../services/registration_service/client.py | 164 +++++++++------ .../registration_service/transports/base.py | 2 +- .../registration_service/transports/grpc.py | 20 +- .../transports/grpc_asyncio.py | 16 +- .../servicedirectory_v1/types/endpoint.py | 12 +- .../types/lookup_service.py | 10 +- .../servicedirectory_v1/types/namespace.py | 8 +- .../types/registration_service.py | 92 +++++---- .../servicedirectory_v1/types/service.py | 12 +- .../servicedirectory_v1beta1/__init__.py | 4 + .../services/lookup_service/async_client.py | 22 +- .../services/lookup_service/client.py | 26 ++- .../lookup_service/transports/base.py | 2 +- .../lookup_service/transports/grpc.py | 20 +- .../lookup_service/transports/grpc_asyncio.py | 16 +- .../registration_service/async_client.py | 194 ++++++++++-------- .../services/registration_service/client.py | 164 +++++++++------ .../registration_service/transports/base.py | 2 +- .../registration_service/transports/grpc.py | 20 +- .../transports/grpc_asyncio.py | 16 +- .../types/endpoint.py | 18 +- .../types/lookup_service.py | 10 +- .../types/namespace.py | 12 +- .../types/registration_service.py | 92 +++++---- .../servicedirectory_v1beta1/types/service.py | 16 +- owlbot.py | 56 +++++ release-please-config.json | 28 +++ ...ata_google.cloud.servicedirectory.v1.json} | 3 +- ...oogle.cloud.servicedirectory.v1beta1.json} | 3 +- setup.py | 71 +++++-- testing/constraints-3.10.txt | 7 + testing/constraints-3.11.txt | 7 + testing/constraints-3.7.txt | 11 +- testing/constraints-3.8.txt | 7 + testing/constraints-3.9.txt | 7 + 48 files changed, 925 insertions(+), 555 deletions(-) create mode 100644 .release-please-manifest.json create mode 100644 google/cloud/servicedirectory/gapic_version.py create mode 100644 owlbot.py create mode 100644 release-please-config.json rename samples/generated_samples/{snippet_metadata_servicedirectory_v1.json => snippet_metadata_google.cloud.servicedirectory.v1.json} (99%) rename samples/generated_samples/{snippet_metadata_servicedirectory_v1beta1.json => snippet_metadata_google.cloud.servicedirectory.v1beta1.json} (99%) diff --git a/.github/release-please.yml b/.github/release-please.yml index 6def37a8..e9a4f008 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,5 +1,6 @@ releaseType: python handleGHRelease: true +manifest: true # NOTE: this section is generated by synthtool.languages.python # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py branches: diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 00000000..1adaf630 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.5.3" +} diff --git a/docs/servicedirectory_v1/types.rst b/docs/servicedirectory_v1/types.rst index 376220b5..59317d4b 100644 --- a/docs/servicedirectory_v1/types.rst +++ b/docs/servicedirectory_v1/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Servicedirectory v1 API .. automodule:: google.cloud.servicedirectory_v1.types :members: - :undoc-members: :show-inheritance: diff --git a/docs/servicedirectory_v1beta1/types.rst b/docs/servicedirectory_v1beta1/types.rst index 1a2daef4..f73d42df 100644 --- a/docs/servicedirectory_v1beta1/types.rst +++ b/docs/servicedirectory_v1beta1/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Servicedirectory v1beta1 API .. automodule:: google.cloud.servicedirectory_v1beta1.types :members: - :undoc-members: :show-inheritance: diff --git a/google/cloud/servicedirectory/__init__.py b/google/cloud/servicedirectory/__init__.py index 99da5870..db7ad639 100644 --- a/google/cloud/servicedirectory/__init__.py +++ b/google/cloud/servicedirectory/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.servicedirectory import gapic_version as package_version + +__version__ = package_version.__version__ + from google.cloud.servicedirectory_v1.services.lookup_service.async_client import ( LookupServiceAsyncClient, diff --git a/google/cloud/servicedirectory/gapic_version.py b/google/cloud/servicedirectory/gapic_version.py new file mode 100644 index 00000000..94373404 --- /dev/null +++ b/google/cloud/servicedirectory/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "1.5.3" # {x-release-please-version} diff --git a/google/cloud/servicedirectory_v1/__init__.py b/google/cloud/servicedirectory_v1/__init__.py index c938c5b6..8b311263 100644 --- a/google/cloud/servicedirectory_v1/__init__.py +++ b/google/cloud/servicedirectory_v1/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.servicedirectory import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.lookup_service import LookupServiceAsyncClient, LookupServiceClient from .services.registration_service import ( diff --git a/google/cloud/servicedirectory_v1/services/lookup_service/async_client.py b/google/cloud/servicedirectory_v1/services/lookup_service/async_client.py index 0aab6952..ea36e26b 100644 --- a/google/cloud/servicedirectory_v1/services/lookup_service/async_client.py +++ b/google/cloud/servicedirectory_v1/services/lookup_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -160,9 +170,9 @@ def transport(self) -> LookupServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, LookupServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the lookup service client. @@ -206,10 +216,10 @@ def __init__( async def resolve_service( self, - request: Union[lookup_service.ResolveServiceRequest, dict] = None, + request: Optional[Union[lookup_service.ResolveServiceRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> lookup_service.ResolveServiceResponse: r"""Returns a [service][google.cloud.servicedirectory.v1.Service] @@ -243,7 +253,7 @@ async def sample_resolve_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.ResolveServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.ResolveServiceRequest, dict]]): The request object. The request message for [LookupService.ResolveService][google.cloud.servicedirectory.v1.LookupService.ResolveService]. Looks up a service by its name, returns the service and diff --git a/google/cloud/servicedirectory_v1/services/lookup_service/client.py b/google/cloud/servicedirectory_v1/services/lookup_service/client.py index 499fd7ea..8359ef40 100644 --- a/google/cloud/servicedirectory_v1/services/lookup_service/client.py +++ b/google/cloud/servicedirectory_v1/services/lookup_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -55,7 +66,7 @@ class LookupServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[LookupServiceTransport]: """Returns an appropriate transport class. @@ -358,8 +369,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, LookupServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, LookupServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the lookup service client. @@ -373,7 +384,7 @@ def __init__( transport (Union[str, LookupServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -403,6 +414,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -455,10 +467,10 @@ def __init__( def resolve_service( self, - request: Union[lookup_service.ResolveServiceRequest, dict] = None, + request: Optional[Union[lookup_service.ResolveServiceRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> lookup_service.ResolveServiceResponse: r"""Returns a [service][google.cloud.servicedirectory.v1.Service] diff --git a/google/cloud/servicedirectory_v1/services/lookup_service/transports/base.py b/google/cloud/servicedirectory_v1/services/lookup_service/transports/base.py index 42618133..9a33f0fa 100644 --- a/google/cloud/servicedirectory_v1/services/lookup_service/transports/base.py +++ b/google/cloud/servicedirectory_v1/services/lookup_service/transports/base.py @@ -48,7 +48,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc.py b/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc.py index 6f397066..965a4db1 100644 --- a/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc.py +++ b/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc.py @@ -46,14 +46,14 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -180,8 +180,8 @@ def __init__( def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc_asyncio.py b/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc_asyncio.py index 33c1c052..394fe908 100644 --- a/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc_asyncio.py +++ b/google/cloud/servicedirectory_v1/services/lookup_service/transports/grpc_asyncio.py @@ -48,7 +48,7 @@ class LookupServiceGrpcAsyncIOTransport(LookupServiceTransport): def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -91,15 +91,15 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1/services/registration_service/async_client.py b/google/cloud/servicedirectory_v1/services/registration_service/async_client.py index 23661550..2c2c141e 100644 --- a/google/cloud/servicedirectory_v1/services/registration_service/async_client.py +++ b/google/cloud/servicedirectory_v1/services/registration_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -189,9 +199,9 @@ def transport(self) -> RegistrationServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, RegistrationServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the registration service client. @@ -235,13 +245,15 @@ def __init__( async def create_namespace( self, - request: Union[registration_service.CreateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateNamespaceRequest, dict] + ] = None, *, - parent: str = None, - namespace: gcs_namespace.Namespace = None, - namespace_id: str = None, + parent: Optional[str] = None, + namespace: Optional[gcs_namespace.Namespace] = None, + namespace_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Creates a namespace, and returns the new Namespace. @@ -274,7 +286,7 @@ async def sample_create_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.CreateNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.CreateNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.CreateNamespace][google.cloud.servicedirectory.v1.RegistrationService.CreateNamespace]. parent (:class:`str`): @@ -367,11 +379,13 @@ async def sample_create_namespace(): async def list_namespaces( self, - request: Union[registration_service.ListNamespacesRequest, dict] = None, + request: Optional[ + Union[registration_service.ListNamespacesRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListNamespacesAsyncPager: r"""Lists all namespaces. @@ -404,7 +418,7 @@ async def sample_list_namespaces(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.ListNamespacesRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.ListNamespacesRequest, dict]]): The request object. The request message for [RegistrationService.ListNamespaces][google.cloud.servicedirectory.v1.RegistrationService.ListNamespaces]. parent (:class:`str`): @@ -483,11 +497,11 @@ async def sample_list_namespaces(): async def get_namespace( self, - request: Union[registration_service.GetNamespaceRequest, dict] = None, + request: Optional[Union[registration_service.GetNamespaceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> namespace.Namespace: r"""Gets a namespace. @@ -519,7 +533,7 @@ async def sample_get_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.GetNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.GetNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.GetNamespace][google.cloud.servicedirectory.v1.RegistrationService.GetNamespace]. name (:class:`str`): @@ -587,12 +601,14 @@ async def sample_get_namespace(): async def update_namespace( self, - request: Union[registration_service.UpdateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateNamespaceRequest, dict] + ] = None, *, - namespace: gcs_namespace.Namespace = None, - update_mask: field_mask_pb2.FieldMask = None, + namespace: Optional[gcs_namespace.Namespace] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Updates a namespace. @@ -623,7 +639,7 @@ async def sample_update_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.UpdateNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.UpdateNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.UpdateNamespace][google.cloud.servicedirectory.v1.RegistrationService.UpdateNamespace]. namespace (:class:`google.cloud.servicedirectory_v1.types.Namespace`): @@ -700,11 +716,13 @@ async def sample_update_namespace(): async def delete_namespace( self, - request: Union[registration_service.DeleteNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteNamespaceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a namespace. This also deletes all services @@ -734,7 +752,7 @@ async def sample_delete_namespace(): await client.delete_namespace(request=request) Args: - request (Union[google.cloud.servicedirectory_v1.types.DeleteNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.DeleteNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.DeleteNamespace][google.cloud.servicedirectory.v1.RegistrationService.DeleteNamespace]. name (:class:`str`): @@ -791,13 +809,15 @@ async def sample_delete_namespace(): async def create_service( self, - request: Union[registration_service.CreateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateServiceRequest, dict] + ] = None, *, - parent: str = None, - service: gcs_service.Service = None, - service_id: str = None, + parent: Optional[str] = None, + service: Optional[gcs_service.Service] = None, + service_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Creates a service, and returns the new Service. @@ -830,7 +850,7 @@ async def sample_create_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.CreateServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.CreateServiceRequest, dict]]): The request object. The request message for [RegistrationService.CreateService][google.cloud.servicedirectory.v1.RegistrationService.CreateService]. parent (:class:`str`): @@ -922,11 +942,11 @@ async def sample_create_service(): async def list_services( self, - request: Union[registration_service.ListServicesRequest, dict] = None, + request: Optional[Union[registration_service.ListServicesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListServicesAsyncPager: r"""Lists all services belonging to a namespace. @@ -959,7 +979,7 @@ async def sample_list_services(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.ListServicesRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.ListServicesRequest, dict]]): The request object. The request message for [RegistrationService.ListServices][google.cloud.servicedirectory.v1.RegistrationService.ListServices]. parent (:class:`str`): @@ -1038,11 +1058,11 @@ async def sample_list_services(): async def get_service( self, - request: Union[registration_service.GetServiceRequest, dict] = None, + request: Optional[Union[registration_service.GetServiceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Service: r"""Gets a service. @@ -1074,7 +1094,7 @@ async def sample_get_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.GetServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.GetServiceRequest, dict]]): The request object. The request message for [RegistrationService.GetService][google.cloud.servicedirectory.v1.RegistrationService.GetService]. This should not be used for looking up a service. @@ -1145,12 +1165,14 @@ async def sample_get_service(): async def update_service( self, - request: Union[registration_service.UpdateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateServiceRequest, dict] + ] = None, *, - service: gcs_service.Service = None, - update_mask: field_mask_pb2.FieldMask = None, + service: Optional[gcs_service.Service] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Updates a service. @@ -1181,7 +1203,7 @@ async def sample_update_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.UpdateServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.UpdateServiceRequest, dict]]): The request object. The request message for [RegistrationService.UpdateService][google.cloud.servicedirectory.v1.RegistrationService.UpdateService]. service (:class:`google.cloud.servicedirectory_v1.types.Service`): @@ -1258,11 +1280,13 @@ async def sample_update_service(): async def delete_service( self, - request: Union[registration_service.DeleteServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteServiceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a service. This also deletes all endpoints @@ -1292,7 +1316,7 @@ async def sample_delete_service(): await client.delete_service(request=request) Args: - request (Union[google.cloud.servicedirectory_v1.types.DeleteServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.DeleteServiceRequest, dict]]): The request object. The request message for [RegistrationService.DeleteService][google.cloud.servicedirectory.v1.RegistrationService.DeleteService]. name (:class:`str`): @@ -1349,13 +1373,15 @@ async def sample_delete_service(): async def create_endpoint( self, - request: Union[registration_service.CreateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateEndpointRequest, dict] + ] = None, *, - parent: str = None, - endpoint: gcs_endpoint.Endpoint = None, - endpoint_id: str = None, + parent: Optional[str] = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + endpoint_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Creates a endpoint, and returns the new Endpoint. @@ -1388,7 +1414,7 @@ async def sample_create_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.CreateEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.CreateEndpointRequest, dict]]): The request object. The request message for [RegistrationService.CreateEndpoint][google.cloud.servicedirectory.v1.RegistrationService.CreateEndpoint]. parent (:class:`str`): @@ -1479,11 +1505,13 @@ async def sample_create_endpoint(): async def list_endpoints( self, - request: Union[registration_service.ListEndpointsRequest, dict] = None, + request: Optional[ + Union[registration_service.ListEndpointsRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEndpointsAsyncPager: r"""Lists all endpoints. @@ -1516,7 +1544,7 @@ async def sample_list_endpoints(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.ListEndpointsRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.ListEndpointsRequest, dict]]): The request object. The request message for [RegistrationService.ListEndpoints][google.cloud.servicedirectory.v1.RegistrationService.ListEndpoints]. parent (:class:`str`): @@ -1595,11 +1623,11 @@ async def sample_list_endpoints(): async def get_endpoint( self, - request: Union[registration_service.GetEndpointRequest, dict] = None, + request: Optional[Union[registration_service.GetEndpointRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> endpoint.Endpoint: r"""Gets a endpoint. @@ -1631,7 +1659,7 @@ async def sample_get_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.GetEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.GetEndpointRequest, dict]]): The request object. The request message for [RegistrationService.GetEndpoint][google.cloud.servicedirectory.v1.RegistrationService.GetEndpoint]. This should not be used to lookup endpoints at runtime. @@ -1700,12 +1728,14 @@ async def sample_get_endpoint(): async def update_endpoint( self, - request: Union[registration_service.UpdateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateEndpointRequest, dict] + ] = None, *, - endpoint: gcs_endpoint.Endpoint = None, - update_mask: field_mask_pb2.FieldMask = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Updates a endpoint. @@ -1736,7 +1766,7 @@ async def sample_update_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1.types.UpdateEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.UpdateEndpointRequest, dict]]): The request object. The request message for [RegistrationService.UpdateEndpoint][google.cloud.servicedirectory.v1.RegistrationService.UpdateEndpoint]. endpoint (:class:`google.cloud.servicedirectory_v1.types.Endpoint`): @@ -1812,11 +1842,13 @@ async def sample_update_endpoint(): async def delete_endpoint( self, - request: Union[registration_service.DeleteEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteEndpointRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a endpoint. @@ -1845,7 +1877,7 @@ async def sample_delete_endpoint(): await client.delete_endpoint(request=request) Args: - request (Union[google.cloud.servicedirectory_v1.types.DeleteEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1.types.DeleteEndpointRequest, dict]]): The request object. The request message for [RegistrationService.DeleteEndpoint][google.cloud.servicedirectory.v1.RegistrationService.DeleteEndpoint]. name (:class:`str`): @@ -1902,10 +1934,10 @@ async def sample_delete_endpoint(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM Policy for a resource (namespace or @@ -1939,7 +1971,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]): The request object. Request message for `GetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2046,10 +2078,10 @@ async def sample_get_iam_policy(): async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM Policy for a resource (namespace or @@ -2083,7 +2115,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]): The request object. Request message for `SetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2190,10 +2222,10 @@ async def sample_set_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Tests IAM permissions for a resource (namespace or @@ -2228,7 +2260,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]): The request object. Request message for `TestIamPermissions` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/servicedirectory_v1/services/registration_service/client.py b/google/cloud/servicedirectory_v1/services/registration_service/client.py index e1f74d23..b3c1f7e5 100644 --- a/google/cloud/servicedirectory_v1/services/registration_service/client.py +++ b/google/cloud/servicedirectory_v1/services/registration_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -68,7 +79,7 @@ class RegistrationServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[RegistrationServiceTransport]: """Returns an appropriate transport class. @@ -408,8 +419,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, RegistrationServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, RegistrationServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the registration service client. @@ -423,7 +434,7 @@ def __init__( transport (Union[str, RegistrationServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -453,6 +464,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -505,13 +517,15 @@ def __init__( def create_namespace( self, - request: Union[registration_service.CreateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateNamespaceRequest, dict] + ] = None, *, - parent: str = None, - namespace: gcs_namespace.Namespace = None, - namespace_id: str = None, + parent: Optional[str] = None, + namespace: Optional[gcs_namespace.Namespace] = None, + namespace_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Creates a namespace, and returns the new Namespace. @@ -637,11 +651,13 @@ def sample_create_namespace(): def list_namespaces( self, - request: Union[registration_service.ListNamespacesRequest, dict] = None, + request: Optional[ + Union[registration_service.ListNamespacesRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListNamespacesPager: r"""Lists all namespaces. @@ -753,11 +769,11 @@ def sample_list_namespaces(): def get_namespace( self, - request: Union[registration_service.GetNamespaceRequest, dict] = None, + request: Optional[Union[registration_service.GetNamespaceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> namespace.Namespace: r"""Gets a namespace. @@ -857,12 +873,14 @@ def sample_get_namespace(): def update_namespace( self, - request: Union[registration_service.UpdateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateNamespaceRequest, dict] + ] = None, *, - namespace: gcs_namespace.Namespace = None, - update_mask: field_mask_pb2.FieldMask = None, + namespace: Optional[gcs_namespace.Namespace] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Updates a namespace. @@ -970,11 +988,13 @@ def sample_update_namespace(): def delete_namespace( self, - request: Union[registration_service.DeleteNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteNamespaceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a namespace. This also deletes all services @@ -1061,13 +1081,15 @@ def sample_delete_namespace(): def create_service( self, - request: Union[registration_service.CreateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateServiceRequest, dict] + ] = None, *, - parent: str = None, - service: gcs_service.Service = None, - service_id: str = None, + parent: Optional[str] = None, + service: Optional[gcs_service.Service] = None, + service_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Creates a service, and returns the new Service. @@ -1192,11 +1214,11 @@ def sample_create_service(): def list_services( self, - request: Union[registration_service.ListServicesRequest, dict] = None, + request: Optional[Union[registration_service.ListServicesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListServicesPager: r"""Lists all services belonging to a namespace. @@ -1308,11 +1330,11 @@ def sample_list_services(): def get_service( self, - request: Union[registration_service.GetServiceRequest, dict] = None, + request: Optional[Union[registration_service.GetServiceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Service: r"""Gets a service. @@ -1415,12 +1437,14 @@ def sample_get_service(): def update_service( self, - request: Union[registration_service.UpdateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateServiceRequest, dict] + ] = None, *, - service: gcs_service.Service = None, - update_mask: field_mask_pb2.FieldMask = None, + service: Optional[gcs_service.Service] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Updates a service. @@ -1528,11 +1552,13 @@ def sample_update_service(): def delete_service( self, - request: Union[registration_service.DeleteServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteServiceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a service. This also deletes all endpoints @@ -1619,13 +1645,15 @@ def sample_delete_service(): def create_endpoint( self, - request: Union[registration_service.CreateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateEndpointRequest, dict] + ] = None, *, - parent: str = None, - endpoint: gcs_endpoint.Endpoint = None, - endpoint_id: str = None, + parent: Optional[str] = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + endpoint_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Creates a endpoint, and returns the new Endpoint. @@ -1749,11 +1777,13 @@ def sample_create_endpoint(): def list_endpoints( self, - request: Union[registration_service.ListEndpointsRequest, dict] = None, + request: Optional[ + Union[registration_service.ListEndpointsRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEndpointsPager: r"""Lists all endpoints. @@ -1865,11 +1895,11 @@ def sample_list_endpoints(): def get_endpoint( self, - request: Union[registration_service.GetEndpointRequest, dict] = None, + request: Optional[Union[registration_service.GetEndpointRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> endpoint.Endpoint: r"""Gets a endpoint. @@ -1970,12 +2000,14 @@ def sample_get_endpoint(): def update_endpoint( self, - request: Union[registration_service.UpdateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateEndpointRequest, dict] + ] = None, *, - endpoint: gcs_endpoint.Endpoint = None, - update_mask: field_mask_pb2.FieldMask = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Updates a endpoint. @@ -2082,11 +2114,13 @@ def sample_update_endpoint(): def delete_endpoint( self, - request: Union[registration_service.DeleteEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteEndpointRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a endpoint. @@ -2172,10 +2206,10 @@ def sample_delete_endpoint(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM Policy for a resource (namespace or @@ -2315,10 +2349,10 @@ def sample_get_iam_policy(): def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM Policy for a resource (namespace or @@ -2458,10 +2492,10 @@ def sample_set_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Tests IAM permissions for a resource (namespace or diff --git a/google/cloud/servicedirectory_v1/services/registration_service/transports/base.py b/google/cloud/servicedirectory_v1/services/registration_service/transports/base.py index 3299f0a0..79ebeb98 100644 --- a/google/cloud/servicedirectory_v1/services/registration_service/transports/base.py +++ b/google/cloud/servicedirectory_v1/services/registration_service/transports/base.py @@ -57,7 +57,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc.py b/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc.py index 024060de..50bd6e51 100644 --- a/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc.py +++ b/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc.py @@ -69,14 +69,14 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -203,8 +203,8 @@ def __init__( def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc_asyncio.py b/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc_asyncio.py index f59a2cd3..a4d31f5e 100644 --- a/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc_asyncio.py +++ b/google/cloud/servicedirectory_v1/services/registration_service/transports/grpc_asyncio.py @@ -71,7 +71,7 @@ class RegistrationServiceGrpcAsyncIOTransport(RegistrationServiceTransport): def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -114,15 +114,15 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1/types/endpoint.py b/google/cloud/servicedirectory_v1/types/endpoint.py index 59eca5c2..33b38669 100644 --- a/google/cloud/servicedirectory_v1/types/endpoint.py +++ b/google/cloud/servicedirectory_v1/types/endpoint.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore __protobuf__ = proto.module( @@ -40,7 +42,7 @@ class Endpoint(proto.Message): port (int): Optional. Service Directory will reject values outside of [0, 65535]. - annotations (Mapping[str, str]): + annotations (MutableMapping[str, str]): Optional. Annotations for the endpoint. This data can be consumed by service clients. Restrictions: @@ -67,19 +69,19 @@ class Endpoint(proto.Message): to the same location in Service Directory. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - address = proto.Field( + address: str = proto.Field( proto.STRING, number=2, ) - port = proto.Field( + port: int = proto.Field( proto.INT32, number=3, ) - annotations = proto.MapField( + annotations: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=5, diff --git a/google/cloud/servicedirectory_v1/types/lookup_service.py b/google/cloud/servicedirectory_v1/types/lookup_service.py index 4550e3bb..60c8b31e 100644 --- a/google/cloud/servicedirectory_v1/types/lookup_service.py +++ b/google/cloud/servicedirectory_v1/types/lookup_service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore from google.cloud.servicedirectory_v1.types import service as gcs_service @@ -61,15 +63,15 @@ class ResolveServiceRequest(proto.Message): value that is not "sd" AND have the key/value foo=bar. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - max_endpoints = proto.Field( + max_endpoints: int = proto.Field( proto.INT32, number=2, ) - endpoint_filter = proto.Field( + endpoint_filter: str = proto.Field( proto.STRING, number=3, ) @@ -84,7 +86,7 @@ class ResolveServiceResponse(proto.Message): """ - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=1, message=gcs_service.Service, diff --git a/google/cloud/servicedirectory_v1/types/namespace.py b/google/cloud/servicedirectory_v1/types/namespace.py index b46abc3e..148409a3 100644 --- a/google/cloud/servicedirectory_v1/types/namespace.py +++ b/google/cloud/servicedirectory_v1/types/namespace.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore __protobuf__ = proto.module( @@ -33,18 +35,18 @@ class Namespace(proto.Message): name (str): Immutable. The resource name for the namespace in the format ``projects/*/locations/*/namespaces/*``. - labels (Mapping[str, str]): + labels (MutableMapping[str, str]): Optional. Resource labels associated with this Namespace. No more than 64 user labels can be associated with a given resource. Label keys and values can be no longer than 63 characters. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - labels = proto.MapField( + labels: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=2, diff --git a/google/cloud/servicedirectory_v1/types/registration_service.py b/google/cloud/servicedirectory_v1/types/registration_service.py index e9b99f83..1fa18b06 100644 --- a/google/cloud/servicedirectory_v1/types/registration_service.py +++ b/google/cloud/servicedirectory_v1/types/registration_service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore @@ -66,15 +68,15 @@ class CreateNamespaceRequest(proto.Message): set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - namespace_id = proto.Field( + namespace_id: str = proto.Field( proto.STRING, number=2, ) - namespace = proto.Field( + namespace: gcs_namespace.Namespace = proto.Field( proto.MESSAGE, number=3, message=gcs_namespace.Namespace, @@ -130,23 +132,23 @@ class ListNamespacesRequest(proto.Message): name in ascending order. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -157,7 +159,7 @@ class ListNamespacesResponse(proto.Message): [RegistrationService.ListNamespaces][google.cloud.servicedirectory.v1.RegistrationService.ListNamespaces]. Attributes: - namespaces (Sequence[google.cloud.servicedirectory_v1.types.Namespace]): + namespaces (MutableSequence[google.cloud.servicedirectory_v1.types.Namespace]): The list of namespaces. next_page_token (str): Token to retrieve the next page of results, @@ -169,12 +171,12 @@ class ListNamespacesResponse(proto.Message): def raw_page(self): return self - namespaces = proto.RepeatedField( + namespaces: MutableSequence[gcs_namespace.Namespace] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_namespace.Namespace, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -190,7 +192,7 @@ class GetNamespaceRequest(proto.Message): retrieve. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -208,12 +210,12 @@ class UpdateNamespaceRequest(proto.Message): this request. """ - namespace = proto.Field( + namespace: gcs_namespace.Namespace = proto.Field( proto.MESSAGE, number=1, message=gcs_namespace.Namespace, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -230,7 +232,7 @@ class DeleteNamespaceRequest(proto.Message): delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -256,15 +258,15 @@ class CreateServiceRequest(proto.Message): Required. A service with initial fields set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - service_id = proto.Field( + service_id: str = proto.Field( proto.STRING, number=2, ) - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=3, message=gcs_service.Service, @@ -314,23 +316,23 @@ class ListServicesRequest(proto.Message): Optional. The order to list result by. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -341,7 +343,7 @@ class ListServicesResponse(proto.Message): [RegistrationService.ListServices][google.cloud.servicedirectory.v1.RegistrationService.ListServices]. Attributes: - services (Sequence[google.cloud.servicedirectory_v1.types.Service]): + services (MutableSequence[google.cloud.servicedirectory_v1.types.Service]): The list of services. next_page_token (str): Token to retrieve the next page of results, @@ -353,12 +355,12 @@ class ListServicesResponse(proto.Message): def raw_page(self): return self - services = proto.RepeatedField( + services: MutableSequence[gcs_service.Service] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_service.Service, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -376,7 +378,7 @@ class GetServiceRequest(proto.Message): Required. The name of the service to get. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -394,12 +396,12 @@ class UpdateServiceRequest(proto.Message): this request. """ - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=1, message=gcs_service.Service, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -415,7 +417,7 @@ class DeleteServiceRequest(proto.Message): Required. The name of the service to delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -441,15 +443,15 @@ class CreateEndpointRequest(proto.Message): Required. A endpoint with initial fields set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - endpoint_id = proto.Field( + endpoint_id: str = proto.Field( proto.STRING, number=2, ) - endpoint = proto.Field( + endpoint: gcs_endpoint.Endpoint = proto.Field( proto.MESSAGE, number=3, message=gcs_endpoint.Endpoint, @@ -504,23 +506,23 @@ class ListEndpointsRequest(proto.Message): Optional. The order to list result by. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -531,7 +533,7 @@ class ListEndpointsResponse(proto.Message): [RegistrationService.ListEndpoints][google.cloud.servicedirectory.v1.RegistrationService.ListEndpoints]. Attributes: - endpoints (Sequence[google.cloud.servicedirectory_v1.types.Endpoint]): + endpoints (MutableSequence[google.cloud.servicedirectory_v1.types.Endpoint]): The list of endpoints. next_page_token (str): Token to retrieve the next page of results, @@ -543,12 +545,12 @@ class ListEndpointsResponse(proto.Message): def raw_page(self): return self - endpoints = proto.RepeatedField( + endpoints: MutableSequence[gcs_endpoint.Endpoint] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_endpoint.Endpoint, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -565,7 +567,7 @@ class GetEndpointRequest(proto.Message): Required. The name of the endpoint to get. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -583,12 +585,12 @@ class UpdateEndpointRequest(proto.Message): this request. """ - endpoint = proto.Field( + endpoint: gcs_endpoint.Endpoint = proto.Field( proto.MESSAGE, number=1, message=gcs_endpoint.Endpoint, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -604,7 +606,7 @@ class DeleteEndpointRequest(proto.Message): Required. The name of the endpoint to delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) diff --git a/google/cloud/servicedirectory_v1/types/service.py b/google/cloud/servicedirectory_v1/types/service.py index 4bd3eae8..c84dbcbe 100644 --- a/google/cloud/servicedirectory_v1/types/service.py +++ b/google/cloud/servicedirectory_v1/types/service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore from google.cloud.servicedirectory_v1.types import endpoint @@ -35,7 +37,7 @@ class Service(proto.Message): name (str): Immutable. The resource name for the service in the format ``projects/*/locations/*/namespaces/*/services/*``. - annotations (Mapping[str, str]): + annotations (MutableMapping[str, str]): Optional. Annotations for the service. This data can be consumed by service clients. Restrictions: @@ -60,23 +62,23 @@ class Service(proto.Message): Note: This field is equivalent to the 'metadata' field in the v1beta1 API. They have the same syntax and read/write to the same location in Service Directory. - endpoints (Sequence[google.cloud.servicedirectory_v1.types.Endpoint]): + endpoints (MutableSequence[google.cloud.servicedirectory_v1.types.Endpoint]): Output only. Endpoints associated with this service. Returned on LookupService.Resolve. Control plane clients should use RegistrationService.ListEndpoints. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - annotations = proto.MapField( + annotations: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=4, ) - endpoints = proto.RepeatedField( + endpoints: MutableSequence[endpoint.Endpoint] = proto.RepeatedField( proto.MESSAGE, number=3, message=endpoint.Endpoint, diff --git a/google/cloud/servicedirectory_v1beta1/__init__.py b/google/cloud/servicedirectory_v1beta1/__init__.py index c938c5b6..8b311263 100644 --- a/google/cloud/servicedirectory_v1beta1/__init__.py +++ b/google/cloud/servicedirectory_v1beta1/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.servicedirectory import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.lookup_service import LookupServiceAsyncClient, LookupServiceClient from .services.registration_service import ( diff --git a/google/cloud/servicedirectory_v1beta1/services/lookup_service/async_client.py b/google/cloud/servicedirectory_v1beta1/services/lookup_service/async_client.py index 508e3625..08d9339f 100644 --- a/google/cloud/servicedirectory_v1beta1/services/lookup_service/async_client.py +++ b/google/cloud/servicedirectory_v1beta1/services/lookup_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -162,9 +172,9 @@ def transport(self) -> LookupServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, LookupServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the lookup service client. @@ -208,10 +218,10 @@ def __init__( async def resolve_service( self, - request: Union[lookup_service.ResolveServiceRequest, dict] = None, + request: Optional[Union[lookup_service.ResolveServiceRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> lookup_service.ResolveServiceResponse: r"""Returns a @@ -246,7 +256,7 @@ async def sample_resolve_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.ResolveServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.ResolveServiceRequest, dict]]): The request object. The request message for [LookupService.ResolveService][google.cloud.servicedirectory.v1beta1.LookupService.ResolveService]. Looks up a service by its name, returns the service and diff --git a/google/cloud/servicedirectory_v1beta1/services/lookup_service/client.py b/google/cloud/servicedirectory_v1beta1/services/lookup_service/client.py index 844e67df..f054c06c 100644 --- a/google/cloud/servicedirectory_v1beta1/services/lookup_service/client.py +++ b/google/cloud/servicedirectory_v1beta1/services/lookup_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -55,7 +66,7 @@ class LookupServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[LookupServiceTransport]: """Returns an appropriate transport class. @@ -378,8 +389,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, LookupServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, LookupServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the lookup service client. @@ -393,7 +404,7 @@ def __init__( transport (Union[str, LookupServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -423,6 +434,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -475,10 +487,10 @@ def __init__( def resolve_service( self, - request: Union[lookup_service.ResolveServiceRequest, dict] = None, + request: Optional[Union[lookup_service.ResolveServiceRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> lookup_service.ResolveServiceResponse: r"""Returns a diff --git a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/base.py b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/base.py index 4e00fb09..6787cc22 100644 --- a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/base.py +++ b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/base.py @@ -48,7 +48,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc.py b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc.py index 921d5a9a..3ba9f181 100644 --- a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc.py +++ b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc.py @@ -46,14 +46,14 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -180,8 +180,8 @@ def __init__( def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc_asyncio.py b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc_asyncio.py index 664dab9a..404ca3fb 100644 --- a/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc_asyncio.py +++ b/google/cloud/servicedirectory_v1beta1/services/lookup_service/transports/grpc_asyncio.py @@ -48,7 +48,7 @@ class LookupServiceGrpcAsyncIOTransport(LookupServiceTransport): def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -91,15 +91,15 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1beta1/services/registration_service/async_client.py b/google/cloud/servicedirectory_v1beta1/services/registration_service/async_client.py index 002adc99..b6440de4 100644 --- a/google/cloud/servicedirectory_v1beta1/services/registration_service/async_client.py +++ b/google/cloud/servicedirectory_v1beta1/services/registration_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -193,9 +203,9 @@ def transport(self) -> RegistrationServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, RegistrationServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the registration service client. @@ -239,13 +249,15 @@ def __init__( async def create_namespace( self, - request: Union[registration_service.CreateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateNamespaceRequest, dict] + ] = None, *, - parent: str = None, - namespace: gcs_namespace.Namespace = None, - namespace_id: str = None, + parent: Optional[str] = None, + namespace: Optional[gcs_namespace.Namespace] = None, + namespace_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Creates a namespace, and returns the new namespace. @@ -278,7 +290,7 @@ async def sample_create_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.CreateNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.CreateNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.CreateNamespace][google.cloud.servicedirectory.v1beta1.RegistrationService.CreateNamespace]. parent (:class:`str`): @@ -371,11 +383,13 @@ async def sample_create_namespace(): async def list_namespaces( self, - request: Union[registration_service.ListNamespacesRequest, dict] = None, + request: Optional[ + Union[registration_service.ListNamespacesRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListNamespacesAsyncPager: r"""Lists all namespaces. @@ -408,7 +422,7 @@ async def sample_list_namespaces(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.ListNamespacesRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.ListNamespacesRequest, dict]]): The request object. The request message for [RegistrationService.ListNamespaces][google.cloud.servicedirectory.v1beta1.RegistrationService.ListNamespaces]. parent (:class:`str`): @@ -487,11 +501,11 @@ async def sample_list_namespaces(): async def get_namespace( self, - request: Union[registration_service.GetNamespaceRequest, dict] = None, + request: Optional[Union[registration_service.GetNamespaceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> namespace.Namespace: r"""Gets a namespace. @@ -523,7 +537,7 @@ async def sample_get_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.GetNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.GetNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.GetNamespace][google.cloud.servicedirectory.v1beta1.RegistrationService.GetNamespace]. name (:class:`str`): @@ -591,12 +605,14 @@ async def sample_get_namespace(): async def update_namespace( self, - request: Union[registration_service.UpdateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateNamespaceRequest, dict] + ] = None, *, - namespace: gcs_namespace.Namespace = None, - update_mask: field_mask_pb2.FieldMask = None, + namespace: Optional[gcs_namespace.Namespace] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Updates a namespace. @@ -627,7 +643,7 @@ async def sample_update_namespace(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.UpdateNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.UpdateNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.UpdateNamespace][google.cloud.servicedirectory.v1beta1.RegistrationService.UpdateNamespace]. namespace (:class:`google.cloud.servicedirectory_v1beta1.types.Namespace`): @@ -704,11 +720,13 @@ async def sample_update_namespace(): async def delete_namespace( self, - request: Union[registration_service.DeleteNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteNamespaceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a namespace. This also deletes all services @@ -738,7 +756,7 @@ async def sample_delete_namespace(): await client.delete_namespace(request=request) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.DeleteNamespaceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.DeleteNamespaceRequest, dict]]): The request object. The request message for [RegistrationService.DeleteNamespace][google.cloud.servicedirectory.v1beta1.RegistrationService.DeleteNamespace]. name (:class:`str`): @@ -795,13 +813,15 @@ async def sample_delete_namespace(): async def create_service( self, - request: Union[registration_service.CreateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateServiceRequest, dict] + ] = None, *, - parent: str = None, - service: gcs_service.Service = None, - service_id: str = None, + parent: Optional[str] = None, + service: Optional[gcs_service.Service] = None, + service_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Creates a service, and returns the new service. @@ -834,7 +854,7 @@ async def sample_create_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.CreateServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.CreateServiceRequest, dict]]): The request object. The request message for [RegistrationService.CreateService][google.cloud.servicedirectory.v1beta1.RegistrationService.CreateService]. parent (:class:`str`): @@ -926,11 +946,11 @@ async def sample_create_service(): async def list_services( self, - request: Union[registration_service.ListServicesRequest, dict] = None, + request: Optional[Union[registration_service.ListServicesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListServicesAsyncPager: r"""Lists all services belonging to a namespace. @@ -963,7 +983,7 @@ async def sample_list_services(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.ListServicesRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.ListServicesRequest, dict]]): The request object. The request message for [RegistrationService.ListServices][google.cloud.servicedirectory.v1beta1.RegistrationService.ListServices]. parent (:class:`str`): @@ -1042,11 +1062,11 @@ async def sample_list_services(): async def get_service( self, - request: Union[registration_service.GetServiceRequest, dict] = None, + request: Optional[Union[registration_service.GetServiceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Service: r"""Gets a service. @@ -1078,7 +1098,7 @@ async def sample_get_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.GetServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.GetServiceRequest, dict]]): The request object. The request message for [RegistrationService.GetService][google.cloud.servicedirectory.v1beta1.RegistrationService.GetService]. This should not be used for looking up a service. @@ -1149,12 +1169,14 @@ async def sample_get_service(): async def update_service( self, - request: Union[registration_service.UpdateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateServiceRequest, dict] + ] = None, *, - service: gcs_service.Service = None, - update_mask: field_mask_pb2.FieldMask = None, + service: Optional[gcs_service.Service] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Updates a service. @@ -1185,7 +1207,7 @@ async def sample_update_service(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.UpdateServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.UpdateServiceRequest, dict]]): The request object. The request message for [RegistrationService.UpdateService][google.cloud.servicedirectory.v1beta1.RegistrationService.UpdateService]. service (:class:`google.cloud.servicedirectory_v1beta1.types.Service`): @@ -1262,11 +1284,13 @@ async def sample_update_service(): async def delete_service( self, - request: Union[registration_service.DeleteServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteServiceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a service. This also deletes all endpoints @@ -1296,7 +1320,7 @@ async def sample_delete_service(): await client.delete_service(request=request) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.DeleteServiceRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.DeleteServiceRequest, dict]]): The request object. The request message for [RegistrationService.DeleteService][google.cloud.servicedirectory.v1beta1.RegistrationService.DeleteService]. name (:class:`str`): @@ -1353,13 +1377,15 @@ async def sample_delete_service(): async def create_endpoint( self, - request: Union[registration_service.CreateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateEndpointRequest, dict] + ] = None, *, - parent: str = None, - endpoint: gcs_endpoint.Endpoint = None, - endpoint_id: str = None, + parent: Optional[str] = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + endpoint_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Creates an endpoint, and returns the new endpoint. @@ -1392,7 +1418,7 @@ async def sample_create_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.CreateEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.CreateEndpointRequest, dict]]): The request object. The request message for [RegistrationService.CreateEndpoint][google.cloud.servicedirectory.v1beta1.RegistrationService.CreateEndpoint]. parent (:class:`str`): @@ -1483,11 +1509,13 @@ async def sample_create_endpoint(): async def list_endpoints( self, - request: Union[registration_service.ListEndpointsRequest, dict] = None, + request: Optional[ + Union[registration_service.ListEndpointsRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEndpointsAsyncPager: r"""Lists all endpoints. @@ -1520,7 +1548,7 @@ async def sample_list_endpoints(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.ListEndpointsRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.ListEndpointsRequest, dict]]): The request object. The request message for [RegistrationService.ListEndpoints][google.cloud.servicedirectory.v1beta1.RegistrationService.ListEndpoints]. parent (:class:`str`): @@ -1599,11 +1627,11 @@ async def sample_list_endpoints(): async def get_endpoint( self, - request: Union[registration_service.GetEndpointRequest, dict] = None, + request: Optional[Union[registration_service.GetEndpointRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> endpoint.Endpoint: r"""Gets an endpoint. @@ -1635,7 +1663,7 @@ async def sample_get_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.GetEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.GetEndpointRequest, dict]]): The request object. The request message for [RegistrationService.GetEndpoint][google.cloud.servicedirectory.v1beta1.RegistrationService.GetEndpoint]. This should not be used to lookup endpoints at runtime. @@ -1704,12 +1732,14 @@ async def sample_get_endpoint(): async def update_endpoint( self, - request: Union[registration_service.UpdateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateEndpointRequest, dict] + ] = None, *, - endpoint: gcs_endpoint.Endpoint = None, - update_mask: field_mask_pb2.FieldMask = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Updates an endpoint. @@ -1740,7 +1770,7 @@ async def sample_update_endpoint(): print(response) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.UpdateEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.UpdateEndpointRequest, dict]]): The request object. The request message for [RegistrationService.UpdateEndpoint][google.cloud.servicedirectory.v1beta1.RegistrationService.UpdateEndpoint]. endpoint (:class:`google.cloud.servicedirectory_v1beta1.types.Endpoint`): @@ -1816,11 +1846,13 @@ async def sample_update_endpoint(): async def delete_endpoint( self, - request: Union[registration_service.DeleteEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteEndpointRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes an endpoint. @@ -1849,7 +1881,7 @@ async def sample_delete_endpoint(): await client.delete_endpoint(request=request) Args: - request (Union[google.cloud.servicedirectory_v1beta1.types.DeleteEndpointRequest, dict]): + request (Optional[Union[google.cloud.servicedirectory_v1beta1.types.DeleteEndpointRequest, dict]]): The request object. The request message for [RegistrationService.DeleteEndpoint][google.cloud.servicedirectory.v1beta1.RegistrationService.DeleteEndpoint]. name (:class:`str`): @@ -1906,10 +1938,10 @@ async def sample_delete_endpoint(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM Policy for a resource (namespace or @@ -1943,7 +1975,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]): The request object. Request message for `GetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2050,10 +2082,10 @@ async def sample_get_iam_policy(): async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM Policy for a resource (namespace or @@ -2087,7 +2119,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]): The request object. Request message for `SetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2194,10 +2226,10 @@ async def sample_set_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Tests IAM permissions for a resource (namespace or @@ -2232,7 +2264,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]): The request object. Request message for `TestIamPermissions` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/servicedirectory_v1beta1/services/registration_service/client.py b/google/cloud/servicedirectory_v1beta1/services/registration_service/client.py index 4ca1d836..548d4118 100644 --- a/google/cloud/servicedirectory_v1beta1/services/registration_service/client.py +++ b/google/cloud/servicedirectory_v1beta1/services/registration_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -69,7 +80,7 @@ class RegistrationServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[RegistrationServiceTransport]: """Returns an appropriate transport class. @@ -430,8 +441,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, RegistrationServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, RegistrationServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the registration service client. @@ -445,7 +456,7 @@ def __init__( transport (Union[str, RegistrationServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -475,6 +486,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -527,13 +539,15 @@ def __init__( def create_namespace( self, - request: Union[registration_service.CreateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateNamespaceRequest, dict] + ] = None, *, - parent: str = None, - namespace: gcs_namespace.Namespace = None, - namespace_id: str = None, + parent: Optional[str] = None, + namespace: Optional[gcs_namespace.Namespace] = None, + namespace_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Creates a namespace, and returns the new namespace. @@ -659,11 +673,13 @@ def sample_create_namespace(): def list_namespaces( self, - request: Union[registration_service.ListNamespacesRequest, dict] = None, + request: Optional[ + Union[registration_service.ListNamespacesRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListNamespacesPager: r"""Lists all namespaces. @@ -775,11 +791,11 @@ def sample_list_namespaces(): def get_namespace( self, - request: Union[registration_service.GetNamespaceRequest, dict] = None, + request: Optional[Union[registration_service.GetNamespaceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> namespace.Namespace: r"""Gets a namespace. @@ -879,12 +895,14 @@ def sample_get_namespace(): def update_namespace( self, - request: Union[registration_service.UpdateNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateNamespaceRequest, dict] + ] = None, *, - namespace: gcs_namespace.Namespace = None, - update_mask: field_mask_pb2.FieldMask = None, + namespace: Optional[gcs_namespace.Namespace] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_namespace.Namespace: r"""Updates a namespace. @@ -992,11 +1010,13 @@ def sample_update_namespace(): def delete_namespace( self, - request: Union[registration_service.DeleteNamespaceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteNamespaceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a namespace. This also deletes all services @@ -1083,13 +1103,15 @@ def sample_delete_namespace(): def create_service( self, - request: Union[registration_service.CreateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateServiceRequest, dict] + ] = None, *, - parent: str = None, - service: gcs_service.Service = None, - service_id: str = None, + parent: Optional[str] = None, + service: Optional[gcs_service.Service] = None, + service_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Creates a service, and returns the new service. @@ -1214,11 +1236,11 @@ def sample_create_service(): def list_services( self, - request: Union[registration_service.ListServicesRequest, dict] = None, + request: Optional[Union[registration_service.ListServicesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListServicesPager: r"""Lists all services belonging to a namespace. @@ -1330,11 +1352,11 @@ def sample_list_services(): def get_service( self, - request: Union[registration_service.GetServiceRequest, dict] = None, + request: Optional[Union[registration_service.GetServiceRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Service: r"""Gets a service. @@ -1437,12 +1459,14 @@ def sample_get_service(): def update_service( self, - request: Union[registration_service.UpdateServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateServiceRequest, dict] + ] = None, *, - service: gcs_service.Service = None, - update_mask: field_mask_pb2.FieldMask = None, + service: Optional[gcs_service.Service] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_service.Service: r"""Updates a service. @@ -1550,11 +1574,13 @@ def sample_update_service(): def delete_service( self, - request: Union[registration_service.DeleteServiceRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteServiceRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a service. This also deletes all endpoints @@ -1641,13 +1667,15 @@ def sample_delete_service(): def create_endpoint( self, - request: Union[registration_service.CreateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.CreateEndpointRequest, dict] + ] = None, *, - parent: str = None, - endpoint: gcs_endpoint.Endpoint = None, - endpoint_id: str = None, + parent: Optional[str] = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + endpoint_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Creates an endpoint, and returns the new endpoint. @@ -1771,11 +1799,13 @@ def sample_create_endpoint(): def list_endpoints( self, - request: Union[registration_service.ListEndpointsRequest, dict] = None, + request: Optional[ + Union[registration_service.ListEndpointsRequest, dict] + ] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEndpointsPager: r"""Lists all endpoints. @@ -1887,11 +1917,11 @@ def sample_list_endpoints(): def get_endpoint( self, - request: Union[registration_service.GetEndpointRequest, dict] = None, + request: Optional[Union[registration_service.GetEndpointRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> endpoint.Endpoint: r"""Gets an endpoint. @@ -1992,12 +2022,14 @@ def sample_get_endpoint(): def update_endpoint( self, - request: Union[registration_service.UpdateEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.UpdateEndpointRequest, dict] + ] = None, *, - endpoint: gcs_endpoint.Endpoint = None, - update_mask: field_mask_pb2.FieldMask = None, + endpoint: Optional[gcs_endpoint.Endpoint] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcs_endpoint.Endpoint: r"""Updates an endpoint. @@ -2104,11 +2136,13 @@ def sample_update_endpoint(): def delete_endpoint( self, - request: Union[registration_service.DeleteEndpointRequest, dict] = None, + request: Optional[ + Union[registration_service.DeleteEndpointRequest, dict] + ] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes an endpoint. @@ -2194,10 +2228,10 @@ def sample_delete_endpoint(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM Policy for a resource (namespace or @@ -2337,10 +2371,10 @@ def sample_get_iam_policy(): def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM Policy for a resource (namespace or @@ -2480,10 +2514,10 @@ def sample_set_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Tests IAM permissions for a resource (namespace or diff --git a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/base.py b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/base.py index 131ecc36..c45a0bc6 100644 --- a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/base.py +++ b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/base.py @@ -57,7 +57,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc.py b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc.py index 7af17655..8a4efebd 100644 --- a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc.py +++ b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc.py @@ -70,14 +70,14 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -204,8 +204,8 @@ def __init__( def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc_asyncio.py b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc_asyncio.py index 82be9a25..73179728 100644 --- a/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc_asyncio.py +++ b/google/cloud/servicedirectory_v1beta1/services/registration_service/transports/grpc_asyncio.py @@ -72,7 +72,7 @@ class RegistrationServiceGrpcAsyncIOTransport(RegistrationServiceTransport): def create_channel( cls, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -115,15 +115,15 @@ def __init__( self, *, host: str = "servicedirectory.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/servicedirectory_v1beta1/types/endpoint.py b/google/cloud/servicedirectory_v1beta1/types/endpoint.py index 38e7bddd..8dd2e48d 100644 --- a/google/cloud/servicedirectory_v1beta1/types/endpoint.py +++ b/google/cloud/servicedirectory_v1beta1/types/endpoint.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -47,7 +49,7 @@ class Endpoint(proto.Message): port (int): Optional. Service Directory rejects values outside of ``[0, 65535]``. - metadata (Mapping[str, str]): + metadata (MutableMapping[str, str]): Optional. Metadata for the endpoint. This data can be consumed by service clients. @@ -92,33 +94,33 @@ class Endpoint(proto.Message): was last updated. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - address = proto.Field( + address: str = proto.Field( proto.STRING, number=2, ) - port = proto.Field( + port: int = proto.Field( proto.INT32, number=3, ) - metadata = proto.MapField( + metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=4, ) - network = proto.Field( + network: str = proto.Field( proto.STRING, number=5, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=6, message=timestamp_pb2.Timestamp, ) - update_time = proto.Field( + update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=7, message=timestamp_pb2.Timestamp, diff --git a/google/cloud/servicedirectory_v1beta1/types/lookup_service.py b/google/cloud/servicedirectory_v1beta1/types/lookup_service.py index a1c0c7cd..89c37854 100644 --- a/google/cloud/servicedirectory_v1beta1/types/lookup_service.py +++ b/google/cloud/servicedirectory_v1beta1/types/lookup_service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore from google.cloud.servicedirectory_v1beta1.types import service as gcs_service @@ -86,15 +88,15 @@ class ResolveServiceRequest(proto.Message): Filtering `__. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - max_endpoints = proto.Field( + max_endpoints: int = proto.Field( proto.INT32, number=2, ) - endpoint_filter = proto.Field( + endpoint_filter: str = proto.Field( proto.STRING, number=3, ) @@ -109,7 +111,7 @@ class ResolveServiceResponse(proto.Message): """ - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=1, message=gcs_service.Service, diff --git a/google/cloud/servicedirectory_v1beta1/types/namespace.py b/google/cloud/servicedirectory_v1beta1/types/namespace.py index 20b5f080..ac17dfb7 100644 --- a/google/cloud/servicedirectory_v1beta1/types/namespace.py +++ b/google/cloud/servicedirectory_v1beta1/types/namespace.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -34,7 +36,7 @@ class Namespace(proto.Message): name (str): Immutable. The resource name for the namespace in the format ``projects/*/locations/*/namespaces/*``. - labels (Mapping[str, str]): + labels (MutableMapping[str, str]): Optional. Resource labels associated with this namespace. No more than 64 user labels can be associated with a given resource. Label keys @@ -47,21 +49,21 @@ class Namespace(proto.Message): was last updated. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - labels = proto.MapField( + labels: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=2, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp, ) - update_time = proto.Field( + update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=5, message=timestamp_pb2.Timestamp, diff --git a/google/cloud/servicedirectory_v1beta1/types/registration_service.py b/google/cloud/servicedirectory_v1beta1/types/registration_service.py index 913e5f2b..117ba100 100644 --- a/google/cloud/servicedirectory_v1beta1/types/registration_service.py +++ b/google/cloud/servicedirectory_v1beta1/types/registration_service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore @@ -66,15 +68,15 @@ class CreateNamespaceRequest(proto.Message): set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - namespace_id = proto.Field( + namespace_id: str = proto.Field( proto.STRING, number=2, ) - namespace = proto.Field( + namespace: gcs_namespace.Namespace = proto.Field( proto.MESSAGE, number=3, message=gcs_namespace.Namespace, @@ -145,23 +147,23 @@ class ListNamespacesRequest(proto.Message): order, which is order by ``name`` in ascending order. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -172,7 +174,7 @@ class ListNamespacesResponse(proto.Message): [RegistrationService.ListNamespaces][google.cloud.servicedirectory.v1beta1.RegistrationService.ListNamespaces]. Attributes: - namespaces (Sequence[google.cloud.servicedirectory_v1beta1.types.Namespace]): + namespaces (MutableSequence[google.cloud.servicedirectory_v1beta1.types.Namespace]): The list of namespaces. next_page_token (str): Token to retrieve the next page of results, @@ -184,12 +186,12 @@ class ListNamespacesResponse(proto.Message): def raw_page(self): return self - namespaces = proto.RepeatedField( + namespaces: MutableSequence[gcs_namespace.Namespace] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_namespace.Namespace, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -205,7 +207,7 @@ class GetNamespaceRequest(proto.Message): retrieve. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -223,12 +225,12 @@ class UpdateNamespaceRequest(proto.Message): this request. """ - namespace = proto.Field( + namespace: gcs_namespace.Namespace = proto.Field( proto.MESSAGE, number=1, message=gcs_namespace.Namespace, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -245,7 +247,7 @@ class DeleteNamespaceRequest(proto.Message): delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -271,15 +273,15 @@ class CreateServiceRequest(proto.Message): Required. A service with initial fields set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - service_id = proto.Field( + service_id: str = proto.Field( proto.STRING, number=2, ) - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=3, message=gcs_service.Service, @@ -352,23 +354,23 @@ class ListServicesRequest(proto.Message): order, which is order by ``name`` in ascending order. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -379,7 +381,7 @@ class ListServicesResponse(proto.Message): [RegistrationService.ListServices][google.cloud.servicedirectory.v1beta1.RegistrationService.ListServices]. Attributes: - services (Sequence[google.cloud.servicedirectory_v1beta1.types.Service]): + services (MutableSequence[google.cloud.servicedirectory_v1beta1.types.Service]): The list of services. next_page_token (str): Token to retrieve the next page of results, @@ -391,12 +393,12 @@ class ListServicesResponse(proto.Message): def raw_page(self): return self - services = proto.RepeatedField( + services: MutableSequence[gcs_service.Service] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_service.Service, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -414,7 +416,7 @@ class GetServiceRequest(proto.Message): Required. The name of the service to get. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -432,12 +434,12 @@ class UpdateServiceRequest(proto.Message): this request. """ - service = proto.Field( + service: gcs_service.Service = proto.Field( proto.MESSAGE, number=1, message=gcs_service.Service, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -453,7 +455,7 @@ class DeleteServiceRequest(proto.Message): Required. The name of the service to delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -479,15 +481,15 @@ class CreateEndpointRequest(proto.Message): Required. A endpoint with initial fields set. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - endpoint_id = proto.Field( + endpoint_id: str = proto.Field( proto.STRING, number=2, ) - endpoint = proto.Field( + endpoint: gcs_endpoint.Endpoint = proto.Field( proto.MESSAGE, number=3, message=gcs_endpoint.Endpoint, @@ -565,23 +567,23 @@ class ListEndpointsRequest(proto.Message): order, which is order by ``name`` in ascending order. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=4, ) - order_by = proto.Field( + order_by: str = proto.Field( proto.STRING, number=5, ) @@ -592,7 +594,7 @@ class ListEndpointsResponse(proto.Message): [RegistrationService.ListEndpoints][google.cloud.servicedirectory.v1beta1.RegistrationService.ListEndpoints]. Attributes: - endpoints (Sequence[google.cloud.servicedirectory_v1beta1.types.Endpoint]): + endpoints (MutableSequence[google.cloud.servicedirectory_v1beta1.types.Endpoint]): The list of endpoints. next_page_token (str): Token to retrieve the next page of results, @@ -604,12 +606,12 @@ class ListEndpointsResponse(proto.Message): def raw_page(self): return self - endpoints = proto.RepeatedField( + endpoints: MutableSequence[gcs_endpoint.Endpoint] = proto.RepeatedField( proto.MESSAGE, number=1, message=gcs_endpoint.Endpoint, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -626,7 +628,7 @@ class GetEndpointRequest(proto.Message): Required. The name of the endpoint to get. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -644,12 +646,12 @@ class UpdateEndpointRequest(proto.Message): this request. """ - endpoint = proto.Field( + endpoint: gcs_endpoint.Endpoint = proto.Field( proto.MESSAGE, number=1, message=gcs_endpoint.Endpoint, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -665,7 +667,7 @@ class DeleteEndpointRequest(proto.Message): Required. The name of the endpoint to delete. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) diff --git a/google/cloud/servicedirectory_v1beta1/types/service.py b/google/cloud/servicedirectory_v1beta1/types/service.py index 227065aa..edc5dbcb 100644 --- a/google/cloud/servicedirectory_v1beta1/types/service.py +++ b/google/cloud/servicedirectory_v1beta1/types/service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -36,7 +38,7 @@ class Service(proto.Message): name (str): Immutable. The resource name for the service in the format ``projects/*/locations/*/namespaces/*/services/*``. - metadata (Mapping[str, str]): + metadata (MutableMapping[str, str]): Optional. Metadata for the service. This data can be consumed by service clients. @@ -64,7 +66,7 @@ class Service(proto.Message): Note: This field is equivalent to the ``annotations`` field in the v1 API. They have the same syntax and read/write to the same location in Service Directory. - endpoints (Sequence[google.cloud.servicedirectory_v1beta1.types.Endpoint]): + endpoints (MutableSequence[google.cloud.servicedirectory_v1beta1.types.Endpoint]): Output only. Endpoints associated with this service. Returned on [LookupService.ResolveService][google.cloud.servicedirectory.v1beta1.LookupService.ResolveService]. @@ -81,26 +83,26 @@ class Service(proto.Message): of this timestamp. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - metadata = proto.MapField( + metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=2, ) - endpoints = proto.RepeatedField( + endpoints: MutableSequence[endpoint.Endpoint] = proto.RepeatedField( proto.MESSAGE, number=3, message=endpoint.Endpoint, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=6, message=timestamp_pb2.Timestamp, ) - update_time = proto.Field( + update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=7, message=timestamp_pb2.Timestamp, diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 00000000..ce738f01 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,56 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +from pathlib import Path +import shutil + +import synthtool as s +import synthtool.gcp as gcp +from synthtool.languages import python + +# ---------------------------------------------------------------------------- +# Copy the generated client from the owl-bot staging directory +# ---------------------------------------------------------------------------- + +clean_up_generated_samples = True + +# Load the default version defined in .repo-metadata.json. +default_version = json.load(open(".repo-metadata.json", "rt")).get( + "default_version" +) + +for library in s.get_staging_dirs(default_version): + if clean_up_generated_samples: + shutil.rmtree("samples/generated_samples", ignore_errors=True) + clean_up_generated_samples = False + s.move([library], excludes=["**/gapic_version.py"]) +s.remove_staging_dirs() + +# ---------------------------------------------------------------------------- +# Add templated files +# ---------------------------------------------------------------------------- + +templated_files = gcp.CommonTemplates().py_library( + cov_level=100, + microgenerator=True, + versions=gcp.common.detect_versions(path="./google", default_first=True), +) +s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"]) + +python.py_samples(skip_readmes=True) + +# run format session for all directories which have a noxfile +for noxfile in Path(".").glob("**/noxfile.py"): + s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 00000000..7786a7b8 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,28 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "packages": { + ".": { + "release-type": "python", + "extra-files": [ + "google/cloud/servicedirectory/gapic_version.py", + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1.json", + "jsonpath": "$.clientLibrary.version" + }, + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1beta1.json", + "jsonpath": "$.clientLibrary.version" + } + ] + } + }, + "release-type": "python", + "plugins": [ + { + "type": "sentence-case" + } + ], + "initial-version": "0.1.0" +} diff --git a/samples/generated_samples/snippet_metadata_servicedirectory_v1.json b/samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1.json similarity index 99% rename from samples/generated_samples/snippet_metadata_servicedirectory_v1.json rename to samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1.json index 501200df..a0b20f7b 100644 --- a/samples/generated_samples/snippet_metadata_servicedirectory_v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-service-directory" + "name": "google-cloud-service-directory", + "version": "0.1.0" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_servicedirectory_v1beta1.json b/samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1beta1.json similarity index 99% rename from samples/generated_samples/snippet_metadata_servicedirectory_v1beta1.json rename to samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1beta1.json index f59776bc..8cb020ec 100644 --- a/samples/generated_samples/snippet_metadata_servicedirectory_v1beta1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.servicedirectory.v1beta1.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-service-directory" + "name": "google-cloud-service-directory", + "version": "0.1.0" }, "snippets": [ { diff --git a/setup.py b/setup.py index 94569842..f3a61070 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2019 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,13 +13,37 @@ # See the License for the specific language governing permissions and # limitations under the License. # - import io import os import setuptools # type: ignore -version = "1.5.3" +package_root = os.path.abspath(os.path.dirname(__file__)) + +name = "google-cloud-service-directory" + + +description = "Google Cloud Service Directory API client library" + +version = {} +with open( + os.path.join(package_root, "google/cloud/servicedirectory/gapic_version.py") +) as fp: + exec(fp.read(), version) +version = version["__version__"] + +if version[0] == "0": + release_status = "Development Status :: 4 - Beta" +else: + release_status = "Development Status :: 5 - Production/Stable" + +dependencies = [ + "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "proto-plus >= 1.22.0, <2.0.0dev", + "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", + "grpc-google-iam-v1 >= 0.12.4, < 1.0.0dev", +] +url = "https://github.com/googleapis/python-service-directory" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -28,35 +51,43 @@ with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() +packages = [ + package + for package in setuptools.PEP420PackageFinder.find() + if package.startswith("google") +] + +namespaces = ["google"] +if "google.cloud" in packages: + namespaces.append("google.cloud") + setuptools.setup( - name="google-cloud-service-directory", + name=name, version=version, + description=description, long_description=readme, author="Google LLC", author_email="googleapis-packages@google.com", license="Apache 2.0", - url="https://github.com/googleapis/python-service-directory", - packages=setuptools.PEP420PackageFinder.find(), - namespace_packages=("google", "google.cloud"), - platforms="Posix; MacOS X; Windows", - include_package_data=True, - install_requires=( - "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", - "proto-plus >= 1.22.0, <2.0.0dev", - "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", - "grpc-google-iam-v1 >= 0.12.4, <1.0.0dev", - ), - python_requires=">=3.7", + url=url, classifiers=[ - "Development Status :: 5 - Production/Stable", + release_status, "Intended Audience :: Developers", - "Operating System :: OS Independent", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Operating System :: OS Independent", "Topic :: Internet", - "Topic :: Software Development :: Libraries :: Python Modules", ], + platforms="Posix; MacOS X; Windows", + packages=packages, + python_requires=">=3.7", + namespace_packages=namespaces, + install_requires=dependencies, + include_package_data=True, zip_safe=False, ) diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.10.txt +++ b/testing/constraints-3.10.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.11.txt +++ b/testing/constraints-3.11.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index fb33557f..883a87ae 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -1,11 +1,10 @@ # This constraints file is used to check that lower bounds # are correct in setup.py -# List *all* library dependencies and extras in this file. +# List all library dependencies and extras in this file. # Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.32.0 +# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", +# Then this file should have google-cloud-foo==1.14.0 +google-api-core==1.33.2 proto-plus==1.22.0 -grpc-google-iam-v1==0.12.4 protobuf==3.19.5 +grpc-google-iam-v1==0.12.4 diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.8.txt +++ b/testing/constraints-3.8.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1