You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2021/03/03 09:37:34 UTC
[airflow] 08/28: Support google-cloud-datacatalog>=1.0.0 (#13097)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 51d70e3b02409f085e18e9c3043ab71d9055a850
Author: Kamil BreguĊa <mi...@users.noreply.github.com>
AuthorDate: Tue Dec 22 12:58:45 2020 +0100
Support google-cloud-datacatalog>=1.0.0 (#13097)
(cherry picked from commit 9a1d3820d6f1373df790da8751f25e723f9ce037)
---
airflow/providers/google/cloud/hooks/datacatalog.py | 6 +++---
setup.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/airflow/providers/google/cloud/hooks/datacatalog.py b/airflow/providers/google/cloud/hooks/datacatalog.py
index 9c689c3..70b488d 100644
--- a/airflow/providers/google/cloud/hooks/datacatalog.py
+++ b/airflow/providers/google/cloud/hooks/datacatalog.py
@@ -537,7 +537,7 @@ class CloudDataCatalogHook(GoogleBaseHook):
:type metadata: Sequence[Tuple[str, str]]
"""
client = self.get_conn()
- name = DataCatalogClient.field_path(project_id, location, tag_template, field)
+ name = DataCatalogClient.tag_template_field_path(project_id, location, tag_template, field)
self.log.info('Deleting a tag template field: name=%s', name)
client.delete_tag_template_field(
@@ -860,7 +860,7 @@ class CloudDataCatalogHook(GoogleBaseHook):
:type metadata: Sequence[Tuple[str, str]]
"""
client = self.get_conn()
- name = DataCatalogClient.field_path(project_id, location, tag_template, field)
+ name = DataCatalogClient.tag_template_field_path(project_id, location, tag_template, field)
self.log.info(
'Renaming field: old_name=%s, new_tag_template_field_id=%s', name, new_tag_template_field_id
@@ -1246,7 +1246,7 @@ class CloudDataCatalogHook(GoogleBaseHook):
"""
client = self.get_conn()
if project_id and location and tag_template and tag_template_field_id:
- tag_template_field_name = DataCatalogClient.field_path(
+ tag_template_field_name = DataCatalogClient.tag_template_field_path(
project_id, location, tag_template, tag_template_field_id
)
diff --git a/setup.py b/setup.py
index 0586bf3..63dd6d7 100644
--- a/setup.py
+++ b/setup.py
@@ -287,7 +287,7 @@ google = [
'google-cloud-bigquery-datatransfer>=0.4.0,<2.0.0',
'google-cloud-bigtable>=1.0.0,<2.0.0',
'google-cloud-container>=0.1.1,<2.0.0',
- 'google-cloud-datacatalog>=0.5.0, <0.8', # TODO: we should migrate to 1.0 likely and add <2.0.0 then
+ 'google-cloud-datacatalog>=1.0.0,<2.0.0',
'google-cloud-dataproc>=1.0.1,<2.0.0',
'google-cloud-dlp>=0.11.0,<2.0.0',
'google-cloud-kms>=1.2.1,<2.0.0',