Skip to content
This repository was archived by the owner on Sep 5, 2023. It is now read-only.

Commit aefe892

Browse files
busunkim96busunkim96
authored
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
1 parent 671d26c commit aefe892

File tree

3 files changed

+118
-111
lines changed

3 files changed

+118
-111
lines changed

‎google/cloud/datacatalog/__init__.py‎

Lines changed: 105 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -14,137 +14,123 @@
1414
# limitations under the License.
1515
#
1616

17-
from google.cloud.datacatalog_v1beta1.services.data_catalog.client import (
18-
DataCatalogClient,
19-
)
20-
from google.cloud.datacatalog_v1beta1.services.data_catalog.async_client import (
17+
from google.cloud.datacatalog_v1.services.data_catalog.client import DataCatalogClient
18+
from google.cloud.datacatalog_v1.services.data_catalog.async_client import (
2119
DataCatalogAsyncClient,
2220
)
23-
from google.cloud.datacatalog_v1beta1.services.policy_tag_manager.client import (
21+
from google.cloud.datacatalog_v1.services.policy_tag_manager.client import (
2422
PolicyTagManagerClient,
2523
)
26-
from google.cloud.datacatalog_v1beta1.services.policy_tag_manager.async_client import (
24+
from google.cloud.datacatalog_v1.services.policy_tag_manager.async_client import (
2725
PolicyTagManagerAsyncClient,
2826
)
29-
from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.client import (
27+
from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.client import (
3028
PolicyTagManagerSerializationClient,
3129
)
32-
from google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.async_client import (
30+
from google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.async_client import (
3331
PolicyTagManagerSerializationAsyncClient,
3432
)
3533

36-
from google.cloud.datacatalog_v1beta1.types.common import IntegratedSystem
37-
from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateEntryGroupRequest
38-
from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateEntryRequest
39-
from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateTagRequest
40-
from google.cloud.datacatalog_v1beta1.types.datacatalog import (
41-
CreateTagTemplateFieldRequest,
42-
)
43-
from google.cloud.datacatalog_v1beta1.types.datacatalog import CreateTagTemplateRequest
44-
from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteEntryGroupRequest
45-
from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteEntryRequest
46-
from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteTagRequest
47-
from google.cloud.datacatalog_v1beta1.types.datacatalog import (
48-
DeleteTagTemplateFieldRequest,
49-
)
50-
from google.cloud.datacatalog_v1beta1.types.datacatalog import DeleteTagTemplateRequest
51-
from google.cloud.datacatalog_v1beta1.types.datacatalog import Entry
52-
from google.cloud.datacatalog_v1beta1.types.datacatalog import EntryGroup
53-
from google.cloud.datacatalog_v1beta1.types.datacatalog import GetEntryGroupRequest
54-
from google.cloud.datacatalog_v1beta1.types.datacatalog import GetEntryRequest
55-
from google.cloud.datacatalog_v1beta1.types.datacatalog import GetTagTemplateRequest
56-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntriesRequest
57-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntriesResponse
58-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntryGroupsRequest
59-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListEntryGroupsResponse
60-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListTagsRequest
61-
from google.cloud.datacatalog_v1beta1.types.datacatalog import ListTagsResponse
62-
from google.cloud.datacatalog_v1beta1.types.datacatalog import LookupEntryRequest
63-
from google.cloud.datacatalog_v1beta1.types.datacatalog import (
64-
RenameTagTemplateFieldRequest,
65-
)
66-
from google.cloud.datacatalog_v1beta1.types.datacatalog import SearchCatalogRequest
67-
from google.cloud.datacatalog_v1beta1.types.datacatalog import SearchCatalogResponse
68-
from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateEntryGroupRequest
69-
from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateEntryRequest
70-
from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateTagRequest
71-
from google.cloud.datacatalog_v1beta1.types.datacatalog import (
72-
UpdateTagTemplateFieldRequest,
73-
)
74-
from google.cloud.datacatalog_v1beta1.types.datacatalog import UpdateTagTemplateRequest
75-
from google.cloud.datacatalog_v1beta1.types.datacatalog import EntryType
76-
from google.cloud.datacatalog_v1beta1.types.gcs_fileset_spec import GcsFilesetSpec
77-
from google.cloud.datacatalog_v1beta1.types.gcs_fileset_spec import GcsFileSpec
78-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
79-
CreatePolicyTagRequest,
80-
)
81-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
82-
CreateTaxonomyRequest,
83-
)
84-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
85-
DeletePolicyTagRequest,
86-
)
87-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
88-
DeleteTaxonomyRequest,
89-
)
90-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import GetPolicyTagRequest
91-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import GetTaxonomyRequest
92-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
93-
ListPolicyTagsRequest,
94-
)
95-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
96-
ListPolicyTagsResponse,
97-
)
98-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
99-
ListTaxonomiesRequest,
100-
)
101-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
102-
ListTaxonomiesResponse,
103-
)
104-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import PolicyTag
105-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import Taxonomy
106-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
107-
UpdatePolicyTagRequest,
108-
)
109-
from google.cloud.datacatalog_v1beta1.types.policytagmanager import (
110-
UpdateTaxonomyRequest,
111-
)
112-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
34+
from google.cloud.datacatalog_v1.types.bigquery import BigQueryConnectionSpec
35+
from google.cloud.datacatalog_v1.types.bigquery import BigQueryRoutineSpec
36+
from google.cloud.datacatalog_v1.types.bigquery import CloudSqlBigQueryConnectionSpec
37+
from google.cloud.datacatalog_v1.types.common import IntegratedSystem
38+
from google.cloud.datacatalog_v1.types.data_source import DataSource
39+
from google.cloud.datacatalog_v1.types.datacatalog import CreateEntryGroupRequest
40+
from google.cloud.datacatalog_v1.types.datacatalog import CreateEntryRequest
41+
from google.cloud.datacatalog_v1.types.datacatalog import CreateTagRequest
42+
from google.cloud.datacatalog_v1.types.datacatalog import CreateTagTemplateFieldRequest
43+
from google.cloud.datacatalog_v1.types.datacatalog import CreateTagTemplateRequest
44+
from google.cloud.datacatalog_v1.types.datacatalog import DatabaseTableSpec
45+
from google.cloud.datacatalog_v1.types.datacatalog import DataSourceConnectionSpec
46+
from google.cloud.datacatalog_v1.types.datacatalog import DeleteEntryGroupRequest
47+
from google.cloud.datacatalog_v1.types.datacatalog import DeleteEntryRequest
48+
from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagRequest
49+
from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagTemplateFieldRequest
50+
from google.cloud.datacatalog_v1.types.datacatalog import DeleteTagTemplateRequest
51+
from google.cloud.datacatalog_v1.types.datacatalog import Entry
52+
from google.cloud.datacatalog_v1.types.datacatalog import EntryGroup
53+
from google.cloud.datacatalog_v1.types.datacatalog import GetEntryGroupRequest
54+
from google.cloud.datacatalog_v1.types.datacatalog import GetEntryRequest
55+
from google.cloud.datacatalog_v1.types.datacatalog import GetTagTemplateRequest
56+
from google.cloud.datacatalog_v1.types.datacatalog import ListEntriesRequest
57+
from google.cloud.datacatalog_v1.types.datacatalog import ListEntriesResponse
58+
from google.cloud.datacatalog_v1.types.datacatalog import ListEntryGroupsRequest
59+
from google.cloud.datacatalog_v1.types.datacatalog import ListEntryGroupsResponse
60+
from google.cloud.datacatalog_v1.types.datacatalog import ListTagsRequest
61+
from google.cloud.datacatalog_v1.types.datacatalog import ListTagsResponse
62+
from google.cloud.datacatalog_v1.types.datacatalog import LookupEntryRequest
63+
from google.cloud.datacatalog_v1.types.datacatalog import (
64+
RenameTagTemplateFieldEnumValueRequest,
65+
)
66+
from google.cloud.datacatalog_v1.types.datacatalog import RenameTagTemplateFieldRequest
67+
from google.cloud.datacatalog_v1.types.datacatalog import RoutineSpec
68+
from google.cloud.datacatalog_v1.types.datacatalog import SearchCatalogRequest
69+
from google.cloud.datacatalog_v1.types.datacatalog import SearchCatalogResponse
70+
from google.cloud.datacatalog_v1.types.datacatalog import UpdateEntryGroupRequest
71+
from google.cloud.datacatalog_v1.types.datacatalog import UpdateEntryRequest
72+
from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagRequest
73+
from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagTemplateFieldRequest
74+
from google.cloud.datacatalog_v1.types.datacatalog import UpdateTagTemplateRequest
75+
from google.cloud.datacatalog_v1.types.datacatalog import EntryType
76+
from google.cloud.datacatalog_v1.types.gcs_fileset_spec import GcsFilesetSpec
77+
from google.cloud.datacatalog_v1.types.gcs_fileset_spec import GcsFileSpec
78+
from google.cloud.datacatalog_v1.types.policytagmanager import CreatePolicyTagRequest
79+
from google.cloud.datacatalog_v1.types.policytagmanager import CreateTaxonomyRequest
80+
from google.cloud.datacatalog_v1.types.policytagmanager import DeletePolicyTagRequest
81+
from google.cloud.datacatalog_v1.types.policytagmanager import DeleteTaxonomyRequest
82+
from google.cloud.datacatalog_v1.types.policytagmanager import GetPolicyTagRequest
83+
from google.cloud.datacatalog_v1.types.policytagmanager import GetTaxonomyRequest
84+
from google.cloud.datacatalog_v1.types.policytagmanager import ListPolicyTagsRequest
85+
from google.cloud.datacatalog_v1.types.policytagmanager import ListPolicyTagsResponse
86+
from google.cloud.datacatalog_v1.types.policytagmanager import ListTaxonomiesRequest
87+
from google.cloud.datacatalog_v1.types.policytagmanager import ListTaxonomiesResponse
88+
from google.cloud.datacatalog_v1.types.policytagmanager import PolicyTag
89+
from google.cloud.datacatalog_v1.types.policytagmanager import Taxonomy
90+
from google.cloud.datacatalog_v1.types.policytagmanager import UpdatePolicyTagRequest
91+
from google.cloud.datacatalog_v1.types.policytagmanager import UpdateTaxonomyRequest
92+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
93+
CrossRegionalSource,
94+
)
95+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
11396
ExportTaxonomiesRequest,
11497
)
115-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
98+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
11699
ExportTaxonomiesResponse,
117100
)
118-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
101+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
119102
ImportTaxonomiesRequest,
120103
)
121-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
104+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
122105
ImportTaxonomiesResponse,
123106
)
124-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
125-
InlineSource,
107+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import InlineSource
108+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
109+
ReplaceTaxonomyRequest,
126110
)
127-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
111+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
128112
SerializedPolicyTag,
129113
)
130-
from google.cloud.datacatalog_v1beta1.types.policytagmanagerserialization import (
114+
from google.cloud.datacatalog_v1.types.policytagmanagerserialization import (
131115
SerializedTaxonomy,
132116
)
133-
from google.cloud.datacatalog_v1beta1.types.schema import ColumnSchema
134-
from google.cloud.datacatalog_v1beta1.types.schema import Schema
135-
from google.cloud.datacatalog_v1beta1.types.search import SearchCatalogResult
136-
from google.cloud.datacatalog_v1beta1.types.search import SearchResultType
137-
from google.cloud.datacatalog_v1beta1.types.table_spec import BigQueryDateShardedSpec
138-
from google.cloud.datacatalog_v1beta1.types.table_spec import BigQueryTableSpec
139-
from google.cloud.datacatalog_v1beta1.types.table_spec import TableSpec
140-
from google.cloud.datacatalog_v1beta1.types.table_spec import ViewSpec
141-
from google.cloud.datacatalog_v1beta1.types.table_spec import TableSourceType
142-
from google.cloud.datacatalog_v1beta1.types.tags import FieldType
143-
from google.cloud.datacatalog_v1beta1.types.tags import Tag
144-
from google.cloud.datacatalog_v1beta1.types.tags import TagField
145-
from google.cloud.datacatalog_v1beta1.types.tags import TagTemplate
146-
from google.cloud.datacatalog_v1beta1.types.tags import TagTemplateField
147-
from google.cloud.datacatalog_v1beta1.types.timestamps import SystemTimestamps
117+
from google.cloud.datacatalog_v1.types.schema import ColumnSchema
118+
from google.cloud.datacatalog_v1.types.schema import Schema
119+
from google.cloud.datacatalog_v1.types.search import SearchCatalogResult
120+
from google.cloud.datacatalog_v1.types.search import SearchResultType
121+
from google.cloud.datacatalog_v1.types.table_spec import BigQueryDateShardedSpec
122+
from google.cloud.datacatalog_v1.types.table_spec import BigQueryTableSpec
123+
from google.cloud.datacatalog_v1.types.table_spec import TableSpec
124+
from google.cloud.datacatalog_v1.types.table_spec import ViewSpec
125+
from google.cloud.datacatalog_v1.types.table_spec import TableSourceType
126+
from google.cloud.datacatalog_v1.types.tags import FieldType
127+
from google.cloud.datacatalog_v1.types.tags import Tag
128+
from google.cloud.datacatalog_v1.types.tags import TagField
129+
from google.cloud.datacatalog_v1.types.tags import TagTemplate
130+
from google.cloud.datacatalog_v1.types.tags import TagTemplateField
131+
from google.cloud.datacatalog_v1.types.timestamps import SystemTimestamps
132+
from google.cloud.datacatalog_v1.types.usage import UsageSignal
133+
from google.cloud.datacatalog_v1.types.usage import UsageStats
148134

149135
__all__ = (
150136
"DataCatalogClient",
@@ -153,12 +139,18 @@
153139
"PolicyTagManagerAsyncClient",
154140
"PolicyTagManagerSerializationClient",
155141
"PolicyTagManagerSerializationAsyncClient",
142+
"BigQueryConnectionSpec",
143+
"BigQueryRoutineSpec",
144+
"CloudSqlBigQueryConnectionSpec",
156145
"IntegratedSystem",
146+
"DataSource",
157147
"CreateEntryGroupRequest",
158148
"CreateEntryRequest",
159149
"CreateTagRequest",
160150
"CreateTagTemplateFieldRequest",
161151
"CreateTagTemplateRequest",
152+
"DatabaseTableSpec",
153+
"DataSourceConnectionSpec",
162154
"DeleteEntryGroupRequest",
163155
"DeleteEntryRequest",
164156
"DeleteTagRequest",
@@ -176,7 +168,9 @@
176168
"ListTagsRequest",
177169
"ListTagsResponse",
178170
"LookupEntryRequest",
171+
"RenameTagTemplateFieldEnumValueRequest",
179172
"RenameTagTemplateFieldRequest",
173+
"RoutineSpec",
180174
"SearchCatalogRequest",
181175
"SearchCatalogResponse",
182176
"UpdateEntryGroupRequest",
@@ -201,11 +195,13 @@
201195
"Taxonomy",
202196
"UpdatePolicyTagRequest",
203197
"UpdateTaxonomyRequest",
198+
"CrossRegionalSource",
204199
"ExportTaxonomiesRequest",
205200
"ExportTaxonomiesResponse",
206201
"ImportTaxonomiesRequest",
207202
"ImportTaxonomiesResponse",
208203
"InlineSource",
204+
"ReplaceTaxonomyRequest",
209205
"SerializedPolicyTag",
210206
"SerializedTaxonomy",
211207
"ColumnSchema",
@@ -223,4 +219,6 @@
223219
"TagTemplate",
224220
"TagTemplateField",
225221
"SystemTimestamps",
222+
"UsageSignal",
223+
"UsageStats",
226224
)

‎owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
common = gcp.CommonTemplates()
2222

23-
default_version = "v1beta1"
23+
default_version = "v1"
2424

2525
for library in s.get_staging_dirs(default_version):
2626
s.move(

‎samples/v1beta1/conftest.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,19 @@ def entry(client, entry_group_name):
8585
random_entry_id = "example_entry_{}_{}".format(
8686
now.strftime("%Y%m%d%H%M%S"), uuid.uuid4().hex[:8]
8787
)
88-
entry = datacatalog_v1beta1.CreateEntryRequest
89-
entry = client.create_entry(
90-
request={"parent": entry_group_name, "entry_id": random_entry_id, "entry": {"type_": "DATA_STREAM", "name": "samples_test_entry"}}
88+
89+
request = datacatalog_v1beta1.CreateEntryRequest(
90+
parent=entry_group_name,
91+
entry_id=random_entry_id,
92+
entry=datacatalog_v1beta1.Entry(
93+
type_=datacatalog_v1beta1.EntryType.DATA_STREAM,
94+
name="samples_test_entry",
95+
user_specified_system="sample_system",
96+
)
9197
)
98+
99+
entry = client.create_entry(request)
100+
92101
yield entry.name
93102
client.delete_entry(request={"name": entry.name})
94103

0 commit comments

Comments
 (0)