From aefe892ab2cdb37b5f58faecd45758ea685c74ec Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Fri, 13 Aug 2021 14:17:16 -0600 Subject: [PATCH] fix: make datacatalog == datacatalog_v1 (#206) Fixes #116 I have verified that v1beta1 -> v1 is additive, so this is *not* a breaking change. See internal changelist 390485345 for the proto level diff and successful run through the proto brekaing change detector --- google/cloud/datacatalog/__init__.py | 212 +++++++++++++-------------- owlbot.py | 2 +- samples/v1beta1/conftest.py | 15 +- 3 files changed, 118 insertions(+), 111 deletions(-) diff --git a/google/cloud/datacatalog/__init__.py b/google/cloud/datacatalog/__init__.py index 99800a10..2bdf9448 100644 --- a/google/cloud/datacatalog/__init__.py +++ b/google/cloud/datacatalog/__init__.py @@ -14,137 +14,123 @@ # limitations under the License. # -from google.cloud.datacatalog_v1beta1.services.data_catalog.client import ( - DataCatalogClient, -) -from google.cloud.datacatalog_v1beta1.services.data_catalog.async_client import ( +from google.cloud.datacatalog_v1.services.data_catalog.client import DataCatalogClient +from google.cloud.datacatalog_v1.services.data_catalog.async_client import ( DataCatalogAsyncClient, ) -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager.client import ( +from google.cloud.datacatalog_v1.services.policy_tag_manager.client import ( PolicyTagManagerClient, ) -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager.async_client import ( +from google.cloud.datacatalog_v1.services.policy_tag_manager.async_client import ( PolicyTagManagerAsyncClient, ) -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.client import ( +from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.client import ( PolicyTagManagerSerializationClient, ) -from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.async_client import ( +from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.async_client import ( PolicyTagManagerSerializationAsyncClient, ) -from google.cloud.datacatalog_v1beta1.types.common import IntegratedSystem -from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateEntryGroupRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateEntryRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateTagRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ( - CreateTagTemplateFieldRequest, -) -from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateTagTemplateRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteEntryGroupRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteEntryRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteTagRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ( - DeleteTagTemplateFieldRequest, -) -from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteTagTemplateRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import Entry -from google.cloud.datacatalog_v1beta1.types.datacatalog import EntryGroup -from google.cloud.datacatalog_v1beta1.types.datacatalog import GetEntryGroupRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import GetEntryRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import GetTagTemplateRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntriesRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntriesResponse -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntryGroupsRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntryGroupsResponse -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListTagsRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ListTagsResponse -from google.cloud.datacatalog_v1beta1.types.datacatalog import LookupEntryRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ( - RenameTagTemplateFieldRequest, -) -from google.cloud.datacatalog_v1beta1.types.datacatalog import SearchCatalogRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import SearchCatalogResponse -from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateEntryGroupRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateEntryRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateTagRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import ( - UpdateTagTemplateFieldRequest, -) -from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateTagTemplateRequest -from google.cloud.datacatalog_v1beta1.types.datacatalog import EntryType -from google.cloud.datacatalog_v1beta1.types.gcs_fileset_spec import GcsFilesetSpec -from google.cloud.datacatalog_v1beta1.types.gcs_fileset_spec import GcsFileSpec -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - CreatePolicyTagRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - CreateTaxonomyRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - DeletePolicyTagRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - DeleteTaxonomyRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import GetPolicyTagRequest -from google.cloud.datacatalog_v1beta1.types.policytagmanager import GetTaxonomyRequest -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - ListPolicyTagsRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - ListPolicyTagsResponse, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - ListTaxonomiesRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - ListTaxonomiesResponse, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import PolicyTag -from google.cloud.datacatalog_v1beta1.types.policytagmanager import Taxonomy -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - UpdatePolicyTagRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanager import ( - UpdateTaxonomyRequest, -) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.bigquery import BigQueryConnectionSpec +from google.cloud.datacatalog_v1.types.bigquery import BigQueryRoutineSpec +from google.cloud.datacatalog_v1.types.bigquery import CloudSqlBigQueryConnectionSpec +from google.cloud.datacatalog_v1.types.common import IntegratedSystem +from google.cloud.datacatalog_v1.types.data_source import DataSource +from google.cloud.datacatalog_v1.types.datacatalog import CreateEntryGroupRequest +from google.cloud.datacatalog_v1.types.datacatalog import CreateEntryRequest +from google.cloud.datacatalog_v1.types.datacatalog import CreateTagRequest +from google.cloud.datacatalog_v1.types.datacatalog import CreateTagTemplateFieldRequest +from google.cloud.datacatalog_v1.types.datacatalog import CreateTagTemplateRequest +from google.cloud.datacatalog_v1.types.datacatalog import DatabaseTableSpec +from google.cloud.datacatalog_v1.types.datacatalog import DataSourceConnectionSpec +from google.cloud.datacatalog_v1.types.datacatalog import DeleteEntryGroupRequest +from google.cloud.datacatalog_v1.types.datacatalog import DeleteEntryRequest +from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagRequest +from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagTemplateFieldRequest +from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagTemplateRequest +from google.cloud.datacatalog_v1.types.datacatalog import Entry +from google.cloud.datacatalog_v1.types.datacatalog import EntryGroup +from google.cloud.datacatalog_v1.types.datacatalog import GetEntryGroupRequest +from google.cloud.datacatalog_v1.types.datacatalog import GetEntryRequest +from google.cloud.datacatalog_v1.types.datacatalog import GetTagTemplateRequest +from google.cloud.datacatalog_v1.types.datacatalog import ListEntriesRequest +from google.cloud.datacatalog_v1.types.datacatalog import ListEntriesResponse +from google.cloud.datacatalog_v1.types.datacatalog import ListEntryGroupsRequest +from google.cloud.datacatalog_v1.types.datacatalog import ListEntryGroupsResponse +from google.cloud.datacatalog_v1.types.datacatalog import ListTagsRequest +from google.cloud.datacatalog_v1.types.datacatalog import ListTagsResponse +from google.cloud.datacatalog_v1.types.datacatalog import LookupEntryRequest +from google.cloud.datacatalog_v1.types.datacatalog import ( + RenameTagTemplateFieldEnumValueRequest, +) +from google.cloud.datacatalog_v1.types.datacatalog import RenameTagTemplateFieldRequest +from google.cloud.datacatalog_v1.types.datacatalog import RoutineSpec +from google.cloud.datacatalog_v1.types.datacatalog import SearchCatalogRequest +from google.cloud.datacatalog_v1.types.datacatalog import SearchCatalogResponse +from google.cloud.datacatalog_v1.types.datacatalog import UpdateEntryGroupRequest +from google.cloud.datacatalog_v1.types.datacatalog import UpdateEntryRequest +from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagRequest +from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagTemplateFieldRequest +from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagTemplateRequest +from google.cloud.datacatalog_v1.types.datacatalog import EntryType +from google.cloud.datacatalog_v1.types.gcs_fileset_spec import GcsFilesetSpec +from google.cloud.datacatalog_v1.types.gcs_fileset_spec import GcsFileSpec +from google.cloud.datacatalog_v1.types.policytagmanager import CreatePolicyTagRequest +from google.cloud.datacatalog_v1.types.policytagmanager import CreateTaxonomyRequest +from google.cloud.datacatalog_v1.types.policytagmanager import DeletePolicyTagRequest +from google.cloud.datacatalog_v1.types.policytagmanager import DeleteTaxonomyRequest +from google.cloud.datacatalog_v1.types.policytagmanager import GetPolicyTagRequest +from google.cloud.datacatalog_v1.types.policytagmanager import GetTaxonomyRequest +from google.cloud.datacatalog_v1.types.policytagmanager import ListPolicyTagsRequest +from google.cloud.datacatalog_v1.types.policytagmanager import ListPolicyTagsResponse +from google.cloud.datacatalog_v1.types.policytagmanager import ListTaxonomiesRequest +from google.cloud.datacatalog_v1.types.policytagmanager import ListTaxonomiesResponse +from google.cloud.datacatalog_v1.types.policytagmanager import PolicyTag +from google.cloud.datacatalog_v1.types.policytagmanager import Taxonomy +from google.cloud.datacatalog_v1.types.policytagmanager import UpdatePolicyTagRequest +from google.cloud.datacatalog_v1.types.policytagmanager import UpdateTaxonomyRequest +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( + CrossRegionalSource, +) +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( ExportTaxonomiesRequest, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( ExportTaxonomiesResponse, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( ImportTaxonomiesRequest, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( ImportTaxonomiesResponse, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( - InlineSource, +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import InlineSource +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( + ReplaceTaxonomyRequest, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( SerializedPolicyTag, ) -from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import ( +from google.cloud.datacatalog_v1.types.policytagmanagerserialization import ( SerializedTaxonomy, ) -from google.cloud.datacatalog_v1beta1.types.schema import ColumnSchema -from google.cloud.datacatalog_v1beta1.types.schema import Schema -from google.cloud.datacatalog_v1beta1.types.search import SearchCatalogResult -from google.cloud.datacatalog_v1beta1.types.search import SearchResultType -from google.cloud.datacatalog_v1beta1.types.table_spec import BigQueryDateShardedSpec -from google.cloud.datacatalog_v1beta1.types.table_spec import BigQueryTableSpec -from google.cloud.datacatalog_v1beta1.types.table_spec import TableSpec -from google.cloud.datacatalog_v1beta1.types.table_spec import ViewSpec -from google.cloud.datacatalog_v1beta1.types.table_spec import TableSourceType -from google.cloud.datacatalog_v1beta1.types.tags import FieldType -from google.cloud.datacatalog_v1beta1.types.tags import Tag -from google.cloud.datacatalog_v1beta1.types.tags import TagField -from google.cloud.datacatalog_v1beta1.types.tags import TagTemplate -from google.cloud.datacatalog_v1beta1.types.tags import TagTemplateField -from google.cloud.datacatalog_v1beta1.types.timestamps import SystemTimestamps +from google.cloud.datacatalog_v1.types.schema import ColumnSchema +from google.cloud.datacatalog_v1.types.schema import Schema +from google.cloud.datacatalog_v1.types.search import SearchCatalogResult +from google.cloud.datacatalog_v1.types.search import SearchResultType +from google.cloud.datacatalog_v1.types.table_spec import BigQueryDateShardedSpec +from google.cloud.datacatalog_v1.types.table_spec import BigQueryTableSpec +from google.cloud.datacatalog_v1.types.table_spec import TableSpec +from google.cloud.datacatalog_v1.types.table_spec import ViewSpec +from google.cloud.datacatalog_v1.types.table_spec import TableSourceType +from google.cloud.datacatalog_v1.types.tags import FieldType +from google.cloud.datacatalog_v1.types.tags import Tag +from google.cloud.datacatalog_v1.types.tags import TagField +from google.cloud.datacatalog_v1.types.tags import TagTemplate +from google.cloud.datacatalog_v1.types.tags import TagTemplateField +from google.cloud.datacatalog_v1.types.timestamps import SystemTimestamps +from google.cloud.datacatalog_v1.types.usage import UsageSignal +from google.cloud.datacatalog_v1.types.usage import UsageStats __all__ = ( "DataCatalogClient", @@ -153,12 +139,18 @@ "PolicyTagManagerAsyncClient", "PolicyTagManagerSerializationClient", "PolicyTagManagerSerializationAsyncClient", + "BigQueryConnectionSpec", + "BigQueryRoutineSpec", + "CloudSqlBigQueryConnectionSpec", "IntegratedSystem", + "DataSource", "CreateEntryGroupRequest", "CreateEntryRequest", "CreateTagRequest", "CreateTagTemplateFieldRequest", "CreateTagTemplateRequest", + "DatabaseTableSpec", + "DataSourceConnectionSpec", "DeleteEntryGroupRequest", "DeleteEntryRequest", "DeleteTagRequest", @@ -176,7 +168,9 @@ "ListTagsRequest", "ListTagsResponse", "LookupEntryRequest", + "RenameTagTemplateFieldEnumValueRequest", "RenameTagTemplateFieldRequest", + "RoutineSpec", "SearchCatalogRequest", "SearchCatalogResponse", "UpdateEntryGroupRequest", @@ -201,11 +195,13 @@ "Taxonomy", "UpdatePolicyTagRequest", "UpdateTaxonomyRequest", + "CrossRegionalSource", "ExportTaxonomiesRequest", "ExportTaxonomiesResponse", "ImportTaxonomiesRequest", "ImportTaxonomiesResponse", "InlineSource", + "ReplaceTaxonomyRequest", "SerializedPolicyTag", "SerializedTaxonomy", "ColumnSchema", @@ -223,4 +219,6 @@ "TagTemplate", "TagTemplateField", "SystemTimestamps", + "UsageSignal", + "UsageStats", ) diff --git a/owlbot.py b/owlbot.py index 9165e1b2..2e6fff40 100644 --- a/owlbot.py +++ b/owlbot.py @@ -20,7 +20,7 @@ common = gcp.CommonTemplates() -default_version = "v1beta1" +default_version = "v1" for library in s.get_staging_dirs(default_version): s.move( diff --git a/samples/v1beta1/conftest.py b/samples/v1beta1/conftest.py index d641d135..61f2f64e 100644 --- a/samples/v1beta1/conftest.py +++ b/samples/v1beta1/conftest.py @@ -85,10 +85,19 @@ def entry(client, entry_group_name): random_entry_id = "example_entry_{}_{}".format( now.strftime("%Y%m%d%H%M%S"), uuid.uuid4().hex[:8] ) - entry = datacatalog_v1beta1.CreateEntryRequest - entry = client.create_entry( - request={"parent": entry_group_name, "entry_id": random_entry_id, "entry": {"type_": "DATA_STREAM", "name": "samples_test_entry"}} + + request = datacatalog_v1beta1.CreateEntryRequest( + parent=entry_group_name, + entry_id=random_entry_id, + entry=datacatalog_v1beta1.Entry( + type_=datacatalog_v1beta1.EntryType.DATA_STREAM, + name="samples_test_entry", + user_specified_system="sample_system", + ) ) + + entry = client.create_entry(request) + yield entry.name client.delete_entry(request={"name": entry.name})