diff --git a/google/cloud/datacatalog_v1/services/data_catalog/async_client.py b/google/cloud/datacatalog_v1/services/data_catalog/async_client.py index 400d4b3e..14440363 100644 --- a/google/cloud/datacatalog_v1/services/data_catalog/async_client.py +++ b/google/cloud/datacatalog_v1/services/data_catalog/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import common from google.cloud.datacatalog_v1.types import data_source @@ -189,11 +191,11 @@ def __init__( async def search_catalog( self, - request: datacatalog.SearchCatalogRequest = None, + request: Union[datacatalog.SearchCatalogRequest, dict] = None, *, scope: datacatalog.SearchCatalogRequest.Scope = None, query: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.SearchCatalogAsyncPager: @@ -215,7 +217,7 @@ async def search_catalog( (https://cloud.google.com/data-catalog/docs/how-to/search-reference). Args: - request (:class:`google.cloud.datacatalog_v1.types.SearchCatalogRequest`): + request (Union[google.cloud.datacatalog_v1.types.SearchCatalogRequest, dict]): The request object. Request message for [SearchCatalog][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]. scope (:class:`google.cloud.datacatalog_v1.types.SearchCatalogRequest.Scope`): @@ -313,12 +315,12 @@ async def search_catalog( async def create_entry_group( self, - request: datacatalog.CreateEntryGroupRequest = None, + request: Union[datacatalog.CreateEntryGroupRequest, dict] = None, *, parent: str = None, entry_group_id: str = None, entry_group: datacatalog.EntryGroup = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -354,7 +356,7 @@ async def create_entry_group( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateEntryGroupRequest, dict]): The request object. Request message for [CreateEntryGroup][google.cloud.datacatalog.v1.DataCatalog.CreateEntryGroup]. parent (:class:`str`): @@ -444,18 +446,18 @@ async def create_entry_group( async def get_entry_group( self, - request: datacatalog.GetEntryGroupRequest = None, + request: Union[datacatalog.GetEntryGroupRequest, dict] = None, *, name: str = None, read_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: r"""Gets an entry group. Args: - request (:class:`google.cloud.datacatalog_v1.types.GetEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1.types.GetEntryGroupRequest, dict]): The request object. Request message for [GetEntryGroup][google.cloud.datacatalog.v1.DataCatalog.GetEntryGroup]. name (:class:`str`): @@ -537,11 +539,11 @@ async def get_entry_group( async def update_entry_group( self, - request: datacatalog.UpdateEntryGroupRequest = None, + request: Union[datacatalog.UpdateEntryGroupRequest, dict] = None, *, entry_group: datacatalog.EntryGroup = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -553,7 +555,7 @@ async def update_entry_group( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateEntryGroupRequest, dict]): The request object. Request message for [UpdateEntryGroup][google.cloud.datacatalog.v1.DataCatalog.UpdateEntryGroup]. entry_group (:class:`google.cloud.datacatalog_v1.types.EntryGroup`): @@ -633,10 +635,10 @@ async def update_entry_group( async def delete_entry_group( self, - request: datacatalog.DeleteEntryGroupRequest = None, + request: Union[datacatalog.DeleteEntryGroupRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -648,7 +650,7 @@ async def delete_entry_group( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteEntryGroupRequest, dict]): The request object. Request message for [DeleteEntryGroup][google.cloud.datacatalog.v1.DataCatalog.DeleteEntryGroup]. name (:class:`str`): @@ -702,17 +704,17 @@ async def delete_entry_group( async def list_entry_groups( self, - request: datacatalog.ListEntryGroupsRequest = None, + request: Union[datacatalog.ListEntryGroupsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntryGroupsAsyncPager: r"""Lists entry groups. Args: - request (:class:`google.cloud.datacatalog_v1.types.ListEntryGroupsRequest`): + request (Union[google.cloud.datacatalog_v1.types.ListEntryGroupsRequest, dict]): The request object. Request message for [ListEntryGroups][google.cloud.datacatalog.v1.DataCatalog.ListEntryGroups]. parent (:class:`str`): @@ -792,12 +794,12 @@ async def list_entry_groups( async def create_entry( self, - request: datacatalog.CreateEntryRequest = None, + request: Union[datacatalog.CreateEntryRequest, dict] = None, *, parent: str = None, entry_id: str = None, entry: datacatalog.Entry = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -816,7 +818,7 @@ async def create_entry( An entry group can have a maximum of 100,000 entries. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateEntryRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateEntryRequest, dict]): The request object. Request message for [CreateEntry][google.cloud.datacatalog.v1.DataCatalog.CreateEntry]. parent (:class:`str`): @@ -908,11 +910,11 @@ async def create_entry( async def update_entry( self, - request: datacatalog.UpdateEntryRequest = None, + request: Union[datacatalog.UpdateEntryRequest, dict] = None, *, entry: datacatalog.Entry = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -924,7 +926,7 @@ async def update_entry( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateEntryRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateEntryRequest, dict]): The request object. Request message for [UpdateEntry][google.cloud.datacatalog.v1.DataCatalog.UpdateEntry]. entry (:class:`google.cloud.datacatalog_v1.types.Entry`): @@ -1033,10 +1035,10 @@ async def update_entry( async def delete_entry( self, - request: datacatalog.DeleteEntryRequest = None, + request: Union[datacatalog.DeleteEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1052,7 +1054,7 @@ async def delete_entry( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteEntryRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteEntryRequest, dict]): The request object. Request message for [DeleteEntry][google.cloud.datacatalog.v1.DataCatalog.DeleteEntry]. name (:class:`str`): @@ -1106,17 +1108,17 @@ async def delete_entry( async def get_entry( self, - request: datacatalog.GetEntryRequest = None, + request: Union[datacatalog.GetEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: r"""Gets an entry. Args: - request (:class:`google.cloud.datacatalog_v1.types.GetEntryRequest`): + request (Union[google.cloud.datacatalog_v1.types.GetEntryRequest, dict]): The request object. Request message for [GetEntry][google.cloud.datacatalog.v1.DataCatalog.GetEntry]. name (:class:`str`): @@ -1195,9 +1197,9 @@ async def get_entry( async def lookup_entry( self, - request: datacatalog.LookupEntryRequest = None, + request: Union[datacatalog.LookupEntryRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1206,7 +1208,7 @@ async def lookup_entry( Platform service. Args: - request (:class:`google.cloud.datacatalog_v1.types.LookupEntryRequest`): + request (Union[google.cloud.datacatalog_v1.types.LookupEntryRequest, dict]): The request object. Request message for [LookupEntry][google.cloud.datacatalog.v1.DataCatalog.LookupEntry]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1258,17 +1260,17 @@ async def lookup_entry( async def list_entries( self, - request: datacatalog.ListEntriesRequest = None, + request: Union[datacatalog.ListEntriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntriesAsyncPager: r"""Lists entries. Args: - request (:class:`google.cloud.datacatalog_v1.types.ListEntriesRequest`): + request (Union[google.cloud.datacatalog_v1.types.ListEntriesRequest, dict]): The request object. Request message for [ListEntries][google.cloud.datacatalog.v1.DataCatalog.ListEntries]. parent (:class:`str`): @@ -1348,12 +1350,12 @@ async def list_entries( async def create_tag_template( self, - request: datacatalog.CreateTagTemplateRequest = None, + request: Union[datacatalog.CreateTagTemplateRequest, dict] = None, *, parent: str = None, tag_template_id: str = None, tag_template: tags.TagTemplate = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1365,7 +1367,7 @@ async def create_tag_template( (https://cloud.google.com/data-catalog/docs/concepts/resource-project). Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateTagTemplateRequest, dict]): The request object. Request message for [CreateTagTemplate][google.cloud.datacatalog.v1.DataCatalog.CreateTagTemplate]. parent (:class:`str`): @@ -1456,17 +1458,17 @@ async def create_tag_template( async def get_tag_template( self, - request: datacatalog.GetTagTemplateRequest = None, + request: Union[datacatalog.GetTagTemplateRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: r"""Gets a tag template. Args: - request (:class:`google.cloud.datacatalog_v1.types.GetTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1.types.GetTagTemplateRequest, dict]): The request object. Request message for [GetTagTemplate][google.cloud.datacatalog.v1.DataCatalog.GetTagTemplate]. name (:class:`str`): @@ -1536,11 +1538,11 @@ async def get_tag_template( async def update_tag_template( self, - request: datacatalog.UpdateTagTemplateRequest = None, + request: Union[datacatalog.UpdateTagTemplateRequest, dict] = None, *, tag_template: tags.TagTemplate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1556,7 +1558,7 @@ async def update_tag_template( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateTagTemplateRequest, dict]): The request object. Request message for [UpdateTagTemplate][google.cloud.datacatalog.v1.DataCatalog.UpdateTagTemplate]. tag_template (:class:`google.cloud.datacatalog_v1.types.TagTemplate`): @@ -1643,11 +1645,11 @@ async def update_tag_template( async def delete_tag_template( self, - request: datacatalog.DeleteTagTemplateRequest = None, + request: Union[datacatalog.DeleteTagTemplateRequest, dict] = None, *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1659,7 +1661,7 @@ async def delete_tag_template( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteTagTemplateRequest, dict]): The request object. Request message for [DeleteTagTemplate][google.cloud.datacatalog.v1.DataCatalog.DeleteTagTemplate]. name (:class:`str`): @@ -1724,12 +1726,12 @@ async def delete_tag_template( async def create_tag_template_field( self, - request: datacatalog.CreateTagTemplateFieldRequest = None, + request: Union[datacatalog.CreateTagTemplateFieldRequest, dict] = None, *, parent: str = None, tag_template_field_id: str = None, tag_template_field: tags.TagTemplateField = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1741,7 +1743,7 @@ async def create_tag_template_field( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateTagTemplateFieldRequest, dict]): The request object. Request message for [CreateTagTemplateField][google.cloud.datacatalog.v1.DataCatalog.CreateTagTemplateField]. parent (:class:`str`): @@ -1829,12 +1831,12 @@ async def create_tag_template_field( async def update_tag_template_field( self, - request: datacatalog.UpdateTagTemplateFieldRequest = None, + request: Union[datacatalog.UpdateTagTemplateFieldRequest, dict] = None, *, name: str = None, tag_template_field: tags.TagTemplateField = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1848,7 +1850,7 @@ async def update_tag_template_field( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateTagTemplateFieldRequest, dict]): The request object. Request message for [UpdateTagTemplateField][google.cloud.datacatalog.v1.DataCatalog.UpdateTagTemplateField]. name (:class:`str`): @@ -1941,11 +1943,11 @@ async def update_tag_template_field( async def rename_tag_template_field( self, - request: datacatalog.RenameTagTemplateFieldRequest = None, + request: Union[datacatalog.RenameTagTemplateFieldRequest, dict] = None, *, name: str = None, new_tag_template_field_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1957,7 +1959,7 @@ async def rename_tag_template_field( (https://cloud.google.com/data-catalog/docs/concepts/resource-project). Args: - request (:class:`google.cloud.datacatalog_v1.types.RenameTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1.types.RenameTagTemplateFieldRequest, dict]): The request object. Request message for [RenameTagTemplateField][google.cloud.datacatalog.v1.DataCatalog.RenameTagTemplateField]. name (:class:`str`): @@ -2027,11 +2029,11 @@ async def rename_tag_template_field( async def rename_tag_template_field_enum_value( self, - request: datacatalog.RenameTagTemplateFieldEnumValueRequest = None, + request: Union[datacatalog.RenameTagTemplateFieldEnumValueRequest, dict] = None, *, name: str = None, new_enum_value_display_name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2039,7 +2041,7 @@ async def rename_tag_template_field_enum_value( Within a single enum field, enum values must be unique. Args: - request (:class:`google.cloud.datacatalog_v1.types.RenameTagTemplateFieldEnumValueRequest`): + request (Union[google.cloud.datacatalog_v1.types.RenameTagTemplateFieldEnumValueRequest, dict]): The request object. Request message for [RenameTagTemplateFieldEnumValue][google.cloud.datacatalog.v1.DataCatalog.RenameTagTemplateFieldEnumValue]. name (:class:`str`): @@ -2109,11 +2111,11 @@ async def rename_tag_template_field_enum_value( async def delete_tag_template_field( self, - request: datacatalog.DeleteTagTemplateFieldRequest = None, + request: Union[datacatalog.DeleteTagTemplateFieldRequest, dict] = None, *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2126,7 +2128,7 @@ async def delete_tag_template_field( project `__. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteTagTemplateFieldRequest, dict]): The request object. Request message for [DeleteTagTemplateField][google.cloud.datacatalog.v1.DataCatalog.DeleteTagTemplateField]. name (:class:`str`): @@ -2191,11 +2193,11 @@ async def delete_tag_template_field( async def create_tag( self, - request: datacatalog.CreateTagRequest = None, + request: Union[datacatalog.CreateTagRequest, dict] = None, *, parent: str = None, tag: tags.Tag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2216,7 +2218,7 @@ async def create_tag( used to create the tag must be in the same organization. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateTagRequest, dict]): The request object. Request message for [CreateTag][google.cloud.datacatalog.v1.DataCatalog.CreateTag]. parent (:class:`str`): @@ -2296,18 +2298,18 @@ async def create_tag( async def update_tag( self, - request: datacatalog.UpdateTagRequest = None, + request: Union[datacatalog.UpdateTagRequest, dict] = None, *, tag: tags.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: r"""Updates an existing tag. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateTagRequest, dict]): The request object. Request message for [UpdateTag][google.cloud.datacatalog.v1.DataCatalog.UpdateTag]. tag (:class:`google.cloud.datacatalog_v1.types.Tag`): @@ -2388,17 +2390,17 @@ async def update_tag( async def delete_tag( self, - request: datacatalog.DeleteTagRequest = None, + request: Union[datacatalog.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a tag. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteTagRequest, dict]): The request object. Request message for [DeleteTag][google.cloud.datacatalog.v1.DataCatalog.DeleteTag]. name (:class:`str`): @@ -2452,10 +2454,10 @@ async def delete_tag( async def list_tags( self, - request: datacatalog.ListTagsRequest = None, + request: Union[datacatalog.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsAsyncPager: @@ -2463,7 +2465,7 @@ async def list_tags( [Entry][google.cloud.datacatalog.v1.Entry]. Args: - request (:class:`google.cloud.datacatalog_v1.types.ListTagsRequest`): + request (Union[google.cloud.datacatalog_v1.types.ListTagsRequest, dict]): The request object. Request message for [ListTags][google.cloud.datacatalog.v1.DataCatalog.ListTags]. parent (:class:`str`): @@ -2547,10 +2549,10 @@ async def list_tags( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2576,7 +2578,7 @@ async def set_iam_policy( entry groups. Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (:class:`str`): @@ -2692,10 +2694,10 @@ async def set_iam_policy( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2725,7 +2727,7 @@ async def get_iam_policy( entry groups. Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (:class:`str`): @@ -2850,9 +2852,9 @@ async def get_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -2872,7 +2874,7 @@ async def test_iam_permissions( method. Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (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/datacatalog_v1/services/data_catalog/client.py b/google/cloud/datacatalog_v1/services/data_catalog/client.py index 0b1f889f..cba5d7a5 100644 --- a/google/cloud/datacatalog_v1/services/data_catalog/client.py +++ b/google/cloud/datacatalog_v1/services/data_catalog/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import common from google.cloud.datacatalog_v1.types import data_source @@ -463,7 +465,7 @@ def search_catalog( *, scope: datacatalog.SearchCatalogRequest.Scope = None, query: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.SearchCatalogPager: @@ -579,7 +581,7 @@ def create_entry_group( parent: str = None, entry_group_id: str = None, entry_group: datacatalog.EntryGroup = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -709,7 +711,7 @@ def get_entry_group( *, name: str = None, read_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -793,7 +795,7 @@ def update_entry_group( *, entry_group: datacatalog.EntryGroup = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -888,7 +890,7 @@ def delete_entry_group( request: Union[datacatalog.DeleteEntryGroupRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -957,7 +959,7 @@ def list_entry_groups( request: Union[datacatalog.ListEntryGroupsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntryGroupsPager: @@ -1040,7 +1042,7 @@ def create_entry( parent: str = None, entry_id: str = None, entry: datacatalog.Entry = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1155,7 +1157,7 @@ def update_entry( *, entry: datacatalog.Entry = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1279,7 +1281,7 @@ def delete_entry( request: Union[datacatalog.DeleteEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1352,7 +1354,7 @@ def get_entry( request: Union[datacatalog.GetEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1431,7 +1433,7 @@ def lookup_entry( self, request: Union[datacatalog.LookupEntryRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1487,7 +1489,7 @@ def list_entries( request: Union[datacatalog.ListEntriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntriesPager: @@ -1570,7 +1572,7 @@ def create_tag_template( parent: str = None, tag_template_id: str = None, tag_template: tags.TagTemplate = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1676,7 +1678,7 @@ def get_tag_template( request: Union[datacatalog.GetTagTemplateRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1757,7 +1759,7 @@ def update_tag_template( *, tag_template: tags.TagTemplate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1864,7 +1866,7 @@ def delete_tag_template( *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1946,7 +1948,7 @@ def create_tag_template_field( parent: str = None, tag_template_field_id: str = None, tag_template_field: tags.TagTemplateField = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2053,7 +2055,7 @@ def update_tag_template_field( name: str = None, tag_template_field: tags.TagTemplateField = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2166,7 +2168,7 @@ def rename_tag_template_field( *, name: str = None, new_tag_template_field_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2254,7 +2256,7 @@ def rename_tag_template_field_enum_value( *, name: str = None, new_enum_value_display_name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2338,7 +2340,7 @@ def delete_tag_template_field( *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2422,7 +2424,7 @@ def create_tag( *, parent: str = None, tag: tags.Tag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2527,7 +2529,7 @@ def update_tag( *, tag: tags.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2618,7 +2620,7 @@ def delete_tag( request: Union[datacatalog.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2682,7 +2684,7 @@ def list_tags( request: Union[datacatalog.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsPager: @@ -2768,7 +2770,7 @@ def set_iam_policy( request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2912,7 +2914,7 @@ def get_iam_policy( request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -3059,7 +3061,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py b/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py index 1aaec027..5ac22b0d 100644 --- a/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py +++ b/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -41,15 +40,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class DataCatalogTransport(abc.ABC): """Abstract transport class for DataCatalog.""" @@ -99,7 +89,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -132,29 +122,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py index 2b5c9492..9836b2a1 100644 --- a/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py b/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py index 97a54031..9488330f 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import timestamps @@ -174,11 +176,11 @@ def __init__( async def create_taxonomy( self, - request: policytagmanager.CreateTaxonomyRequest = None, + request: Union[policytagmanager.CreateTaxonomyRequest, dict] = None, *, parent: str = None, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -187,7 +189,7 @@ async def create_taxonomy( contain policy tags. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreateTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreateTaxonomyRequest, dict]): The request object. Request message for [CreateTaxonomy][google.cloud.datacatalog.v1.PolicyTagManager.CreateTaxonomy]. parent (:class:`str`): @@ -266,10 +268,10 @@ async def create_taxonomy( async def delete_taxonomy( self, - request: policytagmanager.DeleteTaxonomyRequest = None, + request: Union[policytagmanager.DeleteTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -278,7 +280,7 @@ async def delete_taxonomy( references from BigQuery columns. Args: - request (:class:`google.cloud.datacatalog_v1.types.DeleteTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeleteTaxonomyRequest, dict]): The request object. Request message for [DeleteTaxonomy][google.cloud.datacatalog.v1.PolicyTagManager.DeleteTaxonomy]. name (:class:`str`): @@ -334,10 +336,10 @@ async def delete_taxonomy( async def update_taxonomy( self, - request: policytagmanager.UpdateTaxonomyRequest = None, + request: Union[policytagmanager.UpdateTaxonomyRequest, dict] = None, *, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -345,7 +347,7 @@ async def update_taxonomy( description, and activated policy types. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdateTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdateTaxonomyRequest, dict]): The request object. Request message for [UpdateTaxonomy][google.cloud.datacatalog.v1.PolicyTagManager.UpdateTaxonomy]. taxonomy (:class:`google.cloud.datacatalog_v1.types.Taxonomy`): @@ -419,10 +421,10 @@ async def update_taxonomy( async def list_taxonomies( self, - request: policytagmanager.ListTaxonomiesRequest = None, + request: Union[policytagmanager.ListTaxonomiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTaxonomiesAsyncPager: @@ -430,7 +432,7 @@ async def list_taxonomies( location that you have a permission to view. Args: - request (:class:`google.cloud.datacatalog_v1.types.ListTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1.types.ListTaxonomiesRequest, dict]): The request object. Request message for [ListTaxonomies][google.cloud.datacatalog.v1.PolicyTagManager.ListTaxonomies]. parent (:class:`str`): @@ -500,17 +502,17 @@ async def list_taxonomies( async def get_taxonomy( self, - request: policytagmanager.GetTaxonomyRequest = None, + request: Union[policytagmanager.GetTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: r"""Gets a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1.types.GetTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1.types.GetTaxonomyRequest, dict]): The request object. Request message for [GetTaxonomy][google.cloud.datacatalog.v1.PolicyTagManager.GetTaxonomy]. name (:class:`str`): @@ -581,18 +583,18 @@ async def get_taxonomy( async def create_policy_tag( self, - request: policytagmanager.CreatePolicyTagRequest = None, + request: Union[policytagmanager.CreatePolicyTagRequest, dict] = None, *, parent: str = None, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: r"""Creates a policy tag in a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1.types.CreatePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.CreatePolicyTagRequest, dict]): The request object. Request message for [CreatePolicyTag][google.cloud.datacatalog.v1.PolicyTagManager.CreatePolicyTag]. parent (:class:`str`): @@ -668,10 +670,10 @@ async def create_policy_tag( async def delete_policy_tag( self, - request: policytagmanager.DeletePolicyTagRequest = None, + request: Union[policytagmanager.DeletePolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -683,7 +685,7 @@ async def delete_policy_tag( its descendants Args: - request (:class:`google.cloud.datacatalog_v1.types.DeletePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.DeletePolicyTagRequest, dict]): The request object. Request message for [DeletePolicyTag][google.cloud.datacatalog.v1.PolicyTagManager.DeletePolicyTag]. name (:class:`str`): @@ -739,10 +741,10 @@ async def delete_policy_tag( async def update_policy_tag( self, - request: policytagmanager.UpdatePolicyTagRequest = None, + request: Union[policytagmanager.UpdatePolicyTagRequest, dict] = None, *, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -750,7 +752,7 @@ async def update_policy_tag( name, description, and parent policy tag. Args: - request (:class:`google.cloud.datacatalog_v1.types.UpdatePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.UpdatePolicyTagRequest, dict]): The request object. Request message for [UpdatePolicyTag][google.cloud.datacatalog.v1.PolicyTagManager.UpdatePolicyTag]. policy_tag (:class:`google.cloud.datacatalog_v1.types.PolicyTag`): @@ -821,17 +823,17 @@ async def update_policy_tag( async def list_policy_tags( self, - request: policytagmanager.ListPolicyTagsRequest = None, + request: Union[policytagmanager.ListPolicyTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPolicyTagsAsyncPager: r"""Lists all policy tags in a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1.types.ListPolicyTagsRequest`): + request (Union[google.cloud.datacatalog_v1.types.ListPolicyTagsRequest, dict]): The request object. Request message for [ListPolicyTags][google.cloud.datacatalog.v1.PolicyTagManager.ListPolicyTags]. parent (:class:`str`): @@ -901,17 +903,17 @@ async def list_policy_tags( async def get_policy_tag( self, - request: policytagmanager.GetPolicyTagRequest = None, + request: Union[policytagmanager.GetPolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: r"""Gets a policy tag. Args: - request (:class:`google.cloud.datacatalog_v1.types.GetPolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1.types.GetPolicyTagRequest, dict]): The request object. Request message for [GetPolicyTag][google.cloud.datacatalog.v1.PolicyTagManager.GetPolicyTag]. name (:class:`str`): @@ -979,16 +981,16 @@ async def get_policy_tag( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM policy for a policy tag or a taxonomy. Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (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, @@ -1084,16 +1086,16 @@ async def get_iam_policy( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM policy for a policy tag or a taxonomy. Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (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, @@ -1189,9 +1191,9 @@ async def set_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -1199,7 +1201,7 @@ async def test_iam_permissions( taxonomy. Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (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/datacatalog_v1/services/policy_tag_manager/client.py b/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py index e293cc20..8c3f131e 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import timestamps @@ -383,7 +385,7 @@ def create_taxonomy( *, parent: str = None, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -474,7 +476,7 @@ def delete_taxonomy( request: Union[policytagmanager.DeleteTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -542,7 +544,7 @@ def update_taxonomy( request: Union[policytagmanager.UpdateTaxonomyRequest, dict] = None, *, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -627,7 +629,7 @@ def list_taxonomies( request: Union[policytagmanager.ListTaxonomiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTaxonomiesPager: @@ -708,7 +710,7 @@ def get_taxonomy( request: Union[policytagmanager.GetTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -790,7 +792,7 @@ def create_policy_tag( *, parent: str = None, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -876,7 +878,7 @@ def delete_policy_tag( request: Union[policytagmanager.DeletePolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -947,7 +949,7 @@ def update_policy_tag( request: Union[policytagmanager.UpdatePolicyTagRequest, dict] = None, *, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -1029,7 +1031,7 @@ def list_policy_tags( request: Union[policytagmanager.ListPolicyTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPolicyTagsPager: @@ -1109,7 +1111,7 @@ def get_policy_tag( request: Union[policytagmanager.GetPolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -1186,7 +1188,7 @@ def get_iam_policy( self, request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -1290,7 +1292,7 @@ def set_iam_policy( self, request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -1394,7 +1396,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py b/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py index 70e3998d..57f9d627 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -40,15 +39,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class PolicyTagManagerTransport(abc.ABC): """Abstract transport class for PolicyTagManager.""" @@ -98,7 +88,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -131,29 +121,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py index d830cccd..4737e415 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py index 312321dd..b260011c 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import policytagmanagerserialization from google.cloud.datacatalog_v1.types import timestamps @@ -177,9 +179,11 @@ def __init__( async def replace_taxonomy( self, - request: policytagmanagerserialization.ReplaceTaxonomyRequest = None, + request: Union[ + policytagmanagerserialization.ReplaceTaxonomyRequest, dict + ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -198,7 +202,7 @@ async def replace_taxonomy( - Updates policy tags with valid resources names accordingly. Args: - request (:class:`google.cloud.datacatalog_v1.types.ReplaceTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1.types.ReplaceTaxonomyRequest, dict]): The request object. Request message for [ReplaceTaxonomy][google.cloud.datacatalog.v1.PolicyTagManagerSerialization.ReplaceTaxonomy]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -248,9 +252,11 @@ async def replace_taxonomy( async def import_taxonomies( self, - request: policytagmanagerserialization.ImportTaxonomiesRequest = None, + request: Union[ + policytagmanagerserialization.ImportTaxonomiesRequest, dict + ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ImportTaxonomiesResponse: @@ -264,7 +270,7 @@ async def import_taxonomies( created in bulk using nested protocol buffer structures. Args: - request (:class:`google.cloud.datacatalog_v1.types.ImportTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1.types.ImportTaxonomiesRequest, dict]): The request object. Request message for [ImportTaxonomies][google.cloud.datacatalog.v1.PolicyTagManagerSerialization.ImportTaxonomies]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -304,9 +310,11 @@ async def import_taxonomies( async def export_taxonomies( self, - request: policytagmanagerserialization.ExportTaxonomiesRequest = None, + request: Union[ + policytagmanagerserialization.ExportTaxonomiesRequest, dict + ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ExportTaxonomiesResponse: @@ -319,7 +327,7 @@ async def export_taxonomies( ``ImportTaxonomies`` calls. Args: - request (:class:`google.cloud.datacatalog_v1.types.ExportTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1.types.ExportTaxonomiesRequest, dict]): The request object. Request message for [ExportTaxonomies][google.cloud.datacatalog.v1.PolicyTagManagerSerialization.ExportTaxonomies]. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py index de84ab23..704f0ed4 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import policytagmanagerserialization from google.cloud.datacatalog_v1.types import timestamps @@ -364,7 +366,7 @@ def replace_taxonomy( policytagmanagerserialization.ReplaceTaxonomyRequest, dict ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -440,7 +442,7 @@ def import_taxonomies( policytagmanagerserialization.ImportTaxonomiesRequest, dict ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ImportTaxonomiesResponse: @@ -501,7 +503,7 @@ def export_taxonomies( policytagmanagerserialization.ExportTaxonomiesRequest, dict ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ExportTaxonomiesResponse: diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py index 606a94b2..fc6cca2a 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -38,15 +37,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class PolicyTagManagerSerializationTransport(abc.ABC): """Abstract transport class for PolicyTagManagerSerialization.""" @@ -96,7 +86,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -129,29 +119,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index fb23d026..2452a6f2 100644 --- a/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1/types/bigquery.py b/google/cloud/datacatalog_v1/types/bigquery.py index 2cb5d574..659b3f56 100644 --- a/google/cloud/datacatalog_v1/types/bigquery.py +++ b/google/cloud/datacatalog_v1/types/bigquery.py @@ -29,12 +29,16 @@ class BigQueryConnectionSpec(proto.Message): r"""Specification for the BigQuery connection. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: connection_type (google.cloud.datacatalog_v1.types.BigQueryConnectionSpec.ConnectionType): The type of the BigQuery connection. cloud_sql (google.cloud.datacatalog_v1.types.CloudSqlBigQueryConnectionSpec): Specification for the BigQuery connection to a Cloud SQL instance. + + This field is a member of `oneof`_ ``connection_spec``. has_credential (bool): True if there are credentials attached to the BigQuery connection; false otherwise. diff --git a/google/cloud/datacatalog_v1/types/datacatalog.py b/google/cloud/datacatalog_v1/types/datacatalog.py index 2a8e1e31..3d77aab0 100644 --- a/google/cloud/datacatalog_v1/types/datacatalog.py +++ b/google/cloud/datacatalog_v1/types/datacatalog.py @@ -463,6 +463,13 @@ class LookupEntryRequest(proto.Message): r"""Request message for [LookupEntry][google.cloud.datacatalog.v1.DataCatalog.LookupEntry]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: linked_resource (str): The full name of the Google Cloud Platform resource the Data @@ -474,6 +481,8 @@ class LookupEntryRequest(proto.Message): - ``//bigquery.googleapis.com/projects/{PROJECT_ID}/datasets/{DATASET_ID}/tables/{TABLE_ID}`` - ``//pubsub.googleapis.com/projects/{PROJECT_ID}/topics/{TOPIC_ID}`` + + This field is a member of `oneof`_ ``target_name``. sql_resource (str): The SQL name of the entry. SQL names are case-sensitive. @@ -488,6 +497,8 @@ class LookupEntryRequest(proto.Message): Identifiers (``*_ID``) should comply with the [Lexical structure in Standard SQL] (https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical). + + This field is a member of `oneof`_ ``target_name``. fully_qualified_name (str): Fully qualified name (FQN) of the resource. @@ -504,6 +515,7 @@ class LookupEntryRequest(proto.Message): Example for a DPMS table: ``dataproc_metastore:{PROJECT_ID}.{LOCATION_ID}.{INSTANCE_ID}.{DATABASE_ID}.{TABLE_ID}`` + This field is a member of `oneof`_ ``target_name``. """ linked_resource = proto.Field(proto.STRING, number=1, oneof="target_name",) @@ -522,6 +534,13 @@ class Entry(proto.Message): schema. Additionally, you can attach flexible metadata to an entry in the form of a [Tag][google.cloud.datacatalog.v1.Tag]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): Output only. The resource name of an entry in @@ -577,6 +596,8 @@ class Entry(proto.Message): Currently, only ``FILESET`` enum value is allowed. All other entries created in Data Catalog must use the ``user_specified_type``. + + This field is a member of `oneof`_ ``entry_type``. user_specified_type (str): Custom entry type that doesn't match any of the values allowed for input and listed in the ``EntryType`` enum. @@ -593,10 +614,14 @@ class Entry(proto.Message): - Can only contain letters, numbers, and underscores. - Must be at least 1 character and at most 64 characters long. + + This field is a member of `oneof`_ ``entry_type``. integrated_system (google.cloud.datacatalog_v1.types.IntegratedSystem): Output only. Indicates the entry's source system that Data Catalog integrates with, such as BigQuery, Pub/Sub, or Dataproc Metastore. + + This field is a member of `oneof`_ ``system``. user_specified_system (str): Indicates the entry's source system that Data Catalog doesn't automatically integrate with. @@ -609,12 +634,18 @@ class Entry(proto.Message): - Can only contain letters, numbers, and underscores. - Must be at least 1 character and at most 64 characters long. + + This field is a member of `oneof`_ ``system``. gcs_fileset_spec (google.cloud.datacatalog_v1.types.GcsFilesetSpec): Specification that applies to a Cloud Storage fileset. Valid only for entries with the ``FILESET`` type. + + This field is a member of `oneof`_ ``type_spec``. bigquery_table_spec (google.cloud.datacatalog_v1.types.BigQueryTableSpec): Specification that applies to a BigQuery table. Valid only for entries with the ``TABLE`` type. + + This field is a member of `oneof`_ ``type_spec``. bigquery_date_sharded_spec (google.cloud.datacatalog_v1.types.BigQueryDateShardedSpec): Specification for a group of BigQuery tables with the ``[prefix]YYYYMMDD`` name pattern. @@ -622,16 +653,24 @@ class Entry(proto.Message): For more information, see [Introduction to partitioned tables] (https://cloud.google.com/bigquery/docs/partitioned-tables#partitioning_versus_sharding). + + This field is a member of `oneof`_ ``type_spec``. database_table_spec (google.cloud.datacatalog_v1.types.DatabaseTableSpec): Specification that applies to a table resource. Valid only for entries with the ``TABLE`` type. + + This field is a member of `oneof`_ ``spec``. data_source_connection_spec (google.cloud.datacatalog_v1.types.DataSourceConnectionSpec): Specification that applies to a data source connection. Valid only for entries with the ``DATA_SOURCE_CONNECTION`` type. + + This field is a member of `oneof`_ ``spec``. routine_spec (google.cloud.datacatalog_v1.types.RoutineSpec): Specification that applies to a user-defined function or procedure. Valid only for entries with the ``ROUTINE`` type. + + This field is a member of `oneof`_ ``spec``. display_name (str): Display name of an entry. @@ -757,6 +796,9 @@ class RoutineSpec(proto.Message): r"""Specification that applies to a routine. Valid only for entries with the ``ROUTINE`` type. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: routine_type (google.cloud.datacatalog_v1.types.RoutineSpec.RoutineType): The type of the routine. @@ -776,6 +818,8 @@ class RoutineSpec(proto.Message): The body of the routine. bigquery_routine_spec (google.cloud.datacatalog_v1.types.BigQueryRoutineSpec): Fields specific for BigQuery routines. + + This field is a member of `oneof`_ ``system_spec``. """ class RoutineType(proto.Enum): diff --git a/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py b/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py index f8c86ed3..f234e43e 100644 --- a/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py +++ b/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py @@ -116,14 +116,25 @@ class ImportTaxonomiesRequest(proto.Message): r"""Request message for [ImportTaxonomies][google.cloud.datacatalog.v1.PolicyTagManagerSerialization.ImportTaxonomies]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: parent (str): Required. Resource name of project that the imported taxonomies will belong to. inline_source (google.cloud.datacatalog_v1.types.InlineSource): Inline source taxonomy to import. + + This field is a member of `oneof`_ ``source``. cross_regional_source (google.cloud.datacatalog_v1.types.CrossRegionalSource): Cross-regional source taxonomy to import. + + This field is a member of `oneof`_ ``source``. """ parent = proto.Field(proto.STRING, number=1,) @@ -179,6 +190,9 @@ class ExportTaxonomiesRequest(proto.Message): r"""Request message for [ExportTaxonomies][google.cloud.datacatalog.v1.PolicyTagManagerSerialization.ExportTaxonomies]. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: parent (str): Required. Resource name of the project that @@ -189,6 +203,8 @@ class ExportTaxonomiesRequest(proto.Message): serialized_taxonomies (bool): Serialized export taxonomies that contain all the policy tags as nested protocol buffers. + + This field is a member of `oneof`_ ``destination``. """ parent = proto.Field(proto.STRING, number=1,) diff --git a/google/cloud/datacatalog_v1/types/search.py b/google/cloud/datacatalog_v1/types/search.py index c4423e3e..186475ee 100644 --- a/google/cloud/datacatalog_v1/types/search.py +++ b/google/cloud/datacatalog_v1/types/search.py @@ -38,6 +38,13 @@ class SearchCatalogResult(proto.Message): Each result captures details of one entry that matches the search. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: search_result_type (google.cloud.datacatalog_v1.types.SearchResultType): Type of the search result. @@ -75,9 +82,13 @@ class SearchCatalogResult(proto.Message): Output only. The source system that Data Catalog automatically integrates with, such as BigQuery, Cloud Pub/Sub, or Dataproc Metastore. + + This field is a member of `oneof`_ ``system``. user_specified_system (str): Custom source system that you can manually integrate Data Catalog with. + + This field is a member of `oneof`_ ``system``. fully_qualified_name (str): Fully qualified name (FQN) of the resource. diff --git a/google/cloud/datacatalog_v1/types/table_spec.py b/google/cloud/datacatalog_v1/types/table_spec.py index f3301682..295dc842 100644 --- a/google/cloud/datacatalog_v1/types/table_spec.py +++ b/google/cloud/datacatalog_v1/types/table_spec.py @@ -39,15 +39,26 @@ class TableSourceType(proto.Enum): class BigQueryTableSpec(proto.Message): r"""Describes a BigQuery table. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: table_source_type (google.cloud.datacatalog_v1.types.TableSourceType): Output only. The table source type. view_spec (google.cloud.datacatalog_v1.types.ViewSpec): Table view specification. Populated only if the ``table_source_type`` is ``BIGQUERY_VIEW``. + + This field is a member of `oneof`_ ``type_spec``. table_spec (google.cloud.datacatalog_v1.types.TableSpec): Specification of a BigQuery table. Populated only if the ``table_source_type`` is ``BIGQUERY_TABLE``. + + This field is a member of `oneof`_ ``type_spec``. """ table_source_type = proto.Field(proto.ENUM, number=1, enum="TableSourceType",) diff --git a/google/cloud/datacatalog_v1/types/tags.py b/google/cloud/datacatalog_v1/types/tags.py index 598e565a..8b5b34e9 100644 --- a/google/cloud/datacatalog_v1/types/tags.py +++ b/google/cloud/datacatalog_v1/types/tags.py @@ -33,6 +33,9 @@ class Tag(proto.Message): IAM `__ for information on the permissions needed to create or view tags. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): The resource name of the tag in URL format @@ -56,6 +59,8 @@ class Tag(proto.Message): To attach a tag to a nested column, separate column names with a dot (``.``). Example: ``column.nested_column``. + + This field is a member of `oneof`_ ``scope``. fields (Sequence[google.cloud.datacatalog_v1.types.Tag.FieldsEntry]): Required. Maps the ID of a tag field to its value and additional information about that @@ -76,23 +81,40 @@ class TagField(proto.Message): r"""Contains the value and additional information on a field within a [Tag][google.cloud.datacatalog.v1.Tag]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: display_name (str): Output only. The display name of this field. double_value (float): The value of a tag field with a double type. + + This field is a member of `oneof`_ ``kind``. string_value (str): The value of a tag field with a string type. The maximum length is 2000 UTF-8 characters. + + This field is a member of `oneof`_ ``kind``. bool_value (bool): The value of a tag field with a boolean type. + + This field is a member of `oneof`_ ``kind``. timestamp_value (google.protobuf.timestamp_pb2.Timestamp): The value of a tag field with a timestamp type. + + This field is a member of `oneof`_ ``kind``. enum_value (google.cloud.datacatalog_v1.types.TagField.EnumValue): The value of a tag field with an enum type. This value must be one of the allowed values listed in this enum. + + This field is a member of `oneof`_ ``kind``. richtext_value (str): The value of a tag field with a rich text type. @@ -100,6 +122,8 @@ class TagField(proto.Message): HTML descriptions including encoded images. The maximum length of the text without images is 100 KiB. + + This field is a member of `oneof`_ ``kind``. order (int): Output only. The order of this field with respect to other fields in this tag. Can be set by @@ -269,12 +293,23 @@ class TagTemplateField(proto.Message): class FieldType(proto.Message): r""" + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: primitive_type (google.cloud.datacatalog_v1.types.FieldType.PrimitiveType): Primitive types, such as string, boolean, etc. + + This field is a member of `oneof`_ ``type_decl``. enum_type (google.cloud.datacatalog_v1.types.FieldType.EnumType): An enum type. + + This field is a member of `oneof`_ ``type_decl``. """ class PrimitiveType(proto.Enum): diff --git a/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py b/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py index e6c56c9e..04e8fed1 100644 --- a/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py +++ b/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import common from google.cloud.datacatalog_v1beta1.types import datacatalog @@ -181,11 +183,11 @@ def __init__( async def search_catalog( self, - request: datacatalog.SearchCatalogRequest = None, + request: Union[datacatalog.SearchCatalogRequest, dict] = None, *, scope: datacatalog.SearchCatalogRequest.Scope = None, query: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.SearchCatalogAsyncPager: @@ -208,7 +210,7 @@ async def search_catalog( for more information. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.SearchCatalogRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.SearchCatalogRequest, dict]): The request object. Request message for [SearchCatalog][google.cloud.datacatalog.v1beta1.DataCatalog.SearchCatalog]. scope (:class:`google.cloud.datacatalog_v1beta1.types.SearchCatalogRequest.Scope`): @@ -296,12 +298,12 @@ async def search_catalog( async def create_entry_group( self, - request: datacatalog.CreateEntryGroupRequest = None, + request: Union[datacatalog.CreateEntryGroupRequest, dict] = None, *, parent: str = None, entry_group_id: str = None, entry_group: datacatalog.EntryGroup = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -315,7 +317,7 @@ async def create_entry_group( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateEntryGroupRequest, dict]): The request object. Request message for [CreateEntryGroup][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntryGroup]. parent (:class:`str`): @@ -406,11 +408,11 @@ async def create_entry_group( async def update_entry_group( self, - request: datacatalog.UpdateEntryGroupRequest = None, + request: Union[datacatalog.UpdateEntryGroupRequest, dict] = None, *, entry_group: datacatalog.EntryGroup = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -421,7 +423,7 @@ async def update_entry_group( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateEntryGroupRequest, dict]): The request object. Request message for [UpdateEntryGroup][google.cloud.datacatalog.v1beta1.DataCatalog.UpdateEntryGroup]. entry_group (:class:`google.cloud.datacatalog_v1beta1.types.EntryGroup`): @@ -497,18 +499,18 @@ async def update_entry_group( async def get_entry_group( self, - request: datacatalog.GetEntryGroupRequest = None, + request: Union[datacatalog.GetEntryGroupRequest, dict] = None, *, name: str = None, read_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: r"""Gets an EntryGroup. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.GetEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.GetEntryGroupRequest, dict]): The request object. Request message for [GetEntryGroup][google.cloud.datacatalog.v1beta1.DataCatalog.GetEntryGroup]. name (:class:`str`): @@ -591,10 +593,10 @@ async def get_entry_group( async def delete_entry_group( self, - request: datacatalog.DeleteEntryGroupRequest = None, + request: Union[datacatalog.DeleteEntryGroupRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -606,7 +608,7 @@ async def delete_entry_group( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteEntryGroupRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteEntryGroupRequest, dict]): The request object. Request message for [DeleteEntryGroup][google.cloud.datacatalog.v1beta1.DataCatalog.DeleteEntryGroup]. name (:class:`str`): @@ -670,17 +672,17 @@ async def delete_entry_group( async def list_entry_groups( self, - request: datacatalog.ListEntryGroupsRequest = None, + request: Union[datacatalog.ListEntryGroupsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntryGroupsAsyncPager: r"""Lists entry groups. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ListEntryGroupsRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ListEntryGroupsRequest, dict]): The request object. Request message for [ListEntryGroups][google.cloud.datacatalog.v1beta1.DataCatalog.ListEntryGroups]. parent (:class:`str`): @@ -753,12 +755,12 @@ async def list_entry_groups( async def create_entry( self, - request: datacatalog.CreateEntryRequest = None, + request: Union[datacatalog.CreateEntryRequest, dict] = None, *, parent: str = None, entry_id: str = None, entry: datacatalog.Entry = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -774,7 +776,7 @@ async def create_entry( A maximum of 100,000 entries may be created per entry group. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateEntryRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateEntryRequest, dict]): The request object. Request message for [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry]. parent (:class:`str`): @@ -866,11 +868,11 @@ async def create_entry( async def update_entry( self, - request: datacatalog.UpdateEntryRequest = None, + request: Union[datacatalog.UpdateEntryRequest, dict] = None, *, entry: datacatalog.Entry = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -881,7 +883,7 @@ async def update_entry( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateEntryRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateEntryRequest, dict]): The request object. Request message for [UpdateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.UpdateEntry]. entry (:class:`google.cloud.datacatalog_v1beta1.types.Entry`): @@ -987,10 +989,10 @@ async def update_entry( async def delete_entry( self, - request: datacatalog.DeleteEntryRequest = None, + request: Union[datacatalog.DeleteEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1003,7 +1005,7 @@ async def delete_entry( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteEntryRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteEntryRequest, dict]): The request object. Request message for [DeleteEntry][google.cloud.datacatalog.v1beta1.DataCatalog.DeleteEntry]. name (:class:`str`): @@ -1068,17 +1070,17 @@ async def delete_entry( async def get_entry( self, - request: datacatalog.GetEntryRequest = None, + request: Union[datacatalog.GetEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: r"""Gets an entry. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.GetEntryRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.GetEntryRequest, dict]): The request object. Request message for [GetEntry][google.cloud.datacatalog.v1beta1.DataCatalog.GetEntry]. name (:class:`str`): @@ -1160,9 +1162,9 @@ async def get_entry( async def lookup_entry( self, - request: datacatalog.LookupEntryRequest = None, + request: Union[datacatalog.LookupEntryRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1172,7 +1174,7 @@ async def lookup_entry( Entry. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.LookupEntryRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.LookupEntryRequest, dict]): The request object. Request message for [LookupEntry][google.cloud.datacatalog.v1beta1.DataCatalog.LookupEntry]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1226,17 +1228,17 @@ async def lookup_entry( async def list_entries( self, - request: datacatalog.ListEntriesRequest = None, + request: Union[datacatalog.ListEntriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntriesAsyncPager: r"""Lists entries. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ListEntriesRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ListEntriesRequest, dict]): The request object. Request message for [ListEntries][google.cloud.datacatalog.v1beta1.DataCatalog.ListEntries]. parent (:class:`str`): @@ -1308,12 +1310,12 @@ async def list_entries( async def create_tag_template( self, - request: datacatalog.CreateTagTemplateRequest = None, + request: Union[datacatalog.CreateTagTemplateRequest, dict] = None, *, parent: str = None, tag_template_id: str = None, tag_template: tags.TagTemplate = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1324,7 +1326,7 @@ async def create_tag_template( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateTagTemplateRequest, dict]): The request object. Request message for [CreateTagTemplate][google.cloud.datacatalog.v1beta1.DataCatalog.CreateTagTemplate]. parent (:class:`str`): @@ -1413,17 +1415,17 @@ async def create_tag_template( async def get_tag_template( self, - request: datacatalog.GetTagTemplateRequest = None, + request: Union[datacatalog.GetTagTemplateRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: r"""Gets a tag template. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.GetTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.GetTagTemplateRequest, dict]): The request object. Request message for [GetTagTemplate][google.cloud.datacatalog.v1beta1.DataCatalog.GetTagTemplate]. name (:class:`str`): @@ -1502,11 +1504,11 @@ async def get_tag_template( async def update_tag_template( self, - request: datacatalog.UpdateTagTemplateRequest = None, + request: Union[datacatalog.UpdateTagTemplateRequest, dict] = None, *, tag_template: tags.TagTemplate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1521,7 +1523,7 @@ async def update_tag_template( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateTagTemplateRequest, dict]): The request object. Request message for [UpdateTagTemplate][google.cloud.datacatalog.v1beta1.DataCatalog.UpdateTagTemplate]. tag_template (:class:`google.cloud.datacatalog_v1beta1.types.TagTemplate`): @@ -1607,11 +1609,11 @@ async def update_tag_template( async def delete_tag_template( self, - request: datacatalog.DeleteTagTemplateRequest = None, + request: Union[datacatalog.DeleteTagTemplateRequest, dict] = None, *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1622,7 +1624,7 @@ async def delete_tag_template( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteTagTemplateRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteTagTemplateRequest, dict]): The request object. Request message for [DeleteTagTemplate][google.cloud.datacatalog.v1beta1.DataCatalog.DeleteTagTemplate]. name (:class:`str`): @@ -1699,12 +1701,12 @@ async def delete_tag_template( async def create_tag_template_field( self, - request: datacatalog.CreateTagTemplateFieldRequest = None, + request: Union[datacatalog.CreateTagTemplateFieldRequest, dict] = None, *, parent: str = None, tag_template_field_id: str = None, tag_template_field: tags.TagTemplateField = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1715,7 +1717,7 @@ async def create_tag_template_field( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateTagTemplateFieldRequest, dict]): The request object. Request message for [CreateTagTemplateField][google.cloud.datacatalog.v1beta1.DataCatalog.CreateTagTemplateField]. parent (:class:`str`): @@ -1803,12 +1805,12 @@ async def create_tag_template_field( async def update_tag_template_field( self, - request: datacatalog.UpdateTagTemplateFieldRequest = None, + request: Union[datacatalog.UpdateTagTemplateFieldRequest, dict] = None, *, name: str = None, tag_template_field: tags.TagTemplateField = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1820,7 +1822,7 @@ async def update_tag_template_field( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateTagTemplateFieldRequest, dict]): The request object. Request message for [UpdateTagTemplateField][google.cloud.datacatalog.v1beta1.DataCatalog.UpdateTagTemplateField]. name (:class:`str`): @@ -1911,11 +1913,11 @@ async def update_tag_template_field( async def rename_tag_template_field( self, - request: datacatalog.RenameTagTemplateFieldRequest = None, + request: Union[datacatalog.RenameTagTemplateFieldRequest, dict] = None, *, name: str = None, new_tag_template_field_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1926,7 +1928,7 @@ async def rename_tag_template_field( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.RenameTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.RenameTagTemplateFieldRequest, dict]): The request object. Request message for [RenameTagTemplateField][google.cloud.datacatalog.v1beta1.DataCatalog.RenameTagTemplateField]. name (:class:`str`): @@ -1997,11 +1999,11 @@ async def rename_tag_template_field( async def delete_tag_template_field( self, - request: datacatalog.DeleteTagTemplateFieldRequest = None, + request: Union[datacatalog.DeleteTagTemplateFieldRequest, dict] = None, *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2013,7 +2015,7 @@ async def delete_tag_template_field( for more information). Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteTagTemplateFieldRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteTagTemplateFieldRequest, dict]): The request object. Request message for [DeleteTagTemplateField][google.cloud.datacatalog.v1beta1.DataCatalog.DeleteTagTemplateField]. name (:class:`str`): @@ -2090,11 +2092,11 @@ async def delete_tag_template_field( async def create_tag( self, - request: datacatalog.CreateTagRequest = None, + request: Union[datacatalog.CreateTagRequest, dict] = None, *, parent: str = None, tag: tags.Tag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2107,7 +2109,7 @@ async def create_tag( used to create the tag must be from the same organization. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateTagRequest, dict]): The request object. Request message for [CreateTag][google.cloud.datacatalog.v1beta1.DataCatalog.CreateTag]. parent (:class:`str`): @@ -2186,18 +2188,18 @@ async def create_tag( async def update_tag( self, - request: datacatalog.UpdateTagRequest = None, + request: Union[datacatalog.UpdateTagRequest, dict] = None, *, tag: tags.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: r"""Updates an existing tag. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateTagRequest, dict]): The request object. Request message for [UpdateTag][google.cloud.datacatalog.v1beta1.DataCatalog.UpdateTag]. tag (:class:`google.cloud.datacatalog_v1beta1.types.Tag`): @@ -2274,17 +2276,17 @@ async def update_tag( async def delete_tag( self, - request: datacatalog.DeleteTagRequest = None, + request: Union[datacatalog.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a tag. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteTagRequest, dict]): The request object. Request message for [DeleteTag][google.cloud.datacatalog.v1beta1.DataCatalog.DeleteTag]. name (:class:`str`): @@ -2349,10 +2351,10 @@ async def delete_tag( async def list_tags( self, - request: datacatalog.ListTagsRequest = None, + request: Union[datacatalog.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsAsyncPager: @@ -2360,7 +2362,7 @@ async def list_tags( [Entry][google.cloud.datacatalog.v1beta1.Entry]. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ListTagsRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ListTagsRequest, dict]): The request object. Request message for [ListTags][google.cloud.datacatalog.v1beta1.DataCatalog.ListTags]. parent (:class:`str`): @@ -2447,10 +2449,10 @@ async def list_tags( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2473,7 +2475,7 @@ async def set_iam_policy( entry groups. Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (:class:`str`): @@ -2589,10 +2591,10 @@ async def set_iam_policy( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2619,7 +2621,7 @@ async def get_iam_policy( entry groups. Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (:class:`str`): @@ -2735,9 +2737,9 @@ async def get_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -2757,7 +2759,7 @@ async def test_iam_permissions( this request. Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (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/datacatalog_v1beta1/services/data_catalog/client.py b/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py index 105e5e23..392b9edd 100644 --- a/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py +++ b/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import common from google.cloud.datacatalog_v1beta1.types import datacatalog @@ -435,7 +437,7 @@ def search_catalog( *, scope: datacatalog.SearchCatalogRequest.Scope = None, query: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.SearchCatalogPager: @@ -551,7 +553,7 @@ def create_entry_group( parent: str = None, entry_group_id: str = None, entry_group: datacatalog.EntryGroup = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -660,7 +662,7 @@ def update_entry_group( *, entry_group: datacatalog.EntryGroup = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -751,7 +753,7 @@ def get_entry_group( *, name: str = None, read_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.EntryGroup: @@ -834,7 +836,7 @@ def delete_entry_group( request: Union[datacatalog.DeleteEntryGroupRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -903,7 +905,7 @@ def list_entry_groups( request: Union[datacatalog.ListEntryGroupsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntryGroupsPager: @@ -988,7 +990,7 @@ def create_entry( parent: str = None, entry_id: str = None, entry: datacatalog.Entry = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1100,7 +1102,7 @@ def update_entry( *, entry: datacatalog.Entry = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1220,7 +1222,7 @@ def delete_entry( request: Union[datacatalog.DeleteEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1291,7 +1293,7 @@ def get_entry( request: Union[datacatalog.GetEntryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1372,7 +1374,7 @@ def lookup_entry( self, request: Union[datacatalog.LookupEntryRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> datacatalog.Entry: @@ -1430,7 +1432,7 @@ def list_entries( request: Union[datacatalog.ListEntriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntriesPager: @@ -1514,7 +1516,7 @@ def create_tag_template( parent: str = None, tag_template_id: str = None, tag_template: tags.TagTemplate = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1617,7 +1619,7 @@ def get_tag_template( request: Union[datacatalog.GetTagTemplateRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1697,7 +1699,7 @@ def update_tag_template( *, tag_template: tags.TagTemplate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplate: @@ -1802,7 +1804,7 @@ def delete_tag_template( *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1885,7 +1887,7 @@ def create_tag_template_field( parent: str = None, tag_template_field_id: str = None, tag_template_field: tags.TagTemplateField = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -1991,7 +1993,7 @@ def update_tag_template_field( name: str = None, tag_template_field: tags.TagTemplateField = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2100,7 +2102,7 @@ def rename_tag_template_field( *, name: str = None, new_tag_template_field_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.TagTemplateField: @@ -2188,7 +2190,7 @@ def delete_tag_template_field( *, name: str = None, force: bool = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2273,7 +2275,7 @@ def create_tag( *, parent: str = None, tag: tags.Tag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2369,7 +2371,7 @@ def update_tag( *, tag: tags.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tags.Tag: @@ -2456,7 +2458,7 @@ def delete_tag( request: Union[datacatalog.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -2521,7 +2523,7 @@ def list_tags( request: Union[datacatalog.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsPager: @@ -2609,7 +2611,7 @@ def set_iam_policy( request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2750,7 +2752,7 @@ def get_iam_policy( request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2894,7 +2896,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py b/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py index 131a5d03..934ae338 100644 --- a/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py +++ b/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -41,15 +40,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class DataCatalogTransport(abc.ABC): """Abstract transport class for DataCatalog.""" @@ -99,7 +89,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -132,29 +122,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py index 9df25722..70185c64 100644 --- a/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py index 7a03e120..eddca6f5 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.iam.v1 import iam_policy_pb2 # type: ignore @@ -169,18 +171,18 @@ def __init__( async def create_taxonomy( self, - request: policytagmanager.CreateTaxonomyRequest = None, + request: Union[policytagmanager.CreateTaxonomyRequest, dict] = None, *, parent: str = None, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: r"""Creates a taxonomy in the specified project. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreateTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreateTaxonomyRequest, dict]): The request object. Request message for [CreateTaxonomy][google.cloud.datacatalog.v1beta1.PolicyTagManager.CreateTaxonomy]. parent (:class:`str`): @@ -253,10 +255,10 @@ async def create_taxonomy( async def delete_taxonomy( self, - request: policytagmanager.DeleteTaxonomyRequest = None, + request: Union[policytagmanager.DeleteTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -265,7 +267,7 @@ async def delete_taxonomy( associated policies. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeleteTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeleteTaxonomyRequest, dict]): The request object. Request message for [DeleteTaxonomy][google.cloud.datacatalog.v1beta1.PolicyTagManager.DeleteTaxonomy]. name (:class:`str`): @@ -320,17 +322,17 @@ async def delete_taxonomy( async def update_taxonomy( self, - request: policytagmanager.UpdateTaxonomyRequest = None, + request: Union[policytagmanager.UpdateTaxonomyRequest, dict] = None, *, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: r"""Updates a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdateTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdateTaxonomyRequest, dict]): The request object. Request message for [UpdateTaxonomy][google.cloud.datacatalog.v1beta1.PolicyTagManager.UpdateTaxonomy]. taxonomy (:class:`google.cloud.datacatalog_v1beta1.types.Taxonomy`): @@ -397,10 +399,10 @@ async def update_taxonomy( async def list_taxonomies( self, - request: policytagmanager.ListTaxonomiesRequest = None, + request: Union[policytagmanager.ListTaxonomiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTaxonomiesAsyncPager: @@ -408,7 +410,7 @@ async def list_taxonomies( location that the caller has permission to view. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ListTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ListTaxonomiesRequest, dict]): The request object. Request message for [ListTaxonomies][google.cloud.datacatalog.v1beta1.PolicyTagManager.ListTaxonomies]. parent (:class:`str`): @@ -478,17 +480,17 @@ async def list_taxonomies( async def get_taxonomy( self, - request: policytagmanager.GetTaxonomyRequest = None, + request: Union[policytagmanager.GetTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: r"""Gets a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.GetTaxonomyRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.GetTaxonomyRequest, dict]): The request object. Request message for [GetTaxonomy][google.cloud.datacatalog.v1beta1.PolicyTagManager.GetTaxonomy]. name (:class:`str`): @@ -553,18 +555,18 @@ async def get_taxonomy( async def create_policy_tag( self, - request: policytagmanager.CreatePolicyTagRequest = None, + request: Union[policytagmanager.CreatePolicyTagRequest, dict] = None, *, parent: str = None, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: r"""Creates a policy tag in the specified taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.CreatePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.CreatePolicyTagRequest, dict]): The request object. Request message for [CreatePolicyTag][google.cloud.datacatalog.v1beta1.PolicyTagManager.CreatePolicyTag]. parent (:class:`str`): @@ -639,10 +641,10 @@ async def create_policy_tag( async def delete_policy_tag( self, - request: policytagmanager.DeletePolicyTagRequest = None, + request: Union[policytagmanager.DeletePolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -650,7 +652,7 @@ async def delete_policy_tag( descendant policy tags. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.DeletePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.DeletePolicyTagRequest, dict]): The request object. Request message for [DeletePolicyTag][google.cloud.datacatalog.v1beta1.PolicyTagManager.DeletePolicyTag]. name (:class:`str`): @@ -705,17 +707,17 @@ async def delete_policy_tag( async def update_policy_tag( self, - request: policytagmanager.UpdatePolicyTagRequest = None, + request: Union[policytagmanager.UpdatePolicyTagRequest, dict] = None, *, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: r"""Updates a policy tag. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.UpdatePolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.UpdatePolicyTagRequest, dict]): The request object. Request message for [UpdatePolicyTag][google.cloud.datacatalog.v1beta1.PolicyTagManager.UpdatePolicyTag]. policy_tag (:class:`google.cloud.datacatalog_v1beta1.types.PolicyTag`): @@ -785,17 +787,17 @@ async def update_policy_tag( async def list_policy_tags( self, - request: policytagmanager.ListPolicyTagsRequest = None, + request: Union[policytagmanager.ListPolicyTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPolicyTagsAsyncPager: r"""Lists all policy tags in a taxonomy. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ListPolicyTagsRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ListPolicyTagsRequest, dict]): The request object. Request message for [ListPolicyTags][google.cloud.datacatalog.v1beta1.PolicyTagManager.ListPolicyTags]. parent (:class:`str`): @@ -865,17 +867,17 @@ async def list_policy_tags( async def get_policy_tag( self, - request: policytagmanager.GetPolicyTagRequest = None, + request: Union[policytagmanager.GetPolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: r"""Gets a policy tag. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.GetPolicyTagRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.GetPolicyTagRequest, dict]): The request object. Request message for [GetPolicyTag][google.cloud.datacatalog.v1beta1.PolicyTagManager.GetPolicyTag]. name (:class:`str`): @@ -942,16 +944,16 @@ async def get_policy_tag( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM policy for a taxonomy or a policy tag. Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (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, @@ -1047,16 +1049,16 @@ async def get_iam_policy( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the IAM policy for a taxonomy or a policy tag. Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (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, @@ -1152,9 +1154,9 @@ async def set_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -1162,7 +1164,7 @@ async def test_iam_permissions( specified taxonomy or policy tag. Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (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/datacatalog_v1beta1/services/policy_tag_manager/client.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py index b6b520c5..94245558 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.iam.v1 import iam_policy_pb2 # type: ignore @@ -378,7 +380,7 @@ def create_taxonomy( *, parent: str = None, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -461,7 +463,7 @@ def delete_taxonomy( request: Union[policytagmanager.DeleteTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -528,7 +530,7 @@ def update_taxonomy( request: Union[policytagmanager.UpdateTaxonomyRequest, dict] = None, *, taxonomy: policytagmanager.Taxonomy = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -605,7 +607,7 @@ def list_taxonomies( request: Union[policytagmanager.ListTaxonomiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTaxonomiesPager: @@ -686,7 +688,7 @@ def get_taxonomy( request: Union[policytagmanager.GetTaxonomyRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.Taxonomy: @@ -762,7 +764,7 @@ def create_policy_tag( *, parent: str = None, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -847,7 +849,7 @@ def delete_policy_tag( request: Union[policytagmanager.DeletePolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -913,7 +915,7 @@ def update_policy_tag( request: Union[policytagmanager.UpdatePolicyTagRequest, dict] = None, *, policy_tag: policytagmanager.PolicyTag = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -993,7 +995,7 @@ def list_policy_tags( request: Union[policytagmanager.ListPolicyTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPolicyTagsPager: @@ -1073,7 +1075,7 @@ def get_policy_tag( request: Union[policytagmanager.GetPolicyTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanager.PolicyTag: @@ -1149,7 +1151,7 @@ def get_iam_policy( self, request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -1253,7 +1255,7 @@ def set_iam_policy( self, request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -1357,7 +1359,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py index 4ae41d75..8780caed 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -40,15 +39,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class PolicyTagManagerTransport(abc.ABC): """Abstract transport class for PolicyTagManager.""" @@ -98,7 +88,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -131,29 +121,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py index 3650cfd9..869a6d4b 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py index 14e5d754..abbdb585 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization from .transports.base import PolicyTagManagerSerializationTransport, DEFAULT_CLIENT_INFO @@ -175,9 +177,11 @@ def __init__( async def import_taxonomies( self, - request: policytagmanagerserialization.ImportTaxonomiesRequest = None, + request: Union[ + policytagmanagerserialization.ImportTaxonomiesRequest, dict + ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ImportTaxonomiesResponse: @@ -188,7 +192,7 @@ async def import_taxonomies( creation using nested proto structure. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ImportTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ImportTaxonomiesRequest, dict]): The request object. Request message for [ImportTaxonomies][google.cloud.datacatalog.v1beta1.PolicyTagManagerSerialization.ImportTaxonomies]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -228,9 +232,11 @@ async def import_taxonomies( async def export_taxonomies( self, - request: policytagmanagerserialization.ExportTaxonomiesRequest = None, + request: Union[ + policytagmanagerserialization.ExportTaxonomiesRequest, dict + ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ExportTaxonomiesResponse: @@ -241,7 +247,7 @@ async def export_taxonomies( future ImportTaxonomies calls. Args: - request (:class:`google.cloud.datacatalog_v1beta1.types.ExportTaxonomiesRequest`): + request (Union[google.cloud.datacatalog_v1beta1.types.ExportTaxonomiesRequest, dict]): The request object. Request message for [ExportTaxonomies][google.cloud.datacatalog.v1beta1.PolicyTagManagerSerialization.ExportTaxonomies]. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py index 7463fb3f..cec286c2 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization from .transports.base import PolicyTagManagerSerializationTransport, DEFAULT_CLIENT_INFO @@ -362,7 +364,7 @@ def import_taxonomies( policytagmanagerserialization.ImportTaxonomiesRequest, dict ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ImportTaxonomiesResponse: @@ -420,7 +422,7 @@ def export_taxonomies( policytagmanagerserialization.ExportTaxonomiesRequest, dict ] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policytagmanagerserialization.ExportTaxonomiesResponse: diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py index e9b59afd..2f78d61f 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -37,15 +36,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class PolicyTagManagerSerializationTransport(abc.ABC): """Abstract transport class for PolicyTagManagerSerialization.""" @@ -95,7 +85,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -128,29 +118,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index 8d7db242..4c88c7ed 100644 --- a/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/datacatalog_v1beta1/types/datacatalog.py b/google/cloud/datacatalog_v1beta1/types/datacatalog.py index f5a6044d..7d8d7eec 100644 --- a/google/cloud/datacatalog_v1beta1/types/datacatalog.py +++ b/google/cloud/datacatalog_v1beta1/types/datacatalog.py @@ -407,6 +407,13 @@ class LookupEntryRequest(proto.Message): r"""Request message for [LookupEntry][google.cloud.datacatalog.v1beta1.DataCatalog.LookupEntry]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: linked_resource (str): The full name of the Google Cloud Platform resource the Data @@ -418,6 +425,8 @@ class LookupEntryRequest(proto.Message): - //bigquery.googleapis.com/projects/projectId/datasets/datasetId/tables/tableId - //pubsub.googleapis.com/projects/projectId/topics/topicId + + This field is a member of `oneof`_ ``target_name``. sql_resource (str): The SQL name of the entry. SQL names are case-sensitive. @@ -432,6 +441,8 @@ class LookupEntryRequest(proto.Message): ``*_id``\ s shoud satisfy the standard SQL rules for identifiers. https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical. + + This field is a member of `oneof`_ ``target_name``. """ linked_resource = proto.Field(proto.STRING, number=1, oneof="target_name",) @@ -449,6 +460,13 @@ class Entry(proto.Message): Entry can also be used to attach flexible metadata, such as a [Tag][google.cloud.datacatalog.v1beta1.Tag]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): The Data Catalog resource name of the entry in URL format. @@ -476,6 +494,8 @@ class Entry(proto.Message): The type of the entry. Only used for Entries with types in the EntryType enum. + + This field is a member of `oneof`_ ``entry_type``. user_specified_type (str): Entry type if it does not fit any of the input-allowed values listed in ``EntryType`` enum above. When creating an @@ -490,10 +510,14 @@ class Entry(proto.Message): Currently, only FILESET enum value is allowed. All other entries created through Data Catalog must use ``user_specified_type``. + + This field is a member of `oneof`_ ``entry_type``. integrated_system (google.cloud.datacatalog_v1beta1.types.IntegratedSystem): Output only. This field indicates the entry's source system that Data Catalog integrates with, such as BigQuery or Pub/Sub. + + This field is a member of `oneof`_ ``system``. user_specified_system (str): This field indicates the entry's source system that Data Catalog does not integrate with. ``user_specified_system`` @@ -501,17 +525,25 @@ class Entry(proto.Message): contain letters, numbers, and underscores; are case insensitive; must be at least 1 character and at most 64 characters long. + + This field is a member of `oneof`_ ``system``. gcs_fileset_spec (google.cloud.datacatalog_v1beta1.types.GcsFilesetSpec): Specification that applies to a Cloud Storage fileset. This is only valid on entries of type FILESET. + + This field is a member of `oneof`_ ``type_spec``. bigquery_table_spec (google.cloud.datacatalog_v1beta1.types.BigQueryTableSpec): Specification that applies to a BigQuery table. This is only valid on entries of type ``TABLE``. + + This field is a member of `oneof`_ ``type_spec``. bigquery_date_sharded_spec (google.cloud.datacatalog_v1beta1.types.BigQueryDateShardedSpec): Specification for a group of BigQuery tables with name pattern ``[prefix]YYYYMMDD``. Context: https://cloud.google.com/bigquery/docs/partitioned-tables#partitioning_versus_sharding. + + This field is a member of `oneof`_ ``type_spec``. display_name (str): Display information such as title and description. A short name to identify the entry, diff --git a/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py b/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py index d17b5111..f8353ee4 100644 --- a/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py +++ b/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py @@ -85,12 +85,16 @@ class ImportTaxonomiesRequest(proto.Message): r"""Request message for [ImportTaxonomies][google.cloud.datacatalog.v1beta1.PolicyTagManagerSerialization.ImportTaxonomies]. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: parent (str): Required. Resource name of project that the newly created taxonomies will belong to. inline_source (google.cloud.datacatalog_v1beta1.types.InlineSource): Inline source used for taxonomies import + This field is a member of `oneof`_ ``source``. """ parent = proto.Field(proto.STRING, number=1,) @@ -130,6 +134,9 @@ class ExportTaxonomiesRequest(proto.Message): r"""Request message for [ExportTaxonomies][google.cloud.datacatalog.v1beta1.PolicyTagManagerSerialization.ExportTaxonomies]. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: parent (str): Required. Resource name of the project that @@ -139,6 +146,8 @@ class ExportTaxonomiesRequest(proto.Message): be exported. serialized_taxonomies (bool): Export taxonomies as serialized taxonomies. + + This field is a member of `oneof`_ ``destination``. """ parent = proto.Field(proto.STRING, number=1,) diff --git a/google/cloud/datacatalog_v1beta1/types/table_spec.py b/google/cloud/datacatalog_v1beta1/types/table_spec.py index 5312598e..005276a4 100644 --- a/google/cloud/datacatalog_v1beta1/types/table_spec.py +++ b/google/cloud/datacatalog_v1beta1/types/table_spec.py @@ -38,15 +38,26 @@ class TableSourceType(proto.Enum): class BigQueryTableSpec(proto.Message): r"""Describes a BigQuery table. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: table_source_type (google.cloud.datacatalog_v1beta1.types.TableSourceType): Output only. The table source type. view_spec (google.cloud.datacatalog_v1beta1.types.ViewSpec): Table view specification. This field should only be populated if ``table_source_type`` is ``BIGQUERY_VIEW``. + + This field is a member of `oneof`_ ``type_spec``. table_spec (google.cloud.datacatalog_v1beta1.types.TableSpec): Spec of a BigQuery table. This field should only be populated if ``table_source_type`` is ``BIGQUERY_TABLE``. + + This field is a member of `oneof`_ ``type_spec``. """ table_source_type = proto.Field(proto.ENUM, number=1, enum="TableSourceType",) diff --git a/google/cloud/datacatalog_v1beta1/types/tags.py b/google/cloud/datacatalog_v1beta1/types/tags.py index c5d9a0c1..3f9d384f 100644 --- a/google/cloud/datacatalog_v1beta1/types/tags.py +++ b/google/cloud/datacatalog_v1beta1/types/tags.py @@ -32,6 +32,9 @@ class Tag(proto.Message): IAM `__ for information on the permissions needed to create or view tags. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): The resource name of the tag in URL format. Example: @@ -60,6 +63,8 @@ class Tag(proto.Message): separate the column names. Example: - ``outer_column.inner_column`` + + This field is a member of `oneof`_ ``scope``. fields (Sequence[google.cloud.datacatalog_v1beta1.types.Tag.FieldsEntry]): Required. This maps the ID of a tag field to the value of and additional information about @@ -79,25 +84,42 @@ class TagField(proto.Message): r"""Contains the value and supporting information for a field within a [Tag][google.cloud.datacatalog.v1beta1.Tag]. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: display_name (str): Output only. The display name of this field. double_value (float): Holds the value for a tag field with double type. + + This field is a member of `oneof`_ ``kind``. string_value (str): Holds the value for a tag field with string type. + + This field is a member of `oneof`_ ``kind``. bool_value (bool): Holds the value for a tag field with boolean type. + + This field is a member of `oneof`_ ``kind``. timestamp_value (google.protobuf.timestamp_pb2.Timestamp): Holds the value for a tag field with timestamp type. + + This field is a member of `oneof`_ ``kind``. enum_value (google.cloud.datacatalog_v1beta1.types.TagField.EnumValue): Holds the value for a tag field with enum type. This value must be one of the allowed values in the definition of this enum. + + This field is a member of `oneof`_ ``kind``. order (int): Output only. The order of this field with respect to other fields in this tag. It can be set in @@ -212,12 +234,23 @@ class TagTemplateField(proto.Message): class FieldType(proto.Message): r""" + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: primitive_type (google.cloud.datacatalog_v1beta1.types.FieldType.PrimitiveType): Represents primitive types - string, bool etc. + + This field is a member of `oneof`_ ``type_decl``. enum_type (google.cloud.datacatalog_v1beta1.types.FieldType.EnumType): Represents an enum type. + + This field is a member of `oneof`_ ``type_decl``. """ class PrimitiveType(proto.Enum): diff --git a/setup.py b/setup.py index b3ddb790..197c6b4b 100644 --- a/setup.py +++ b/setup.py @@ -31,11 +31,10 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "grpc-google-iam-v1 >= 0.12.3, < 0.13dev", "libcst >= 0.2.5", "proto-plus >= 1.4.0", - "packaging >= 14.3", ] package_root = os.path.abspath(os.path.dirname(__file__)) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 1c76a98d..937df8cf 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,9 +5,7 @@ # # 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.26.0 +google-api-core==1.28.0 grpc-google-iam-v1==0.12.3 libcst==0.2.5 proto-plus==1.4.0 -google-auth==1.24.0 # TODO(busunkim): remove when google-auth>=1.25.0 is implicitly required through newer google-api-core -packaging==14.3 diff --git a/tests/unit/gapic/datacatalog_v1/test_data_catalog.py b/tests/unit/gapic/datacatalog_v1/test_data_catalog.py index e5c90f28..676da5f2 100644 --- a/tests/unit/gapic/datacatalog_v1/test_data_catalog.py +++ b/tests/unit/gapic/datacatalog_v1/test_data_catalog.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -36,9 +35,6 @@ from google.cloud.datacatalog_v1.services.data_catalog import DataCatalogClient from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.services.data_catalog import transports -from google.cloud.datacatalog_v1.services.data_catalog.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1.types import bigquery from google.cloud.datacatalog_v1.types import common from google.cloud.datacatalog_v1.types import data_source @@ -60,20 +56,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -221,7 +203,7 @@ def test_data_catalog_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -238,7 +220,7 @@ def test_data_catalog_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_data_catalog_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -284,7 +266,7 @@ def test_data_catalog_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -341,7 +323,7 @@ def test_data_catalog_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -383,7 +365,7 @@ def test_data_catalog_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -405,7 +387,7 @@ def test_data_catalog_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -436,7 +418,7 @@ def test_data_catalog_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -467,7 +449,7 @@ def test_data_catalog_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -7103,7 +7085,6 @@ def test_data_catalog_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_data_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -7124,26 +7105,6 @@ def test_data_catalog_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.DataCatalogTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_data_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -7155,7 +7116,6 @@ def test_data_catalog_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_data_catalog_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -7168,23 +7128,10 @@ def test_data_catalog_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - DataCatalogClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.DataCatalogGrpcTransport, transports.DataCatalogGrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_data_catalog_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -7198,23 +7145,6 @@ def test_data_catalog_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.DataCatalogGrpcTransport, transports.DataCatalogGrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py b/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py index 907a4d79..12572670 100644 --- a/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py +++ b/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -40,9 +39,6 @@ ) from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1.services.policy_tag_manager import transports -from google.cloud.datacatalog_v1.services.policy_tag_manager.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import timestamps from google.iam.v1 import iam_policy_pb2 # type: ignore @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -226,7 +208,7 @@ def test_policy_tag_manager_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -243,7 +225,7 @@ def test_policy_tag_manager_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -260,7 +242,7 @@ def test_policy_tag_manager_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -289,7 +271,7 @@ def test_policy_tag_manager_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -358,7 +340,7 @@ def test_policy_tag_manager_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -400,7 +382,7 @@ def test_policy_tag_manager_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -422,7 +404,7 @@ def test_policy_tag_manager_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -453,7 +435,7 @@ def test_policy_tag_manager_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -484,7 +466,7 @@ def test_policy_tag_manager_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -3655,7 +3637,6 @@ def test_policy_tag_manager_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -3676,26 +3657,6 @@ def test_policy_tag_manager_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.PolicyTagManagerTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_policy_tag_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -3707,7 +3668,6 @@ def test_policy_tag_manager_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -3720,18 +3680,6 @@ def test_policy_tag_manager_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - PolicyTagManagerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -3739,7 +3687,6 @@ def test_policy_tag_manager_auth_adc_old_google_auth(): transports.PolicyTagManagerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -3753,26 +3700,6 @@ def test_policy_tag_manager_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.PolicyTagManagerGrpcTransport, - transports.PolicyTagManagerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py b/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py index 394b63a5..cbb99d3a 100644 --- a/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py +++ b/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -41,9 +40,6 @@ from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization import ( transports, ) -from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1.types import policytagmanager from google.cloud.datacatalog_v1.types import policytagmanagerserialization from google.cloud.datacatalog_v1.types import timestamps @@ -51,20 +47,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -240,7 +222,7 @@ def test_policy_tag_manager_serialization_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -257,7 +239,7 @@ def test_policy_tag_manager_serialization_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -274,7 +256,7 @@ def test_policy_tag_manager_serialization_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -303,7 +285,7 @@ def test_policy_tag_manager_serialization_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -372,7 +354,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -414,7 +396,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -436,7 +418,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -471,7 +453,7 @@ def test_policy_tag_manager_serialization_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -506,7 +488,7 @@ def test_policy_tag_manager_serialization_client_client_options_credentials_file options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1110,7 +1092,6 @@ def test_policy_tag_manager_serialization_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1131,26 +1112,6 @@ def test_policy_tag_manager_serialization_base_transport_with_credentials_file() ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.PolicyTagManagerSerializationTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_policy_tag_manager_serialization_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1162,7 +1123,6 @@ def test_policy_tag_manager_serialization_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1175,18 +1135,6 @@ def test_policy_tag_manager_serialization_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - PolicyTagManagerSerializationClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1194,7 +1142,6 @@ def test_policy_tag_manager_serialization_auth_adc_old_google_auth(): transports.PolicyTagManagerSerializationGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1208,28 +1155,6 @@ def test_policy_tag_manager_serialization_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.PolicyTagManagerSerializationGrpcTransport, - transports.PolicyTagManagerSerializationGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py b/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py index 90c3594a..3dc0f9e5 100644 --- a/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py +++ b/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -38,9 +37,6 @@ from google.cloud.datacatalog_v1beta1.services.data_catalog import DataCatalogClient from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.services.data_catalog import transports -from google.cloud.datacatalog_v1beta1.services.data_catalog.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1beta1.types import common from google.cloud.datacatalog_v1beta1.types import datacatalog from google.cloud.datacatalog_v1beta1.types import gcs_fileset_spec @@ -59,20 +55,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -220,7 +202,7 @@ def test_data_catalog_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -237,7 +219,7 @@ def test_data_catalog_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -254,7 +236,7 @@ def test_data_catalog_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -283,7 +265,7 @@ def test_data_catalog_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -340,7 +322,7 @@ def test_data_catalog_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -382,7 +364,7 @@ def test_data_catalog_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -404,7 +386,7 @@ def test_data_catalog_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -435,7 +417,7 @@ def test_data_catalog_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -466,7 +448,7 @@ def test_data_catalog_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -6784,7 +6766,6 @@ def test_data_catalog_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_data_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -6805,26 +6786,6 @@ def test_data_catalog_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.DataCatalogTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_data_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -6836,7 +6797,6 @@ def test_data_catalog_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_data_catalog_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -6849,23 +6809,10 @@ def test_data_catalog_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - DataCatalogClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.DataCatalogGrpcTransport, transports.DataCatalogGrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_data_catalog_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -6879,23 +6826,6 @@ def test_data_catalog_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.DataCatalogGrpcTransport, transports.DataCatalogGrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_data_catalog_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py b/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py index 2a5b612f..5236c50b 100644 --- a/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py +++ b/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -40,9 +39,6 @@ ) from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import transports -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore @@ -53,20 +49,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -224,7 +206,7 @@ def test_policy_tag_manager_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -241,7 +223,7 @@ def test_policy_tag_manager_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -258,7 +240,7 @@ def test_policy_tag_manager_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -287,7 +269,7 @@ def test_policy_tag_manager_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -356,7 +338,7 @@ def test_policy_tag_manager_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -398,7 +380,7 @@ def test_policy_tag_manager_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -420,7 +402,7 @@ def test_policy_tag_manager_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -451,7 +433,7 @@ def test_policy_tag_manager_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -482,7 +464,7 @@ def test_policy_tag_manager_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -3641,7 +3623,6 @@ def test_policy_tag_manager_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -3662,26 +3643,6 @@ def test_policy_tag_manager_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.PolicyTagManagerTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_policy_tag_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -3693,7 +3654,6 @@ def test_policy_tag_manager_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -3706,18 +3666,6 @@ def test_policy_tag_manager_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - PolicyTagManagerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -3725,7 +3673,6 @@ def test_policy_tag_manager_auth_adc_old_google_auth(): transports.PolicyTagManagerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -3739,26 +3686,6 @@ def test_policy_tag_manager_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.PolicyTagManagerGrpcTransport, - transports.PolicyTagManagerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py b/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py index 7f7b1573..4b70eeb1 100644 --- a/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py +++ b/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -41,29 +40,12 @@ from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization import ( transports, ) -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.datacatalog_v1beta1.types import policytagmanager from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization from google.oauth2 import service_account import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -239,7 +221,7 @@ def test_policy_tag_manager_serialization_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -256,7 +238,7 @@ def test_policy_tag_manager_serialization_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -273,7 +255,7 @@ def test_policy_tag_manager_serialization_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -302,7 +284,7 @@ def test_policy_tag_manager_serialization_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -371,7 +353,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -413,7 +395,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -435,7 +417,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -470,7 +452,7 @@ def test_policy_tag_manager_serialization_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -505,7 +487,7 @@ def test_policy_tag_manager_serialization_client_client_options_credentials_file options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -942,7 +924,6 @@ def test_policy_tag_manager_serialization_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -963,26 +944,6 @@ def test_policy_tag_manager_serialization_base_transport_with_credentials_file() ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.PolicyTagManagerSerializationTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_policy_tag_manager_serialization_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -994,7 +955,6 @@ def test_policy_tag_manager_serialization_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1007,18 +967,6 @@ def test_policy_tag_manager_serialization_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - PolicyTagManagerSerializationClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1026,7 +974,6 @@ def test_policy_tag_manager_serialization_auth_adc_old_google_auth(): transports.PolicyTagManagerSerializationGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_policy_tag_manager_serialization_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1040,28 +987,6 @@ def test_policy_tag_manager_serialization_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.PolicyTagManagerSerializationGrpcTransport, - transports.PolicyTagManagerSerializationGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_policy_tag_manager_serialization_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [