From 51291b9364880d48c2d122cb1f21706091f427a2 Mon Sep 17 00:00:00 2001 From: Henrique Silva Date: Tue, 24 May 2022 12:57:55 +0100 Subject: [PATCH 1/3] remove 'hack' on bigquery dts hook --- airflow/providers/google/cloud/hooks/bigquery_dts.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/airflow/providers/google/cloud/hooks/bigquery_dts.py b/airflow/providers/google/cloud/hooks/bigquery_dts.py index 9b5892e1b18e7..5a842189cb1d7 100644 --- a/airflow/providers/google/cloud/hooks/bigquery_dts.py +++ b/airflow/providers/google/cloud/hooks/bigquery_dts.py @@ -82,10 +82,7 @@ def _disable_auto_scheduling(config: Union[dict, TransferConfig]) -> TransferCon schedule_options["disable_auto_scheduling"] = True else: new_config["schedule_options"] = {"disable_auto_scheduling": True} - # HACK: TransferConfig.to_dict returns invalid representation - # See: https://github.com/googleapis/python-bigquery-datatransfer/issues/90 - if isinstance(new_config.get('user_id'), str): - new_config['user_id'] = int(new_config['user_id']) + return TransferConfig(**new_config) def get_conn(self) -> DataTransferServiceClient: From 8f8e6820c73d0c14061cbd69075af0c05d96ffe3 Mon Sep 17 00:00:00 2001 From: Henrique Silva Date: Thu, 26 May 2022 12:41:14 +0100 Subject: [PATCH 2/3] fix version of proto-plus for google --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e7d59516947cf..5054dcdb1e292 100644 --- a/setup.py +++ b/setup.py @@ -370,6 +370,7 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version 'pandas-gbq', pandas_requirement, 'sqlalchemy-bigquery>=1.2.1', + 'proto-plus>=1.19.6', ] grpc = [ # Google has very clear rules on what dependencies should be used. All the limits below From 7eecaaa47dea5a85c324c3728bf485385bb029e3 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Fri, 27 May 2022 13:10:31 +0800 Subject: [PATCH 3/3] Explain the proto-plus constraint --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 5054dcdb1e292..a256581c6cb5a 100644 --- a/setup.py +++ b/setup.py @@ -370,6 +370,8 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version 'pandas-gbq', pandas_requirement, 'sqlalchemy-bigquery>=1.2.1', + # A transient dependency of google-cloud-bigquery-datatransfer, but we + # further constrain it since older versions are buggy. 'proto-plus>=1.19.6', ] grpc = [