Support google-cloud-datacatalog>=3.0.0 (#13534)

apache · Jan 11, 2021 · 947dbb7 · 947dbb7
1 parent 87a7557
commit 947dbb7
Show file tree

Hide file tree

Showing 7 changed files with 357 additions and 210 deletions.
diff --git a/airflow/providers/google/ADDITIONAL_INFO.md b/airflow/providers/google/ADDITIONAL_INFO.md
@@ -30,7 +30,7 @@ Details are covered in the UPDATING.md files for each library, but there are som
 | Library name | Previous constraints | Current constraints | |
 | --- | --- | --- | --- |
 | [``google-cloud-bigquery-datatransfer``](https://pypi.org/project/google-cloud-bigquery-datatransfer/) | ``>=0.4.0,<2.0.0`` | ``>=3.0.0,<4.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-bigquery-datatransfer/blob/master/UPGRADING.md) |
-| [``google-cloud-datacatalog``](https://pypi.org/project/google-cloud-datacatalog/) | ``>=0.5.0,<0.8`` | ``>=1.0.0,<2.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-datacatalog/blob/master/UPGRADING.md) |
+| [``google-cloud-datacatalog``](https://pypi.org/project/google-cloud-datacatalog/) | ``>=0.5.0,<0.8`` | ``>=3.0.0,<4.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-datacatalog/blob/master/UPGRADING.md) |
 | [``google-cloud-os-login``](https://pypi.org/project/google-cloud-os-login/) | ``>=1.0.0,<2.0.0`` | ``>=2.0.0,<3.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-oslogin/blob/master/UPGRADING.md) |
 | [``google-cloud-pubsub``](https://pypi.org/project/google-cloud-pubsub/) | ``>=1.0.0,<2.0.0`` | ``>=2.0.0,<3.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-pubsub/blob/master/UPGRADING.md) |
 | [``google-cloud-kms``](https://pypi.org/project/google-cloud-os-login/) | ``>=1.2.1,<2.0.0`` | ``>=2.0.0,<3.0.0`` | [`UPGRADING.md`](https://github.com/googleapis/python-kms/blob/master/UPGRADING.md) |

diff --git a/airflow/providers/google/cloud/example_dags/example_datacatalog.py b/airflow/providers/google/cloud/example_dags/example_datacatalog.py
@@ -19,7 +19,7 @@
 """
 Example Airflow DAG that interacts with Google Data Catalog service
 """
-from google.cloud.datacatalog_v1beta1.proto.tags_pb2 import FieldType, TagField, TagTemplateField
+from google.cloud.datacatalog_v1beta1 import FieldType, TagField, TagTemplateField
 
 from airflow import models
 from airflow.operators.bash_operator import BashOperator
@@ -91,7 +91,7 @@
  entry_id=ENTRY_ID,
  entry={
  "display_name": "Wizard",
- "type": "FILESET",
+ "type_": "FILESET",
  "gcs_fileset_spec": {"file_patterns": ["gs://test-datacatalog/**"]},
  },
  )
@@ -144,7 +144,7 @@
  "display_name": "Awesome Tag Template",
  "fields": {
  FIELD_NAME_1: TagTemplateField(
- display_name="first-field", type=FieldType(primitive_type="STRING")
+ display_name="first-field", type_=dict(primitive_type="STRING")
  )
  },
  },
@@ -172,7 +172,7 @@
  tag_template=TEMPLATE_ID,
  tag_template_field_id=FIELD_NAME_2,
  tag_template_field=TagTemplateField(
- display_name="second-field", type=FieldType(primitive_type="STRING")
+ display_name="second-field", type_=FieldType(primitive_type="STRING")
  ),
  )
  # [END howto_operator_gcp_datacatalog_create_tag_template_field]
@@ -305,7 +305,7 @@
  # [START howto_operator_gcp_datacatalog_lookup_entry_result]
  lookup_entry_result = BashOperator(
  task_id="lookup_entry_result",
- bash_command="echo \"{{ task_instance.xcom_pull('lookup_entry')['displayName'] }}\"",
+ bash_command="echo \"{{ task_instance.xcom_pull('lookup_entry')['display_name'] }}\"",
  )
  # [END howto_operator_gcp_datacatalog_lookup_entry_result]