feat!: Reorganize pipelines and infra files into their respective fol…

…ders (#292) * feat: Revise `generate_terraform` and tests * feat: Revise `generate_dag` and tests * feat: Revise `deploy_dag` and tests * feat: Revise tests for DAG conventions and integrity * add machine types guide to GKE cluster creation * revised README for new folder organization * Moved files into `pipelines` and `infra` folders
GoogleCloudPlatform · Feb 10, 2022 · 7408d44 · 7408d44
1 parent 92153a4
commit 7408d44
Show file tree

Hide file tree

Showing 943 changed files with 2,920 additions and 1,773 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,5 @@ tmp
 
 # ignore temp folders
 .tmp
+
+.DS_Store
diff --git a/README.md b/README.md
diff --git a/...ealth_rankings/_terraform/ahr_pipeline.tf → ...ica_health_rankings/infra/ahr_pipeline.tf b/...ealth_rankings/_terraform/ahr_pipeline.tf → ...ica_health_rankings/infra/ahr_pipeline.tf
diff --git a/...raform/america_health_rankings_dataset.tf → .../infra/america_health_rankings_dataset.tf b/...raform/america_health_rankings_dataset.tf → .../infra/america_health_rankings_dataset.tf
@@ -24,14 +24,3 @@ resource "google_bigquery_dataset" "america_health_rankings" {
 output "bigquery_dataset-america_health_rankings-dataset_id" {
   value = google_bigquery_dataset.america_health_rankings.dataset_id
 }
-
-resource "google_storage_bucket" "america-health-rankings" {
-  name                        = "${var.bucket_name_prefix}-america-health-rankings"
-  force_destroy               = true
-  location                    = "US"
-  uniform_bucket_level_access = true
-}
-
-output "storage_bucket-america-health-rankings-name" {
-  value = google_storage_bucket.america-health-rankings.name
-}
diff --git a/...ca_health_rankings/_terraform/provider.tf → ...america_health_rankings/infra/provider.tf b/...ca_health_rankings/_terraform/provider.tf → ...america_health_rankings/infra/provider.tf
diff --git a/...a_health_rankings/_terraform/variables.tf → ...merica_health_rankings/infra/variables.tf b/...a_health_rankings/_terraform/variables.tf → ...merica_health_rankings/infra/variables.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/...ts/america_health_rankings/ahr/ahr_dag.py → ..._health_rankings/pipelines/ahr/ahr_dag.py b/...ts/america_health_rankings/ahr/ahr_dag.py → ..._health_rankings/pipelines/ahr/ahr_dag.py
diff --git a/...america_health_rankings/ahr/pipeline.yaml → ...alth_rankings/pipelines/ahr/pipeline.yaml b/...america_health_rankings/ahr/pipeline.yaml → ...alth_rankings/pipelines/ahr/pipeline.yaml
diff --git a/...sets/america_health_rankings/dataset.yaml → ...ca_health_rankings/pipelines/dataset.yaml b/...sets/america_health_rankings/dataset.yaml → ...ca_health_rankings/pipelines/dataset.yaml
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 dataset:
-  name: cms_medicare
-  friendly_name: cms_medicare
-  description: CMS Medicare
+  name: america_health_rankings
+  friendly_name: America Health Rankings
+  description: America Health Rankings
   dataset_sources: ~
   terms_of_use: ~
 

diff --git a/...re/_terraform/austin_bikeshare_dataset.tf → ...keshare/infra/austin_bikeshare_dataset.tf b/...re/_terraform/austin_bikeshare_dataset.tf → ...keshare/infra/austin_bikeshare_dataset.tf
diff --git a/..._terraform/bikeshare_stations_pipeline.tf → ...hare/infra/bikeshare_stations_pipeline.tf b/..._terraform/bikeshare_stations_pipeline.tf → ...hare/infra/bikeshare_stations_pipeline.tf
diff --git a/...s/austin_bikeshare/_terraform/provider.tf → datasets/austin_bikeshare/infra/provider.tf b/...s/austin_bikeshare/_terraform/provider.tf → datasets/austin_bikeshare/infra/provider.tf
diff --git a/.../austin_bikeshare/_terraform/variables.tf → datasets/austin_bikeshare/infra/variables.tf b/.../austin_bikeshare/_terraform/variables.tf → datasets/austin_bikeshare/infra/variables.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/...eshare_stations/bikeshare_stations_dag.py → ...eshare_stations/bikeshare_stations_dag.py b/...eshare_stations/bikeshare_stations_dag.py → ...eshare_stations/bikeshare_stations_dag.py
diff --git a/...ikeshare/bikeshare_stations/pipeline.yaml → ...ipelines/bikeshare_stations/pipeline.yaml b/...ikeshare/bikeshare_stations/pipeline.yaml → ...ipelines/bikeshare_stations/pipeline.yaml
diff --git a/datasets/austin_bikeshare/dataset.yaml → ...s/austin_bikeshare/pipelines/dataset.yaml b/datasets/austin_bikeshare/dataset.yaml → ...s/austin_bikeshare/pipelines/dataset.yaml
diff --git a/..._crime/_terraform/austin_crime_dataset.tf → ...ustin_crime/infra/austin_crime_dataset.tf b/..._crime/_terraform/austin_crime_dataset.tf → ...ustin_crime/infra/austin_crime_dataset.tf
diff --git a/...austin_crime/_terraform/crime_pipeline.tf → ...sets/austin_crime/infra/crime_pipeline.tf b/...austin_crime/_terraform/crime_pipeline.tf → ...sets/austin_crime/infra/crime_pipeline.tf
diff --git a/datasets/austin_crime/_terraform/provider.tf → datasets/austin_crime/infra/provider.tf b/datasets/austin_crime/_terraform/provider.tf → datasets/austin_crime/infra/provider.tf
diff --git a/...sets/austin_crime/_terraform/variables.tf → datasets/austin_crime/infra/variables.tf b/...sets/austin_crime/_terraform/variables.tf → datasets/austin_crime/infra/variables.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/datasets/austin_crime/crime/crime_dag.py → ...austin_crime/pipelines/crime/crime_dag.py b/datasets/austin_crime/crime/crime_dag.py → ...austin_crime/pipelines/crime/crime_dag.py
diff --git a/datasets/austin_crime/crime/pipeline.yaml → ...ustin_crime/pipelines/crime/pipeline.yaml b/datasets/austin_crime/crime/pipeline.yaml → ...ustin_crime/pipelines/crime/pipeline.yaml
diff --git a/datasets/austin_crime/dataset.yaml → datasets/austin_crime/pipelines/dataset.yaml b/datasets/austin_crime/dataset.yaml → datasets/austin_crime/pipelines/dataset.yaml
diff --git a/..._waste/_terraform/austin_waste_dataset.tf → ...ustin_waste/infra/austin_waste_dataset.tf b/..._waste/_terraform/austin_waste_dataset.tf → ...ustin_waste/infra/austin_waste_dataset.tf
diff --git a/datasets/austin_waste/_terraform/provider.tf → datasets/austin_waste/infra/provider.tf b/datasets/austin_waste/_terraform/provider.tf → datasets/austin_waste/infra/provider.tf
diff --git a/...sets/austin_waste/_terraform/variables.tf → datasets/austin_waste/infra/variables.tf b/...sets/austin_waste/_terraform/variables.tf → datasets/austin_waste/infra/variables.tf
diff --git a/...terraform/waste_and_diversion_pipeline.tf → ...ste/infra/waste_and_diversion_pipeline.tf b/...terraform/waste_and_diversion_pipeline.tf → ...ste/infra/waste_and_diversion_pipeline.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/datasets/austin_waste/dataset.yaml → datasets/austin_waste/pipelines/dataset.yaml b/datasets/austin_waste/dataset.yaml → datasets/austin_waste/pipelines/dataset.yaml
diff --git a/...n_waste/waste_and_diversion/pipeline.yaml → ...pelines/waste_and_diversion/pipeline.yaml b/...n_waste/waste_and_diversion/pipeline.yaml → ...pelines/waste_and_diversion/pipeline.yaml
diff --git a/..._and_diversion/waste_and_diversion_dag.py → ..._and_diversion/waste_and_diversion_dag.py b/..._and_diversion/waste_and_diversion_dag.py → ..._and_diversion/waste_and_diversion_dag.py
diff --git a/datasets/bls/_terraform/bls_dataset.tf → datasets/bls/infra/bls_dataset.tf b/datasets/bls/_terraform/bls_dataset.tf → datasets/bls/infra/bls_dataset.tf
diff --git a/datasets/bls/_terraform/c_cpi_u_pipeline.tf → datasets/bls/infra/c_cpi_u_pipeline.tf b/datasets/bls/_terraform/c_cpi_u_pipeline.tf → datasets/bls/infra/c_cpi_u_pipeline.tf
diff --git a/datasets/bls/_terraform/cpi_u_pipeline.tf → datasets/bls/infra/cpi_u_pipeline.tf b/datasets/bls/_terraform/cpi_u_pipeline.tf → datasets/bls/infra/cpi_u_pipeline.tf
diff --git a/datasets/bls/_terraform/cpsaat18_pipeline.tf → datasets/bls/infra/cpsaat18_pipeline.tf b/datasets/bls/_terraform/cpsaat18_pipeline.tf → datasets/bls/infra/cpsaat18_pipeline.tf
diff --git a/...orm/employment_hours_earnings_pipeline.tf → ...fra/employment_hours_earnings_pipeline.tf b/...orm/employment_hours_earnings_pipeline.tf → ...fra/employment_hours_earnings_pipeline.tf
diff --git a/...loyment_hours_earnings_series_pipeline.tf → ...loyment_hours_earnings_series_pipeline.tf b/...loyment_hours_earnings_series_pipeline.tf → ...loyment_hours_earnings_series_pipeline.tf
diff --git a/datasets/bls/_terraform/provider.tf → datasets/bls/infra/provider.tf b/datasets/bls/_terraform/provider.tf → datasets/bls/infra/provider.tf
diff --git a/...s/_terraform/unemployment_cps_pipeline.tf → ...ts/bls/infra/unemployment_cps_pipeline.tf b/...s/_terraform/unemployment_cps_pipeline.tf → ...ts/bls/infra/unemployment_cps_pipeline.tf
diff --git a/...aform/unemployment_cps_series_pipeline.tf → ...infra/unemployment_cps_series_pipeline.tf b/...aform/unemployment_cps_series_pipeline.tf → ...infra/unemployment_cps_series_pipeline.tf
diff --git a/datasets/bls/_terraform/variables.tf → datasets/bls/infra/variables.tf b/datasets/bls/_terraform/variables.tf → datasets/bls/infra/variables.tf
diff --git a/datasets/bls/_terraform/wm_pipeline.tf → datasets/bls/infra/wm_pipeline.tf b/datasets/bls/_terraform/wm_pipeline.tf → datasets/bls/infra/wm_pipeline.tf
diff --git a/...sets/bls/_terraform/wm_series_pipeline.tf → datasets/bls/infra/wm_series_pipeline.tf b/...sets/bls/_terraform/wm_series_pipeline.tf → datasets/bls/infra/wm_series_pipeline.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/datasets/bls/c_cpi_u/c_cpi_u_dag.py → ...sets/bls/pipelines/c_cpi_u/c_cpi_u_dag.py b/datasets/bls/c_cpi_u/c_cpi_u_dag.py → ...sets/bls/pipelines/c_cpi_u/c_cpi_u_dag.py
diff --git a/datasets/bls/c_cpi_u/pipeline.yaml → datasets/bls/pipelines/c_cpi_u/pipeline.yaml b/datasets/bls/c_cpi_u/pipeline.yaml → datasets/bls/pipelines/c_cpi_u/pipeline.yaml
diff --git a/datasets/bls/cpi_u/cpi_u_dag.py → datasets/bls/pipelines/cpi_u/cpi_u_dag.py b/datasets/bls/cpi_u/cpi_u_dag.py → datasets/bls/pipelines/cpi_u/cpi_u_dag.py
diff --git a/datasets/bls/cpi_u/pipeline.yaml → datasets/bls/pipelines/cpi_u/pipeline.yaml b/datasets/bls/cpi_u/pipeline.yaml → datasets/bls/pipelines/cpi_u/pipeline.yaml
diff --git a/datasets/bls/cpsaat18/cpsaat18_dag.py → ...ts/bls/pipelines/cpsaat18/cpsaat18_dag.py b/datasets/bls/cpsaat18/cpsaat18_dag.py → ...ts/bls/pipelines/cpsaat18/cpsaat18_dag.py
diff --git a/datasets/bls/cpsaat18/pipeline.yaml → ...sets/bls/pipelines/cpsaat18/pipeline.yaml b/datasets/bls/cpsaat18/pipeline.yaml → ...sets/bls/pipelines/cpsaat18/pipeline.yaml
diff --git a/datasets/bls/dataset.yaml → datasets/bls/pipelines/dataset.yaml b/datasets/bls/dataset.yaml → datasets/bls/pipelines/dataset.yaml
diff --git a/...earnings/employment_hours_earnings_dag.py → ...earnings/employment_hours_earnings_dag.py b/...earnings/employment_hours_earnings_dag.py → ...earnings/employment_hours_earnings_dag.py
diff --git a/...s/employment_hours_earnings/pipeline.yaml → ...s/employment_hours_earnings/pipeline.yaml b/...s/employment_hours_earnings/pipeline.yaml → ...s/employment_hours_earnings/pipeline.yaml
diff --git a/...s/employment_hours_earnings_series_dag.py → ...s/employment_hours_earnings_series_dag.py b/...s/employment_hours_earnings_series_dag.py → ...s/employment_hours_earnings_series_dag.py
diff --git a/...yment_hours_earnings_series/pipeline.yaml → ...yment_hours_earnings_series/pipeline.yaml b/...yment_hours_earnings_series/pipeline.yaml → ...yment_hours_earnings_series/pipeline.yaml
diff --git a/datasets/bls/unemployment_cps/pipeline.yaml → .../pipelines/unemployment_cps/pipeline.yaml b/datasets/bls/unemployment_cps/pipeline.yaml → .../pipelines/unemployment_cps/pipeline.yaml
diff --git a/.../unemployment_cps/unemployment_cps_dag.py → .../unemployment_cps/unemployment_cps_dag.py b/.../unemployment_cps/unemployment_cps_dag.py → .../unemployment_cps/unemployment_cps_dag.py
diff --git a/...bls/unemployment_cps_series/pipeline.yaml → ...nes/unemployment_cps_series/pipeline.yaml b/...bls/unemployment_cps_series/pipeline.yaml → ...nes/unemployment_cps_series/pipeline.yaml
diff --git a/...cps_series/unemployment_cps_series_dag.py → ...cps_series/unemployment_cps_series_dag.py b/...cps_series/unemployment_cps_series_dag.py → ...cps_series/unemployment_cps_series_dag.py
diff --git a/datasets/bls/wm/pipeline.yaml → datasets/bls/pipelines/wm/pipeline.yaml b/datasets/bls/wm/pipeline.yaml → datasets/bls/pipelines/wm/pipeline.yaml
diff --git a/datasets/bls/wm/wm_dag.py → datasets/bls/pipelines/wm/wm_dag.py b/datasets/bls/wm/wm_dag.py → datasets/bls/pipelines/wm/wm_dag.py
diff --git a/datasets/bls/wm_series/pipeline.yaml → ...ets/bls/pipelines/wm_series/pipeline.yaml b/datasets/bls/wm_series/pipeline.yaml → ...ets/bls/pipelines/wm_series/pipeline.yaml
diff --git a/datasets/bls/wm_series/wm_series_dag.py → .../bls/pipelines/wm_series/wm_series_dag.py b/datasets/bls/wm_series/wm_series_dag.py → .../bls/pipelines/wm_series/wm_series_dag.py
diff --git a/...cdc_chronic_disease_indicators_dataset.tf → ...cdc_chronic_disease_indicators_dataset.tf b/...cdc_chronic_disease_indicators_dataset.tf → ...cdc_chronic_disease_indicators_dataset.tf
diff --git a/...rm/chronic_disease_indicators_pipeline.tf → ...ra/chronic_disease_indicators_pipeline.tf b/...rm/chronic_disease_indicators_pipeline.tf → ...ra/chronic_disease_indicators_pipeline.tf
diff --git a/...disease_indicators/_terraform/provider.tf → ...onic_disease_indicators/infra/provider.tf b/...disease_indicators/_terraform/provider.tf → ...onic_disease_indicators/infra/provider.tf
diff --git a/...isease_indicators/_terraform/variables.tf → ...nic_disease_indicators/infra/variables.tf b/...isease_indicators/_terraform/variables.tf → ...nic_disease_indicators/infra/variables.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/...icators/chronic_disease_indicators_dag.py → ...icators/chronic_disease_indicators_dag.py b/...icators/chronic_disease_indicators_dag.py → ...icators/chronic_disease_indicators_dag.py
diff --git a/.../chronic_disease_indicators/pipeline.yaml → .../chronic_disease_indicators/pipeline.yaml b/.../chronic_disease_indicators/pipeline.yaml → .../chronic_disease_indicators/pipeline.yaml
diff --git a/...c_chronic_disease_indicators/dataset.yaml → ...disease_indicators/pipelines/dataset.yaml b/...c_chronic_disease_indicators/dataset.yaml → ...disease_indicators/pipelines/dataset.yaml
diff --git a/...c_places/_terraform/cdc_places_dataset.tf → ...ts/cdc_places/infra/cdc_places_dataset.tf b/...c_places/_terraform/cdc_places_dataset.tf → ...ts/cdc_places/infra/cdc_places_dataset.tf
diff --git a/...for_better_health_county_data_pipeline.tf → ...for_better_health_county_data_pipeline.tf b/...for_better_health_county_data_pipeline.tf → ...for_better_health_county_data_pipeline.tf
diff --git a/datasets/cdc_places/_terraform/provider.tf → datasets/cdc_places/infra/provider.tf b/datasets/cdc_places/_terraform/provider.tf → datasets/cdc_places/infra/provider.tf
diff --git a/datasets/cdc_places/_terraform/variables.tf → datasets/cdc_places/infra/variables.tf b/datasets/cdc_places/_terraform/variables.tf → datasets/cdc_places/infra/variables.tf
diff --git a/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile b/.../_images/run_csv_transform_kub/Dockerfile → .../_images/run_csv_transform_kub/Dockerfile
diff --git a/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py b/...es/run_csv_transform_kub/csv_transform.py → ...es/run_csv_transform_kub/csv_transform.py
diff --git a/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt b/...es/run_csv_transform_kub/requirements.txt → ...es/run_csv_transform_kub/requirements.txt
diff --git a/datasets/cdc_places/dataset.yaml → datasets/cdc_places/pipelines/dataset.yaml b/datasets/cdc_places/dataset.yaml → datasets/cdc_places/pipelines/dataset.yaml
diff --git a/...data_for_better_health_county_data_dag.py → ...data_for_better_health_county_data_dag.py b/...data_for_better_health_county_data_dag.py → ...data_for_better_health_county_data_dag.py
diff --git a/...r_better_health_county_data/pipeline.yaml → ...r_better_health_county_data/pipeline.yaml b/...r_better_health_county_data/pipeline.yaml → ...r_better_health_county_data/pipeline.yaml
diff --git a/..._acs/_terraform/cbsa_2019_1yr_pipeline.tf → ...ureau_acs/infra/cbsa_2019_1yr_pipeline.tf b/..._acs/_terraform/cbsa_2019_1yr_pipeline.tf → ...ureau_acs/infra/cbsa_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "cbsa_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_cbsa_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "cbsa_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "cbsa_2019_1yr" {
   ]
 }
 
-output "bigquery_table-cbsa_2019_1yr-table_id" {
-  value = google_bigquery_table.cbsa_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_cbsa_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_cbsa_2019_1yr.table_id
 }
 
-output "bigquery_table-cbsa_2019_1yr-id" {
-  value = google_bigquery_table.cbsa_2019_1yr.id
+output "bigquery_table-census_bureau_acs_cbsa_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_cbsa_2019_1yr.id
 }
diff --git a/..._acs/_terraform/cbsa_2019_5yr_pipeline.tf → ...ureau_acs/infra/cbsa_2019_5yr_pipeline.tf b/..._acs/_terraform/cbsa_2019_5yr_pipeline.tf → ...ureau_acs/infra/cbsa_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "cbsa_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_cbsa_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "cbsa_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "cbsa_2019_5yr" {
   ]
 }
 
-output "bigquery_table-cbsa_2019_5yr-table_id" {
-  value = google_bigquery_table.cbsa_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_cbsa_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_cbsa_2019_5yr.table_id
 }
 
-output "bigquery_table-cbsa_2019_5yr-id" {
-  value = google_bigquery_table.cbsa_2019_5yr.id
+output "bigquery_table-census_bureau_acs_cbsa_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_cbsa_2019_5yr.id
 }
diff --git a/...s/_terraform/census_bureau_acs_dataset.tf → ...au_acs/infra/census_bureau_acs_dataset.tf b/...s/_terraform/census_bureau_acs_dataset.tf → ...au_acs/infra/census_bureau_acs_dataset.tf
@@ -30,6 +30,11 @@ resource "google_storage_bucket" "census-bureau-acs" {
   force_destroy               = true
   location                    = "US"
   uniform_bucket_level_access = true
+  lifecycle {
+    ignore_changes = [
+      logging,
+    ]
+  }
 }
 
 output "storage_bucket-census-bureau-acs-name" {

diff --git a/...erraform/censustract_2019_5yr_pipeline.tf → ...cs/infra/censustract_2019_5yr_pipeline.tf b/...erraform/censustract_2019_5yr_pipeline.tf → ...cs/infra/censustract_2019_5yr_pipeline.tf
diff --git a/...ongressionaldistrict_2019_1yr_pipeline.tf → ...ongressionaldistrict_2019_1yr_pipeline.tf b/...ongressionaldistrict_2019_1yr_pipeline.tf → ...ongressionaldistrict_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "congressionaldistrict_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_congressionaldistrict_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "congressionaldistrict_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "congressionaldistrict_2019_1yr" {
   ]
 }
 
-output "bigquery_table-congressionaldistrict_2019_1yr-table_id" {
-  value = google_bigquery_table.congressionaldistrict_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_congressionaldistrict_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_congressionaldistrict_2019_1yr.table_id
 }
 
-output "bigquery_table-congressionaldistrict_2019_1yr-id" {
-  value = google_bigquery_table.congressionaldistrict_2019_1yr.id
+output "bigquery_table-census_bureau_acs_congressionaldistrict_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_congressionaldistrict_2019_1yr.id
 }
diff --git a/...ongressionaldistrict_2019_5yr_pipeline.tf → ...ongressionaldistrict_2019_5yr_pipeline.tf b/...ongressionaldistrict_2019_5yr_pipeline.tf → ...ongressionaldistrict_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "congressionaldistrict_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_congressionaldistrict_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "congressionaldistrict_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "congressionaldistrict_2019_5yr" {
   ]
 }
 
-output "bigquery_table-congressionaldistrict_2019_5yr-table_id" {
-  value = google_bigquery_table.congressionaldistrict_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_congressionaldistrict_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_congressionaldistrict_2019_5yr.table_id
 }
 
-output "bigquery_table-congressionaldistrict_2019_5yr-id" {
-  value = google_bigquery_table.congressionaldistrict_2019_5yr.id
+output "bigquery_table-census_bureau_acs_congressionaldistrict_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_congressionaldistrict_2019_5yr.id
 }
diff --git a/...cs/_terraform/county_2019_1yr_pipeline.tf → ...eau_acs/infra/county_2019_1yr_pipeline.tf b/...cs/_terraform/county_2019_1yr_pipeline.tf → ...eau_acs/infra/county_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "county_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_county_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "county_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "county_2019_1yr" {
   ]
 }
 
-output "bigquery_table-county_2019_1yr-table_id" {
-  value = google_bigquery_table.county_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_county_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_county_2019_1yr.table_id
 }
 
-output "bigquery_table-county_2019_1yr-id" {
-  value = google_bigquery_table.county_2019_1yr.id
+output "bigquery_table-census_bureau_acs_county_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_county_2019_1yr.id
 }
diff --git a/...cs/_terraform/county_2019_5yr_pipeline.tf → ...eau_acs/infra/county_2019_5yr_pipeline.tf b/...cs/_terraform/county_2019_5yr_pipeline.tf → ...eau_acs/infra/county_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "county_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_county_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "county_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "county_2019_5yr" {
   ]
 }
 
-output "bigquery_table-county_2019_5yr-table_id" {
-  value = google_bigquery_table.county_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_county_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_county_2019_5yr.table_id
 }
 
-output "bigquery_table-county_2019_5yr-id" {
-  value = google_bigquery_table.county_2019_5yr.id
+output "bigquery_table-census_bureau_acs_county_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_county_2019_5yr.id
 }
diff --git a/...acs/_terraform/place_2019_1yr_pipeline.tf → ...reau_acs/infra/place_2019_1yr_pipeline.tf b/...acs/_terraform/place_2019_1yr_pipeline.tf → ...reau_acs/infra/place_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "place_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_place_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "place_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "place_2019_1yr" {
   ]
 }
 
-output "bigquery_table-place_2019_1yr-table_id" {
-  value = google_bigquery_table.place_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_place_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_place_2019_1yr.table_id
 }
 
-output "bigquery_table-place_2019_1yr-id" {
-  value = google_bigquery_table.place_2019_1yr.id
+output "bigquery_table-census_bureau_acs_place_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_place_2019_1yr.id
 }
diff --git a/...acs/_terraform/place_2019_5yr_pipeline.tf → ...reau_acs/infra/place_2019_5yr_pipeline.tf b/...acs/_terraform/place_2019_5yr_pipeline.tf → ...reau_acs/infra/place_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "place_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_place_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "place_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "place_2019_5yr" {
   ]
 }
 
-output "bigquery_table-place_2019_5yr-table_id" {
-  value = google_bigquery_table.place_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_place_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_place_2019_5yr.table_id
 }
 
-output "bigquery_table-place_2019_5yr-id" {
-  value = google_bigquery_table.place_2019_5yr.id
+output "bigquery_table-census_bureau_acs_place_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_place_2019_5yr.id
 }
diff --git a/.../census_bureau_acs/_terraform/provider.tf → datasets/census_bureau_acs/infra/provider.tf b/.../census_bureau_acs/_terraform/provider.tf → datasets/census_bureau_acs/infra/provider.tf
diff --git a/..._acs/_terraform/puma_2019_1yr_pipeline.tf → ...ureau_acs/infra/puma_2019_1yr_pipeline.tf b/..._acs/_terraform/puma_2019_1yr_pipeline.tf → ...ureau_acs/infra/puma_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "puma_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_puma_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "puma_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "puma_2019_1yr" {
   ]
 }
 
-output "bigquery_table-puma_2019_1yr-table_id" {
-  value = google_bigquery_table.puma_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_puma_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_puma_2019_1yr.table_id
 }
 
-output "bigquery_table-puma_2019_1yr-id" {
-  value = google_bigquery_table.puma_2019_1yr.id
+output "bigquery_table-census_bureau_acs_puma_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_puma_2019_1yr.id
 }
diff --git a/..._acs/_terraform/puma_2019_5yr_pipeline.tf → ...ureau_acs/infra/puma_2019_5yr_pipeline.tf b/..._acs/_terraform/puma_2019_5yr_pipeline.tf → ...ureau_acs/infra/puma_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "puma_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_puma_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "puma_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "puma_2019_5yr" {
   ]
 }
 
-output "bigquery_table-puma_2019_5yr-table_id" {
-  value = google_bigquery_table.puma_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_puma_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_puma_2019_5yr.table_id
 }
 
-output "bigquery_table-puma_2019_5yr-id" {
-  value = google_bigquery_table.puma_2019_5yr.id
+output "bigquery_table-census_bureau_acs_puma_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_puma_2019_5yr.id
 }
diff --git a/...oldistrictelementary_2019_1yr_pipeline.tf → ...oldistrictelementary_2019_1yr_pipeline.tf b/...oldistrictelementary_2019_1yr_pipeline.tf → ...oldistrictelementary_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "schooldistrictelementary_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_schooldistrictelementary_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "schooldistrictelementary_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "schooldistrictelementary_2019_1yr" {
   ]
 }
 
-output "bigquery_table-schooldistrictelementary_2019_1yr-table_id" {
-  value = google_bigquery_table.schooldistrictelementary_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_schooldistrictelementary_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictelementary_2019_1yr.table_id
 }
 
-output "bigquery_table-schooldistrictelementary_2019_1yr-id" {
-  value = google_bigquery_table.schooldistrictelementary_2019_1yr.id
+output "bigquery_table-census_bureau_acs_schooldistrictelementary_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictelementary_2019_1yr.id
 }
diff --git a/...oldistrictelementary_2019_5yr_pipeline.tf → ...oldistrictelementary_2019_5yr_pipeline.tf b/...oldistrictelementary_2019_5yr_pipeline.tf → ...oldistrictelementary_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "schooldistrictelementary_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_schooldistrictelementary_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "schooldistrictelementary_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "schooldistrictelementary_2019_5yr" {
   ]
 }
 
-output "bigquery_table-schooldistrictelementary_2019_5yr-table_id" {
-  value = google_bigquery_table.schooldistrictelementary_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_schooldistrictelementary_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictelementary_2019_5yr.table_id
 }
 
-output "bigquery_table-schooldistrictelementary_2019_5yr-id" {
-  value = google_bigquery_table.schooldistrictelementary_2019_5yr.id
+output "bigquery_table-census_bureau_acs_schooldistrictelementary_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictelementary_2019_5yr.id
 }
diff --git a/...ooldistrictsecondary_2019_1yr_pipeline.tf → ...ooldistrictsecondary_2019_1yr_pipeline.tf b/...ooldistrictsecondary_2019_1yr_pipeline.tf → ...ooldistrictsecondary_2019_1yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "schooldistrictsecondary_2019_1yr" {
+resource "google_bigquery_table" "census_bureau_acs_schooldistrictsecondary_2019_1yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "schooldistrictsecondary_2019_1yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "schooldistrictsecondary_2019_1yr" {
   ]
 }
 
-output "bigquery_table-schooldistrictsecondary_2019_1yr-table_id" {
-  value = google_bigquery_table.schooldistrictsecondary_2019_1yr.table_id
+output "bigquery_table-census_bureau_acs_schooldistrictsecondary_2019_1yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictsecondary_2019_1yr.table_id
 }
 
-output "bigquery_table-schooldistrictsecondary_2019_1yr-id" {
-  value = google_bigquery_table.schooldistrictsecondary_2019_1yr.id
+output "bigquery_table-census_bureau_acs_schooldistrictsecondary_2019_1yr-id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictsecondary_2019_1yr.id
 }
diff --git a/...ooldistrictsecondary_2019_5yr_pipeline.tf → ...ooldistrictsecondary_2019_5yr_pipeline.tf b/...ooldistrictsecondary_2019_5yr_pipeline.tf → ...ooldistrictsecondary_2019_5yr_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "schooldistrictsecondary_2019_5yr" {
+resource "google_bigquery_table" "census_bureau_acs_schooldistrictsecondary_2019_5yr" {
   project    = var.project_id
   dataset_id = "census_bureau_acs"
   table_id   = "schooldistrictsecondary_2019_5yr"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "schooldistrictsecondary_2019_5yr" {
   ]
 }
 
-output "bigquery_table-schooldistrictsecondary_2019_5yr-table_id" {
-  value = google_bigquery_table.schooldistrictsecondary_2019_5yr.table_id
+output "bigquery_table-census_bureau_acs_schooldistrictsecondary_2019_5yr-table_id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictsecondary_2019_5yr.table_id
 }
 
-output "bigquery_table-schooldistrictsecondary_2019_5yr-id" {
-  value = google_bigquery_table.schooldistrictsecondary_2019_5yr.id
+output "bigquery_table-census_bureau_acs_schooldistrictsecondary_2019_5yr-id" {
+  value = google_bigquery_table.census_bureau_acs_schooldistrictsecondary_2019_5yr.id
 }