From 9f014c5648b3bc51139492607559e211138aee1a Mon Sep 17 00:00:00 2001 From: Caton Hauer Date: Tue, 2 Jun 2026 13:39:14 -0600 Subject: [PATCH] Revert "wa progress" (46663bd) to unblock prod deploys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The WA (Washington) tenant Terraform config was merged to main before the tenant was deploy-ready, causing terraform-apply on main to fail while provisioning ~51 WA resources. Because Terraform applies all-or-nothing per run, this blocked ALL main deploys to Metabase — including the benefit-card perf fix (#101), which is correct but stuck behind the failing apply. Reverting the WA config restores main to a cleanly-applyable state so #101 and future changes deploy. WA dashboard work should land via its own branch once the WA tenant (Metabase DB, permission groups, secrets) is fully set up and the apply is verified. Also removes stray .DS_Store files committed with that change. Co-Authored-By: Claude Opus 4.8 (1M context) --- .DS_Store | Bin 8196 -> 0 bytes .github/workflows/terraform-apply.yml | 4 ---- .github/workflows/terraform-plan.yml | 4 ---- dashboards/GITHUB_SECRETS.md | 3 --- dashboards/config_template.tf | 2 -- dashboards/google_analytics.tf | 1 - dashboards/metabase.tf | 8 +------- dashboards/terraform.tfvars.example | 9 --------- dashboards/variables.tf | 5 ----- dbt/.DS_Store | Bin 6148 -> 0 bytes 10 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 .DS_Store delete mode 100644 dbt/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 710d312bb750e4cd85a09c003e679f461cb06182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHML2DC16n>Kg8ft|K9*Xv`c<|Oj{RL}D^(IJ9QpCDRXo?LR-Si+RtcT)7M8%_s z;MGI*)PpBQ^fxH<>QxZ*;KlFFjP9FmHs&N2-@webnfcznFW)BnG8-Z?%iEnLqB$aJ zqBG7O!7!rnI`>km`I&j3K|F13EUmWF{-DIv33WgnPzTfjbwC~XR~$gi=GLsJ`)*Z7 zbwC~XFCF0fLxj#4d(0i$TL%Wa1pqcMZ5xhf`2ZMsj6LQKv4Un?DA0u(zr`>v9P^Rq z#U68qE}V?td>EhE_#KL|*>V2J(#gaQbyNq`fwBX@iExnQ}^)9@-^m_M$^>_@w_*6{7m%6F;fOXfQI|;ufr@rldEmowa z=bwiA_x7zOA17TaugZL!Xsx!ELAF(W wL=ac`2z?!$8}o99HUvZPLjbRT|6z#Z2vm-VJ?0KEgQgDxtPMJ-1Ao IN SCHEMA analytics | `NC_DB_USER/PASS` | `wl_nc_5_ro` | NC tenant Metabase (white_label_id=5) | | `CO_DB_USER/PASS` | `wl_co_1_ro` | CO tenant Metabase (white_label_id=1) | | `TX_DB_USER/PASS` | `wl_tx_40_ro` | TX tenant Metabase (white_label_id=40) | -| `WA_DB_USER/PASS` | `wl_wa_41_ro` | WA tenant Metabase (white_label_id=41) | | `IL_DB_USER/PASS` | `wl_il_39_ro` | IL tenant Metabase (white_label_id=39) | | `MA_DB_USER/PASS` | `wl_ma_38_ro` | MA tenant Metabase (white_label_id=38) | | `CESN_DB_USER/PASS` | `wl_cesn_4_ro` | CESN tenant Metabase (white_label_id=4) | @@ -152,8 +151,6 @@ ALTER DEFAULT PRIVILEGES FOR USER IN SCHEMA analytics | `CO_DB_PASS` | CO tenant credential password | Same as above | | `TX_DB_USER` | TX tenant credential username | `heroku pg:credentials:url -a cobenefits-api --name wl_tx_40_ro` | | `TX_DB_PASS` | TX tenant credential password | Same as above | -| `WA_DB_USER` | WA tenant credential username | `heroku pg:credentials:url -a cobenefits-api --name wl_wa_41_ro` | -| `WA_DB_PASS` | WA tenant credential password | Same as above | | `IL_DB_USER` | IL tenant credential username | `heroku pg:credentials:url -a cobenefits-api --name wl_il_39_ro` | | `IL_DB_PASS` | IL tenant credential password | Same as above | | `MA_DB_USER` | MA tenant credential username | `heroku pg:credentials:url -a cobenefits-api --name wl_ma_38_ro` | diff --git a/dashboards/config_template.tf b/dashboards/config_template.tf index 0da7979..7fc3e7d 100644 --- a/dashboards/config_template.tf +++ b/dashboards/config_template.tf @@ -81,7 +81,6 @@ locals { nc = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = true, has_utm_filters = true } co = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = false, has_utm_filters = false } tx = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = false, has_utm_filters = false } - wa = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = false, has_utm_filters = false } il = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = false, has_utm_filters = false } ma = { has_tax_credits = true, has_immediate_needs = true, has_assets = true, has_expenses = true, has_partners = true, has_summary_metrics = false, has_utm_filters = false } cesn = { has_tax_credits = false, has_immediate_needs = false, has_assets = false, has_expenses = false, has_partners = false, has_summary_metrics = false, has_utm_filters = false } @@ -105,7 +104,6 @@ locals { nc = ["all_time", "households", "benefits_needs", "google_analytics"] co = ["all_time", "households", "benefits_needs", "google_analytics"] tx = ["all_time", "households", "benefits_needs", "google_analytics"] - wa = ["all_time", "households", "benefits_needs", "google_analytics"] il = ["all_time", "households", "benefits_needs", "google_analytics"] ma = ["all_time", "households", "benefits_needs", "google_analytics"] cesn = ["all_time", "households", "benefits_needs", "cesn_homeowners_vs_renters", "google_analytics"] diff --git a/dashboards/google_analytics.tf b/dashboards/google_analytics.tf index 073ce97..d557075 100644 --- a/dashboards/google_analytics.tf +++ b/dashboards/google_analytics.tf @@ -22,7 +22,6 @@ locals { nc = ["nc"] co = ["co"] tx = ["tx"] - wa = ["wa"] il = ["il"] ma = ["ma"] cesn = ["cesn"] diff --git a/dashboards/metabase.tf b/dashboards/metabase.tf index 57a88bf..c6126db 100644 --- a/dashboards/metabase.tf +++ b/dashboards/metabase.tf @@ -162,14 +162,9 @@ resource "metabase_collection" "tenant_collection_tx" { depends_on = [metabase_collection.tenant_collection_co] } -resource "metabase_collection" "tenant_collection_wa" { - name = "Washington" - depends_on = [metabase_collection.tenant_collection_tx] -} - resource "metabase_collection" "tenant_collection_il" { name = "Illinois" - depends_on = [metabase_collection.tenant_collection_wa] + depends_on = [metabase_collection.tenant_collection_tx] } resource "metabase_collection" "tenant_collection_ma" { @@ -193,7 +188,6 @@ locals { nc = metabase_collection.tenant_collection_nc co = metabase_collection.tenant_collection_co tx = metabase_collection.tenant_collection_tx - wa = metabase_collection.tenant_collection_wa il = metabase_collection.tenant_collection_il ma = metabase_collection.tenant_collection_ma cesn = metabase_collection.tenant_collection_cesn diff --git a/dashboards/terraform.tfvars.example b/dashboards/terraform.tfvars.example index e9a9d18..9921c50 100644 --- a/dashboards/terraform.tfvars.example +++ b/dashboards/terraform.tfvars.example @@ -28,10 +28,6 @@ tenant_db_credentials = { username = "wl_tx_40_ro" password = "your_password" } - wa = { - username = "wl_wa_41_ro" - password = "your_password" - } il = { username = "wl_il_39_ro" password = "your_password" @@ -70,11 +66,6 @@ tenants = { display_name = "Texas" white_label_id = 40 } - wa = { - name = "wa" - display_name = "Washington" - white_label_id = 41 - } il = { name = "il" display_name = "Illinois" diff --git a/dashboards/variables.tf b/dashboards/variables.tf index f023856..41043aa 100644 --- a/dashboards/variables.tf +++ b/dashboards/variables.tf @@ -59,11 +59,6 @@ variable "tenants" { display_name = "Texas" white_label_id = 40 } - wa = { - name = "wa" - display_name = "Washington" - white_label_id = 41 - } il = { name = "il" display_name = "Illinois" diff --git a/dbt/.DS_Store b/dbt/.DS_Store deleted file mode 100644 index d32e321970bec5c3f13756f0a61a04374ef7a2aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHLzb^zq6n?{o^CO`Wp|BzT0G&dyE~^!ZLWy%15_k5(QK*)LN~O^2u8=5|L?lYR zLZYG2_!E5Z%{VjnL!uzaykzFvo%i0nZ@=B0xjiCM+3oxUQ9lu7&=`YmbWM!?+#0OS zj0^&m%u%LgTA_9Hs}0e9z$@St_-zXCyW2~7%29>t$r3; zO5!+IOmc|H9NfMP-(BBMe;%LzQha&M;xZ6oY6_@G304}H=h)MU?X!8syOZy{YPqH4 zgGV#JQ+Mo@>vm8{*11hocWYDMRlVP?KXraFd!}`9=CC=mig9>Qh%&+>!M!U$2bYKH z+N<~5JQi*o9<@1a9<5>=9__qufJX&-Y~oH7sNy^`qlcIEew)Wg=it!sy*ww*95#2!>T zCN46VYSihZq%!6)m6iEIQBob_p@fr)H2U5v;1zHcXxFFxy#LR%{{DB9{Fzt4EAX!r zP(eH&XK_hpZ*90Z-fKg&B{VjUOEpRgILf Ifge@i4LnfPmjD0&