From e5d06c8ebbe092da7b1c1b9c086aeea3d31a57e8 Mon Sep 17 00:00:00 2001
From: Adler Santos <adlersantos@google.com>
Date: Fri, 12 Nov 2021 17:14:29 -0500
Subject: [PATCH] fix: Namespace Terraform resources under dataset names

---
 .../_terraform/waste_and_diversion_pipeline.tf         | 10 +++++-----
 datasets/bls/_terraform/c_cpi_u_pipeline.tf            | 10 +++++-----
 datasets/bls/_terraform/cpi_u_pipeline.tf              | 10 +++++-----
 .../_terraform/employment_hours_earnings_pipeline.tf   | 10 +++++-----
 .../employment_hours_earnings_series_pipeline.tf       | 10 +++++-----
 datasets/bls/_terraform/unemployment_cps_pipeline.tf   | 10 +++++-----
 .../bls/_terraform/unemployment_cps_series_pipeline.tf | 10 +++++-----
 datasets/bls/_terraform/wm_pipeline.tf                 | 10 +++++-----
 datasets/bls/_terraform/wm_series_pipeline.tf          | 10 +++++-----
 datasets/chicago_crime/_terraform/crime_pipeline.tf    | 10 +++++-----
 .../_terraform/country_series_definitions_pipeline.tf  | 10 +++++-----
 .../_terraform/country_summary_pipeline.tf             | 10 +++++-----
 .../_terraform/series_summary_pipeline.tf              | 10 +++++-----
 13 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf b/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf
index b8a8a8784..23dd90e9a 100644
--- a/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf
+++ b/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "waste_and_diversion" {
+resource "google_bigquery_table" "austin_waste_waste_and_diversion" {
   project    = var.project_id
   dataset_id = "austin_waste"
   table_id   = "waste_and_diversion"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "waste_and_diversion" {
   ]
 }
 
-output "bigquery_table-waste_and_diversion-table_id" {
-  value = google_bigquery_table.waste_and_diversion.table_id
+output "bigquery_table-austin_waste_waste_and_diversion-table_id" {
+  value = google_bigquery_table.austin_waste_waste_and_diversion.table_id
 }
 
-output "bigquery_table-waste_and_diversion-id" {
-  value = google_bigquery_table.waste_and_diversion.id
+output "bigquery_table-austin_waste_waste_and_diversion-id" {
+  value = google_bigquery_table.austin_waste_waste_and_diversion.id
 }
diff --git a/datasets/bls/_terraform/c_cpi_u_pipeline.tf b/datasets/bls/_terraform/c_cpi_u_pipeline.tf
index 4a29916ab..4945b150f 100644
--- a/datasets/bls/_terraform/c_cpi_u_pipeline.tf
+++ b/datasets/bls/_terraform/c_cpi_u_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "c_cpi_u" {
+resource "google_bigquery_table" "bls_c_cpi_u" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "c_cpi_u"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "c_cpi_u" {
   ]
 }
 
-output "bigquery_table-c_cpi_u-table_id" {
-  value = google_bigquery_table.c_cpi_u.table_id
+output "bigquery_table-bls_c_cpi_u-table_id" {
+  value = google_bigquery_table.bls_c_cpi_u.table_id
 }
 
-output "bigquery_table-c_cpi_u-id" {
-  value = google_bigquery_table.c_cpi_u.id
+output "bigquery_table-bls_c_cpi_u-id" {
+  value = google_bigquery_table.bls_c_cpi_u.id
 }
diff --git a/datasets/bls/_terraform/cpi_u_pipeline.tf b/datasets/bls/_terraform/cpi_u_pipeline.tf
index 3243e03d2..cc4a66e11 100644
--- a/datasets/bls/_terraform/cpi_u_pipeline.tf
+++ b/datasets/bls/_terraform/cpi_u_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "cpi_u" {
+resource "google_bigquery_table" "bls_cpi_u" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "cpi_u"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "cpi_u" {
   ]
 }
 
-output "bigquery_table-cpi_u-table_id" {
-  value = google_bigquery_table.cpi_u.table_id
+output "bigquery_table-bls_cpi_u-table_id" {
+  value = google_bigquery_table.bls_cpi_u.table_id
 }
 
-output "bigquery_table-cpi_u-id" {
-  value = google_bigquery_table.cpi_u.id
+output "bigquery_table-bls_cpi_u-id" {
+  value = google_bigquery_table.bls_cpi_u.id
 }
diff --git a/datasets/bls/_terraform/employment_hours_earnings_pipeline.tf b/datasets/bls/_terraform/employment_hours_earnings_pipeline.tf
index 8dda55cdb..1591f34cd 100644
--- a/datasets/bls/_terraform/employment_hours_earnings_pipeline.tf
+++ b/datasets/bls/_terraform/employment_hours_earnings_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "employment_hours_earnings" {
+resource "google_bigquery_table" "bls_employment_hours_earnings" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "employment_hours_earnings"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "employment_hours_earnings" {
   ]
 }
 
-output "bigquery_table-employment_hours_earnings-table_id" {
-  value = google_bigquery_table.employment_hours_earnings.table_id
+output "bigquery_table-bls_employment_hours_earnings-table_id" {
+  value = google_bigquery_table.bls_employment_hours_earnings.table_id
 }
 
-output "bigquery_table-employment_hours_earnings-id" {
-  value = google_bigquery_table.employment_hours_earnings.id
+output "bigquery_table-bls_employment_hours_earnings-id" {
+  value = google_bigquery_table.bls_employment_hours_earnings.id
 }
diff --git a/datasets/bls/_terraform/employment_hours_earnings_series_pipeline.tf b/datasets/bls/_terraform/employment_hours_earnings_series_pipeline.tf
index 0b29a0a66..57f3877cc 100644
--- a/datasets/bls/_terraform/employment_hours_earnings_series_pipeline.tf
+++ b/datasets/bls/_terraform/employment_hours_earnings_series_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "employment_hours_earnings_series" {
+resource "google_bigquery_table" "bls_employment_hours_earnings_series" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "employment_hours_earnings_series"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "employment_hours_earnings_series" {
   ]
 }
 
-output "bigquery_table-employment_hours_earnings_series-table_id" {
-  value = google_bigquery_table.employment_hours_earnings_series.table_id
+output "bigquery_table-bls_employment_hours_earnings_series-table_id" {
+  value = google_bigquery_table.bls_employment_hours_earnings_series.table_id
 }
 
-output "bigquery_table-employment_hours_earnings_series-id" {
-  value = google_bigquery_table.employment_hours_earnings_series.id
+output "bigquery_table-bls_employment_hours_earnings_series-id" {
+  value = google_bigquery_table.bls_employment_hours_earnings_series.id
 }
diff --git a/datasets/bls/_terraform/unemployment_cps_pipeline.tf b/datasets/bls/_terraform/unemployment_cps_pipeline.tf
index 61c9e19b8..e7e34afe8 100644
--- a/datasets/bls/_terraform/unemployment_cps_pipeline.tf
+++ b/datasets/bls/_terraform/unemployment_cps_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "unemployment_cps" {
+resource "google_bigquery_table" "bls_unemployment_cps" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "unemployment_cps"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "unemployment_cps" {
   ]
 }
 
-output "bigquery_table-unemployment_cps-table_id" {
-  value = google_bigquery_table.unemployment_cps.table_id
+output "bigquery_table-bls_unemployment_cps-table_id" {
+  value = google_bigquery_table.bls_unemployment_cps.table_id
 }
 
-output "bigquery_table-unemployment_cps-id" {
-  value = google_bigquery_table.unemployment_cps.id
+output "bigquery_table-bls_unemployment_cps-id" {
+  value = google_bigquery_table.bls_unemployment_cps.id
 }
diff --git a/datasets/bls/_terraform/unemployment_cps_series_pipeline.tf b/datasets/bls/_terraform/unemployment_cps_series_pipeline.tf
index 22f8561fc..807b119a7 100644
--- a/datasets/bls/_terraform/unemployment_cps_series_pipeline.tf
+++ b/datasets/bls/_terraform/unemployment_cps_series_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "unemployment_cps_series" {
+resource "google_bigquery_table" "bls_unemployment_cps_series" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "unemployment_cps_series"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "unemployment_cps_series" {
   ]
 }
 
-output "bigquery_table-unemployment_cps_series-table_id" {
-  value = google_bigquery_table.unemployment_cps_series.table_id
+output "bigquery_table-bls_unemployment_cps_series-table_id" {
+  value = google_bigquery_table.bls_unemployment_cps_series.table_id
 }
 
-output "bigquery_table-unemployment_cps_series-id" {
-  value = google_bigquery_table.unemployment_cps_series.id
+output "bigquery_table-bls_unemployment_cps_series-id" {
+  value = google_bigquery_table.bls_unemployment_cps_series.id
 }
diff --git a/datasets/bls/_terraform/wm_pipeline.tf b/datasets/bls/_terraform/wm_pipeline.tf
index 31209ba1f..0e1b000fb 100644
--- a/datasets/bls/_terraform/wm_pipeline.tf
+++ b/datasets/bls/_terraform/wm_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "wm" {
+resource "google_bigquery_table" "bls_wm" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "wm"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "wm" {
   ]
 }
 
-output "bigquery_table-wm-table_id" {
-  value = google_bigquery_table.wm.table_id
+output "bigquery_table-bls_wm-table_id" {
+  value = google_bigquery_table.bls_wm.table_id
 }
 
-output "bigquery_table-wm-id" {
-  value = google_bigquery_table.wm.id
+output "bigquery_table-bls_wm-id" {
+  value = google_bigquery_table.bls_wm.id
 }
diff --git a/datasets/bls/_terraform/wm_series_pipeline.tf b/datasets/bls/_terraform/wm_series_pipeline.tf
index 81367e1f8..0811e184e 100644
--- a/datasets/bls/_terraform/wm_series_pipeline.tf
+++ b/datasets/bls/_terraform/wm_series_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "wm_series" {
+resource "google_bigquery_table" "bls_wm_series" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "wm_series"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "wm_series" {
   ]
 }
 
-output "bigquery_table-wm_series-table_id" {
-  value = google_bigquery_table.wm_series.table_id
+output "bigquery_table-bls_wm_series-table_id" {
+  value = google_bigquery_table.bls_wm_series.table_id
 }
 
-output "bigquery_table-wm_series-id" {
-  value = google_bigquery_table.wm_series.id
+output "bigquery_table-bls_wm_series-id" {
+  value = google_bigquery_table.bls_wm_series.id
 }
diff --git a/datasets/chicago_crime/_terraform/crime_pipeline.tf b/datasets/chicago_crime/_terraform/crime_pipeline.tf
index a76556314..c79c9d51a 100644
--- a/datasets/chicago_crime/_terraform/crime_pipeline.tf
+++ b/datasets/chicago_crime/_terraform/crime_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "crime" {
+resource "google_bigquery_table" "chicago_crime_crime" {
   project    = var.project_id
   dataset_id = "chicago_crime"
   table_id   = "crime"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "crime" {
   ]
 }
 
-output "bigquery_table-crime-table_id" {
-  value = google_bigquery_table.crime.table_id
+output "bigquery_table-chicago_crime_crime-table_id" {
+  value = google_bigquery_table.chicago_crime_crime.table_id
 }
 
-output "bigquery_table-crime-id" {
-  value = google_bigquery_table.crime.id
+output "bigquery_table-chicago_crime_crime-id" {
+  value = google_bigquery_table.chicago_crime_crime.id
 }
diff --git a/datasets/world_bank_intl_education/_terraform/country_series_definitions_pipeline.tf b/datasets/world_bank_intl_education/_terraform/country_series_definitions_pipeline.tf
index d4cc7a813..f47fb019d 100644
--- a/datasets/world_bank_intl_education/_terraform/country_series_definitions_pipeline.tf
+++ b/datasets/world_bank_intl_education/_terraform/country_series_definitions_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_series_definitions" {
+resource "google_bigquery_table" "world_bank_intl_education_country_series_definitions" {
   project    = var.project_id
   dataset_id = "world_bank_intl_education"
   table_id   = "country_series_definitions"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_series_definitions" {
   ]
 }
 
-output "bigquery_table-country_series_definitions-table_id" {
-  value = google_bigquery_table.country_series_definitions.table_id
+output "bigquery_table-world_bank_intl_education_country_series_definitions-table_id" {
+  value = google_bigquery_table.world_bank_intl_education_country_series_definitions.table_id
 }
 
-output "bigquery_table-country_series_definitions-id" {
-  value = google_bigquery_table.country_series_definitions.id
+output "bigquery_table-world_bank_intl_education_country_series_definitions-id" {
+  value = google_bigquery_table.world_bank_intl_education_country_series_definitions.id
 }
diff --git a/datasets/world_bank_intl_education/_terraform/country_summary_pipeline.tf b/datasets/world_bank_intl_education/_terraform/country_summary_pipeline.tf
index 972a7818b..c80ad4af5 100644
--- a/datasets/world_bank_intl_education/_terraform/country_summary_pipeline.tf
+++ b/datasets/world_bank_intl_education/_terraform/country_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_summary" {
+resource "google_bigquery_table" "world_bank_intl_education_country_summary" {
   project    = var.project_id
   dataset_id = "world_bank_intl_education"
   table_id   = "country_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_summary" {
   ]
 }
 
-output "bigquery_table-country_summary-table_id" {
-  value = google_bigquery_table.country_summary.table_id
+output "bigquery_table-world_bank_intl_education_country_summary-table_id" {
+  value = google_bigquery_table.world_bank_intl_education_country_summary.table_id
 }
 
-output "bigquery_table-country_summary-id" {
-  value = google_bigquery_table.country_summary.id
+output "bigquery_table-world_bank_intl_education_country_summary-id" {
+  value = google_bigquery_table.world_bank_intl_education_country_summary.id
 }
diff --git a/datasets/world_bank_intl_education/_terraform/series_summary_pipeline.tf b/datasets/world_bank_intl_education/_terraform/series_summary_pipeline.tf
index 2a9d5b256..4183b97f9 100644
--- a/datasets/world_bank_intl_education/_terraform/series_summary_pipeline.tf
+++ b/datasets/world_bank_intl_education/_terraform/series_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "series_summary" {
+resource "google_bigquery_table" "world_bank_intl_education_series_summary" {
   project    = var.project_id
   dataset_id = "world_bank_intl_education"
   table_id   = "series_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "series_summary" {
   ]
 }
 
-output "bigquery_table-series_summary-table_id" {
-  value = google_bigquery_table.series_summary.table_id
+output "bigquery_table-world_bank_intl_education_series_summary-table_id" {
+  value = google_bigquery_table.world_bank_intl_education_series_summary.table_id
 }
 
-output "bigquery_table-series_summary-id" {
-  value = google_bigquery_table.series_summary.id
+output "bigquery_table-world_bank_intl_education_series_summary-id" {
+  value = google_bigquery_table.world_bank_intl_education_series_summary.id
 }