From 1f913acaf689f7820f16f4a90ac7b8cd61a31a57 Mon Sep 17 00:00:00 2001
From: Nicholas Large <84149918+nlarge-google@users.noreply.github.com>
Date: Fri, 14 Oct 2022 11:53:55 -0500
Subject: [PATCH] Fix: For COVID-19 Italy, resolve bucket variable in
 pipeline.yaml (#509)

---
 .../pipelines/data_by_province/data_by_province_dag.py          | 2 +-
 datasets/covid19_italy/pipelines/data_by_province/pipeline.yaml | 2 +-
 .../pipelines/data_by_region/data_by_region_dag.py              | 2 +-
 datasets/covid19_italy/pipelines/data_by_region/pipeline.yaml   | 2 +-
 .../pipelines/national_trends/national_trends_dag.py            | 2 +-
 datasets/covid19_italy/pipelines/national_trends/pipeline.yaml  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datasets/covid19_italy/pipelines/data_by_province/data_by_province_dag.py b/datasets/covid19_italy/pipelines/data_by_province/data_by_province_dag.py
index 8354365a1..06f003ed0 100644
--- a/datasets/covid19_italy/pipelines/data_by_province/data_by_province_dag.py
+++ b/datasets/covid19_italy/pipelines/data_by_province/data_by_province_dag.py
@@ -90,7 +90,7 @@
     # Task to load CSV data to a BigQuery table
     load_data_by_province_to_bq_eu = gcs_to_bigquery.GCSToBigQueryOperator(
         task_id="load_data_by_province_to_bq_eu",
-        bucket="public-datasets-dev-covid19-italy-eu",
+        bucket="{{ var.json.covid19_italy.destination_gcs_bucket }}",
         source_objects="province/data_output.csv",
         source_format="CSV",
         destination_project_dataset_table="covid19_italy_eu.data_by_province",
diff --git a/datasets/covid19_italy/pipelines/data_by_province/pipeline.yaml b/datasets/covid19_italy/pipelines/data_by_province/pipeline.yaml
index 579ed8443..2f773290b 100644
--- a/datasets/covid19_italy/pipelines/data_by_province/pipeline.yaml
+++ b/datasets/covid19_italy/pipelines/data_by_province/pipeline.yaml
@@ -121,7 +121,7 @@ dag:
       description: "Task to load CSV data to a BigQuery table"
       args:
         task_id: "load_data_by_province_to_bq_eu"
-        bucket: "public-datasets-dev-covid19-italy-eu"
+        bucket: "{{ var.json.covid19_italy.destination_gcs_bucket }}"
         source_objects: "province/data_output.csv"
         source_format: "CSV"
         destination_project_dataset_table: "covid19_italy_eu.data_by_province"
diff --git a/datasets/covid19_italy/pipelines/data_by_region/data_by_region_dag.py b/datasets/covid19_italy/pipelines/data_by_region/data_by_region_dag.py
index 53852cff7..ff0e72883 100644
--- a/datasets/covid19_italy/pipelines/data_by_region/data_by_region_dag.py
+++ b/datasets/covid19_italy/pipelines/data_by_region/data_by_region_dag.py
@@ -121,7 +121,7 @@
     # Task to load CSV data to a BigQuery table
     load_data_by_region_to_bq_eu = gcs_to_bigquery.GCSToBigQueryOperator(
         task_id="load_data_by_region_to_bq_eu",
-        bucket="public-datasets-dev-covid19-italy-eu",
+        bucket="{{ var.json.covid19_italy.destination_gcs_bucket }}",
         source_objects="region/data_output.csv",
         source_format="CSV",
         destination_project_dataset_table="covid19_italy_eu.data_by_region",
diff --git a/datasets/covid19_italy/pipelines/data_by_region/pipeline.yaml b/datasets/covid19_italy/pipelines/data_by_region/pipeline.yaml
index 5f930c8f8..7678d8f6a 100644
--- a/datasets/covid19_italy/pipelines/data_by_region/pipeline.yaml
+++ b/datasets/covid19_italy/pipelines/data_by_region/pipeline.yaml
@@ -141,7 +141,7 @@ dag:
       description: "Task to load CSV data to a BigQuery table"
       args:
         task_id: "load_data_by_region_to_bq_eu"
-        bucket: "public-datasets-dev-covid19-italy-eu"
+        bucket: "{{ var.json.covid19_italy.destination_gcs_bucket }}"
         source_objects: region/data_output.csv
         source_format: "CSV"
         destination_project_dataset_table: "covid19_italy_eu.data_by_region"
diff --git a/datasets/covid19_italy/pipelines/national_trends/national_trends_dag.py b/datasets/covid19_italy/pipelines/national_trends/national_trends_dag.py
index 92757b753..de7338134 100644
--- a/datasets/covid19_italy/pipelines/national_trends/national_trends_dag.py
+++ b/datasets/covid19_italy/pipelines/national_trends/national_trends_dag.py
@@ -116,7 +116,7 @@
     # Task to load CSV data to a BigQuery table
     load_national_trends_to_bq_eu = gcs_to_bigquery.GCSToBigQueryOperator(
         task_id="load_national_trends_to_bq_eu",
-        bucket="public-datasets-dev-covid19-italy-eu",
+        bucket="{{ var.json.covid19_italy.destination_gcs_bucket }}",
         source_objects="national/data_output.csv",
         source_format="CSV",
         destination_project_dataset_table="covid19_italy_eu.national_trends",
diff --git a/datasets/covid19_italy/pipelines/national_trends/pipeline.yaml b/datasets/covid19_italy/pipelines/national_trends/pipeline.yaml
index c4ec72c91..7a23439df 100644
--- a/datasets/covid19_italy/pipelines/national_trends/pipeline.yaml
+++ b/datasets/covid19_italy/pipelines/national_trends/pipeline.yaml
@@ -127,7 +127,7 @@ dag:
       description: "Task to load CSV data to a BigQuery table"
       args:
         task_id: "load_national_trends_to_bq_eu"
-        bucket: "public-datasets-dev-covid19-italy-eu"
+        bucket: "{{ var.json.covid19_italy.destination_gcs_bucket }}"
         source_objects: national/data_output.csv
         source_format: "CSV"
         destination_project_dataset_table: "covid19_italy_eu.national_trends"