feat: [google-cloud-dataplex] updated client libraries for Dataplex C…

…atalog: removed deprecated fields, updated comments (#12657) BEGIN_COMMIT_OVERRIDE feat: updated client libraries for Dataplex Catalog: removed deprecated fields, updated comments fix!: An existing field `entry` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `display_name` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `entry_type` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `modify_time` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `fully_qualified_name` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `description` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `relative_resource` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` docs: A comment for field `aspects` in message `.google.cloud.dataplex.v1.Entry` is changed docs: A comment for field `filter` in message `.google.cloud.dataplex.v1.ListEntriesRequest` is changed END_COMMIT_OVERRIDE - [ ] Regenerate this pull request now. fix!: An existing field `entry` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `display_name` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `entry_type` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `modify_time` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `fully_qualified_name` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `description` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` fix!: An existing field `relative_resource` is removed from message `.google.cloud.dataplex.v1.SearchEntriesResult` docs: A comment for field `aspects` in message `.google.cloud.dataplex.v1.Entry` is changed docs: A comment for field `filter` in message `.google.cloud.dataplex.v1.ListEntriesRequest` is changed PiperOrigin-RevId: 630090353 Source-Link: googleapis/googleapis@7ea9f2c Source-Link: googleapis/googleapis-gen@7a1cca7 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRhdGFwbGV4Ly5Pd2xCb3QueWFtbCIsImgiOiI3YTFjY2E3OTgyZTVhY2UyOTVhYWFkMTk0MjY3Y2M1ZDA1YzExZDU4In0= --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: ohmayr <omairnaveed@ymail.com>
googleapis · May 10, 2024 · fd6e39c · fd6e39c
1 parent 9722673
commit fd6e39c
Show file tree

Hide file tree

Showing 33 changed files with 11,292 additions and 1,918 deletions.
diff --git a/...s/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py b/...s/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py
diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py
diff --git a/...oogle-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py b/...oogle-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py
@@ -58,7 +58,7 @@ def __init__(
         credentials: Optional[ga_credentials.Credentials] = None,
         credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
-        channel: Optional[grpc.Channel] = None,
+        channel: Optional[Union[grpc.Channel, Callable[..., 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,
@@ -78,14 +78,17 @@ def __init__(
                 credentials identify the application to the service; if none
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if a ``channel`` instance is provided.
             credentials_file (Optional[str]): A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if a ``channel`` instance is provided.
             scopes (Optional(Sequence[str])): A list of scopes. This argument is
-                ignored if ``channel`` is provided.
-            channel (Optional[grpc.Channel]): A ``Channel`` instance through
-                which to make calls.
+                ignored if a ``channel`` instance is provided.
+            channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
+                A ``Channel`` instance through which to make calls, or a Callable
+                that constructs and returns one. If set to None, ``self.create_channel``
+                is used to create the channel. If a Callable is given, it will be called
+                with the same arguments as used in ``self.create_channel``.
             api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint.
                 If provided, it overrides the ``host`` argument and tries to create
                 a mutual TLS channel with client SSL credentials from
@@ -95,11 +98,11 @@ def __init__(
                 private key bytes, both in PEM format. It is ignored if
                 ``api_mtls_endpoint`` is None.
             ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
-                for the grpc channel. It is ignored if ``channel`` is provided.
+                for the grpc channel. It is ignored if a ``channel`` instance is provided.
             client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]):
                 A callback to provide client certificate bytes and private key bytes,
                 both in PEM format. It is used to configure a mutual TLS channel. It is
-                ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
+                ignored if a ``channel`` instance or ``ssl_channel_credentials`` is provided.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.
             client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -126,7 +129,7 @@ def __init__(
         if client_cert_source:
             warnings.warn("client_cert_source is deprecated", DeprecationWarning)
 
-        if channel:
+        if isinstance(channel, grpc.Channel):
             # Ignore credentials if a channel was passed.
             credentials = False
             # If a channel was explicitly provided, set it.
@@ -167,7 +170,9 @@ def __init__(
         )
 
         if not self._grpc_channel:
-            self._grpc_channel = type(self).create_channel(
+            # initialize with the provided callable or the default channel
+            channel_init = channel or type(self).create_channel
+            self._grpc_channel = channel_init(
                 self._host,
                 # use the credentials which are saved
                 credentials=self._credentials,

diff --git a/...oud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py b/...oud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py
@@ -16,7 +16,9 @@
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 import warnings
 
+from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1, grpc_helpers_async, operations_v1
+from google.api_core import retry_async as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.cloud.location import locations_pb2  # type: ignore
@@ -73,7 +75,6 @@ def create_channel(
                 the credentials from the environment.
             credentials_file (Optional[str]): A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is ignored if ``channel`` is provided.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
@@ -103,7 +104,7 @@ def __init__(
         credentials: Optional[ga_credentials.Credentials] = None,
         credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
-        channel: Optional[aio.Channel] = None,
+        channel: Optional[Union[aio.Channel, Callable[..., 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,
@@ -123,15 +124,18 @@ def __init__(
                 credentials identify the application to the service; if none
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if a ``channel`` instance is provided.
             credentials_file (Optional[str]): A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if a ``channel`` instance is provided.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
-            channel (Optional[aio.Channel]): A ``Channel`` instance through
-                which to make calls.
+            channel (Optional[Union[aio.Channel, Callable[..., aio.Channel]]]):
+                A ``Channel`` instance through which to make calls, or a Callable
+                that constructs and returns one. If set to None, ``self.create_channel``
+                is used to create the channel. If a Callable is given, it will be called
+                with the same arguments as used in ``self.create_channel``.
             api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint.
                 If provided, it overrides the ``host`` argument and tries to create
                 a mutual TLS channel with client SSL credentials from
@@ -141,11 +145,11 @@ def __init__(
                 private key bytes, both in PEM format. It is ignored if
                 ``api_mtls_endpoint`` is None.
             ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
-                for the grpc channel. It is ignored if ``channel`` is provided.
+                for the grpc channel. It is ignored if a ``channel`` instance is provided.
             client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]):
                 A callback to provide client certificate bytes and private key bytes,
                 both in PEM format. It is used to configure a mutual TLS channel. It is
-                ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
+                ignored if a ``channel`` instance or ``ssl_channel_credentials`` is provided.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.
             client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -172,7 +176,7 @@ def __init__(
         if client_cert_source:
             warnings.warn("client_cert_source is deprecated", DeprecationWarning)
 
-        if channel:
+        if isinstance(channel, aio.Channel):
             # Ignore credentials if a channel was passed.
             credentials = False
             # If a channel was explicitly provided, set it.
@@ -212,7 +216,9 @@ def __init__(
         )
 
         if not self._grpc_channel:
-            self._grpc_channel = type(self).create_channel(
+            # initialize with the provided callable or the default channel
+            channel_init = channel or type(self).create_channel
+            self._grpc_channel = channel_init(
                 self._host,
                 # use the credentials which are saved
                 credentials=self._credentials,
@@ -855,6 +861,231 @@ def search_entries(
             )
         return self._stubs["search_entries"]
 
+    def _prep_wrapped_messages(self, client_info):
+        """Precompute the wrapped methods, overriding the base class method to use async wrappers."""
+        self._wrapped_methods = {
+            self.create_entry_type: gapic_v1.method_async.wrap_method(
+                self.create_entry_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.update_entry_type: gapic_v1.method_async.wrap_method(
+                self.update_entry_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.delete_entry_type: gapic_v1.method_async.wrap_method(
+                self.delete_entry_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.list_entry_types: gapic_v1.method_async.wrap_method(
+                self.list_entry_types,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.get_entry_type: gapic_v1.method_async.wrap_method(
+                self.get_entry_type,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.create_aspect_type: gapic_v1.method_async.wrap_method(
+                self.create_aspect_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.update_aspect_type: gapic_v1.method_async.wrap_method(
+                self.update_aspect_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.delete_aspect_type: gapic_v1.method_async.wrap_method(
+                self.delete_aspect_type,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.list_aspect_types: gapic_v1.method_async.wrap_method(
+                self.list_aspect_types,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.get_aspect_type: gapic_v1.method_async.wrap_method(
+                self.get_aspect_type,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.create_entry_group: gapic_v1.method_async.wrap_method(
+                self.create_entry_group,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.update_entry_group: gapic_v1.method_async.wrap_method(
+                self.update_entry_group,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.delete_entry_group: gapic_v1.method_async.wrap_method(
+                self.delete_entry_group,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.list_entry_groups: gapic_v1.method_async.wrap_method(
+                self.list_entry_groups,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.get_entry_group: gapic_v1.method_async.wrap_method(
+                self.get_entry_group,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.create_entry: gapic_v1.method_async.wrap_method(
+                self.create_entry,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.update_entry: gapic_v1.method_async.wrap_method(
+                self.update_entry,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.delete_entry: gapic_v1.method_async.wrap_method(
+                self.delete_entry,
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+            self.list_entries: gapic_v1.method_async.wrap_method(
+                self.list_entries,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=20.0,
+                ),
+                default_timeout=20.0,
+                client_info=client_info,
+            ),
+            self.get_entry: gapic_v1.method_async.wrap_method(
+                self.get_entry,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=20.0,
+                ),
+                default_timeout=20.0,
+                client_info=client_info,
+            ),
+            self.lookup_entry: gapic_v1.method_async.wrap_method(
+                self.lookup_entry,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=20.0,
+                ),
+                default_timeout=20.0,
+                client_info=client_info,
+            ),
+            self.search_entries: gapic_v1.method_async.wrap_method(
+                self.search_entries,
+                default_retry=retries.AsyncRetry(
+                    initial=1.0,
+                    maximum=10.0,
+                    multiplier=1.3,
+                    predicate=retries.if_exception_type(
+                        core_exceptions.ResourceExhausted,
+                        core_exceptions.ServiceUnavailable,
+                    ),
+                    deadline=60.0,
+                ),
+                default_timeout=60.0,
+                client_info=client_info,
+            ),
+        }
+
     def close(self):
         return self.grpc_channel.close()