diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 710d312..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/terraform-apply.yml b/.github/workflows/terraform-apply.yml index 63afe38..b98cdf4 100644 --- a/.github/workflows/terraform-apply.yml +++ b/.github/workflows/terraform-apply.yml @@ -57,7 +57,6 @@ jobs: --arg nc_user "$NC_DB_USER" --arg nc_pass "$NC_DB_PASS" \ --arg co_user "$CO_DB_USER" --arg co_pass "$CO_DB_PASS" \ --arg tx_user "$TX_DB_USER" --arg tx_pass "$TX_DB_PASS" \ - --arg wa_user "$WA_DB_USER" --arg wa_pass "$WA_DB_PASS" \ --arg il_user "$IL_DB_USER" --arg il_pass "$IL_DB_PASS" \ --arg ma_user "$MA_DB_USER" --arg ma_pass "$MA_DB_PASS" \ --arg cesn_user "$CESN_DB_USER" --arg cesn_pass "$CESN_DB_PASS" \ @@ -67,7 +66,6 @@ jobs: + (if $nc_user != "" and $nc_pass != "" then {nc: {username: $nc_user, password: $nc_pass}} else {} end) + (if $co_user != "" and $co_pass != "" then {co: {username: $co_user, password: $co_pass}} else {} end) + (if $tx_user != "" and $tx_pass != "" then {tx: {username: $tx_user, password: $tx_pass}} else {} end) - + (if $wa_user != "" and $wa_pass != "" then {wa: {username: $wa_user, password: $wa_pass}} else {} end) + (if $il_user != "" and $il_pass != "" then {il: {username: $il_user, password: $il_pass}} else {} end) + (if $ma_user != "" and $ma_pass != "" then {ma: {username: $ma_user, password: $ma_pass}} else {} end) + (if $cesn_user != "" and $cesn_pass != "" then {cesn: {username: $cesn_user, password: $cesn_pass}} else {} end) @@ -84,8 +82,6 @@ jobs: CO_DB_PASS: ${{ secrets.CO_DB_PASS }} TX_DB_USER: ${{ secrets.TX_DB_USER }} TX_DB_PASS: ${{ secrets.TX_DB_PASS }} - WA_DB_USER: ${{ secrets.WA_DB_USER }} - WA_DB_PASS: ${{ secrets.WA_DB_PASS }} IL_DB_USER: ${{ secrets.IL_DB_USER }} IL_DB_PASS: ${{ secrets.IL_DB_PASS }} MA_DB_USER: ${{ secrets.MA_DB_USER }} diff --git a/.github/workflows/terraform-plan.yml b/.github/workflows/terraform-plan.yml index 4ad24ba..5ed22ae 100644 --- a/.github/workflows/terraform-plan.yml +++ b/.github/workflows/terraform-plan.yml @@ -56,7 +56,6 @@ jobs: --arg nc_user "$NC_DB_USER" --arg nc_pass "$NC_DB_PASS" \ --arg co_user "$CO_DB_USER" --arg co_pass "$CO_DB_PASS" \ --arg tx_user "$TX_DB_USER" --arg tx_pass "$TX_DB_PASS" \ - --arg wa_user "$WA_DB_USER" --arg wa_pass "$WA_DB_PASS" \ --arg il_user "$IL_DB_USER" --arg il_pass "$IL_DB_PASS" \ --arg ma_user "$MA_DB_USER" --arg ma_pass "$MA_DB_PASS" \ --arg cesn_user "$CESN_DB_USER" --arg cesn_pass "$CESN_DB_PASS" \ @@ -66,7 +65,6 @@ jobs: + (if $nc_user != "" and $nc_pass != "" then {nc: {username: $nc_user, password: $nc_pass}} else {} end) + (if $co_user != "" and $co_pass != "" then {co: {username: $co_user, password: $co_pass}} else {} end) + (if $tx_user != "" and $tx_pass != "" then {tx: {username: $tx_user, password: $tx_pass}} else {} end) - + (if $wa_user != "" and $wa_pass != "" then {wa: {username: $wa_user, password: $wa_pass}} else {} end) + (if $il_user != "" and $il_pass != "" then {il: {username: $il_user, password: $il_pass}} else {} end) + (if $ma_user != "" and $ma_pass != "" then {ma: {username: $ma_user, password: $ma_pass}} else {} end) + (if $cesn_user != "" and $cesn_pass != "" then {cesn: {username: $cesn_user, password: $cesn_pass}} else {} end) @@ -83,8 +81,6 @@ jobs: CO_DB_PASS: ${{ secrets.CO_DB_PASS }} TX_DB_USER: ${{ secrets.TX_DB_USER }} TX_DB_PASS: ${{ secrets.TX_DB_PASS }} - WA_DB_USER: ${{ secrets.WA_DB_USER }} - WA_DB_PASS: ${{ secrets.WA_DB_PASS }} IL_DB_USER: ${{ secrets.IL_DB_USER }} IL_DB_PASS: ${{ secrets.IL_DB_PASS }} MA_DB_USER: ${{ secrets.MA_DB_USER }} diff --git a/dashboards/GITHUB_SECRETS.md b/dashboards/GITHUB_SECRETS.md index fa0098a..afcd911 100644 --- a/dashboards/GITHUB_SECRETS.md +++ b/dashboards/GITHUB_SECRETS.md @@ -119,7 +119,6 @@ ALTER DEFAULT PRIVILEGES FOR USER 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 d32e321..0000000 Binary files a/dbt/.DS_Store and /dev/null differ