From a81baf10b143ed246c274abe55cd242bfa0692a7 Mon Sep 17 00:00:00 2001
From: pnadolny13 <patnadolny@gmail.com>
Date: Thu, 7 Dec 2023 10:06:48 -0500
Subject: [PATCH] refactor now that nested arrays expand

---
 data/environments/prod.meltano.yml    | 20 --------------------
 data/environments/staging.meltano.yml | 16 ----------------
 data/environments/userdev.meltano.yml | 11 +++++------
 data/extract/extractors.meltano.yml   | 11 +++++++++++
 4 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/data/environments/prod.meltano.yml b/data/environments/prod.meltano.yml
index 2757e986..98976690 100644
--- a/data/environments/prod.meltano.yml
+++ b/data/environments/prod.meltano.yml
@@ -21,26 +21,6 @@ environments:
           user: MELTANO
           role: REPORTER
           warehouse: REPORTER
-      - name: tap-snowflake-metrics-legacy
-        config:
-          tables:
-          - MELTANO_HUB.FACT_HUB_METRICS
-      - name: tap-snowflake-metrics
-        config:
-          tables:
-          - MELTANO_HUB.FACT_VARIANT_HUB_METRICS
-      - name: tap-snowflake-audit
-        config:
-          tables:
-          - MELTANO_HUB.HUB_METRICS_AUDIT
-      - name: tap-snowflake-singer-activity
-        config:
-          tables:
-          - SLACK_NOTIFICATIONS.SINGER_ACTIVITY_NOTIFICATIONS
-      - name: tap-snowflake-meltano-activity
-        config:
-          tables:
-          - SLACK_NOTIFICATIONS.MELTANO_ACTIVITY_NOTIFICATIONS
       - name: tap-snowflake-hubspot-companies
         config:
           tables:
diff --git a/data/environments/staging.meltano.yml b/data/environments/staging.meltano.yml
index a7cd8cf1..627e51f0 100644
--- a/data/environments/staging.meltano.yml
+++ b/data/environments/staging.meltano.yml
@@ -22,22 +22,6 @@ environments:
           user: STAGING
           role: STAGING
           warehouse: STAGING
-      - name: tap-snowflake-metrics
-        config:
-          tables:
-          - MELTANO_HUB.FACT_VARIANT_HUB_METRICS
-      - name: tap-snowflake-audit
-        config:
-          tables:
-          - MELTANO_HUB.HUB_METRICS_AUDIT
-      - name: tap-snowflake-singer-activity
-        config:
-          tables:
-          - SLACK_NOTIFICATIONS.SINGER_ACTIVITY_NOTIFICATIONS
-      - name: tap-snowflake-meltano-activity
-        config:
-          tables:
-          - SLACK_NOTIFICATIONS.MELTANO_ACTIVITY_NOTIFICATIONS
       loaders:
       - name: target-snowflake
         config:
diff --git a/data/environments/userdev.meltano.yml b/data/environments/userdev.meltano.yml
index 08e2d730..b29bfddc 100644
--- a/data/environments/userdev.meltano.yml
+++ b/data/environments/userdev.meltano.yml
@@ -24,27 +24,26 @@ environments:
           user: ${USER_PREFIX}
           role: ${USER_PREFIX}
           warehouse: CORE
-      # https://github.com/meltano/meltano/issues/3171 is blocking templating from working so I had to hardcode the user prefix
       - name: tap-snowflake-metrics
         config:
           tables:
-          - PNADOLNY_MELTANO_HUB.FACT_VARIANT_HUB_METRICS
+          - ${USER_PREFIX}_MELTANO_HUB.FACT_VARIANT_HUB_METRICS
       - name: tap-snowflake-audit
         config:
           tables:
-          - PNADOLNY_MELTANO_HUB.HUB_METRICS_AUDIT
+          - ${USER_PREFIX}_MELTANO_HUB.HUB_METRICS_AUDIT
       - name: tap-snowflake-singer-activity
         config:
           tables:
-          - PNADOLNY_SLACK_NOTIFICATIONS.SINGER_ACTIVITY_NOTIFICATIONS
+          - ${USER_PREFIX}_SLACK_NOTIFICATIONS.SINGER_ACTIVITY_NOTIFICATIONS
       - name: tap-snowflake-meltano-activity
         config:
           tables:
-          - PNADOLNY_SLACK_NOTIFICATIONS.MELTANO_ACTIVITY_NOTIFICATIONS
+          - ${USER_PREFIX}_SLACK_NOTIFICATIONS.MELTANO_ACTIVITY_NOTIFICATIONS
       - name: tap-snowflake-hubspot-companies
         config:
           tables:
-          - PNADOLNY_HUBSPOT.ORG_ACTIVITY
+          - ${USER_PREFIX}_HUBSPOT.ORG_ACTIVITY
           stream_maps:
             pnadolny_hubspot-org_activity:
               org_first_active_date: str(record.get('org_first_active_date')[:10])
diff --git a/data/extract/extractors.meltano.yml b/data/extract/extractors.meltano.yml
index 6e6afd01..3c2a360f 100644
--- a/data/extract/extractors.meltano.yml
+++ b/data/extract/extractors.meltano.yml
@@ -218,6 +218,9 @@ plugins:
     - '*fact_variant_hub_metrics.success_execs_by_name'
     - '*fact_variant_hub_metrics.success_execs_unstruct_by_name'
     - '*fact_variant_hub_metrics.success_execs_unstruct_by_variant'
+    config:
+      tables:
+      - MELTANO_HUB.FACT_VARIANT_HUB_METRICS
   - name: tap-snowflake-audit
     inherit_from: tap-snowflake
     metadata:
@@ -226,10 +229,15 @@ plugins:
     select:
     - '*hub_metrics_audit.updated_date'
     - '*hub_metrics_audit.metric_type'
+    config:
+      tables:
+      - MELTANO_HUB.HUB_METRICS_AUDIT
   - name: tap-snowflake-singer-activity
     inherit_from: tap-snowflake
     config:
       schema: SLACK_NOTIFICATIONS
+      tables:
+      - SLACK_NOTIFICATIONS.SINGER_ACTIVITY_NOTIFICATIONS
     metadata:
       '*':
         replication-method: FULL_TABLE
@@ -244,6 +252,9 @@ plugins:
     select:
     - '*meltano_activity_notifications.title'
     - '*meltano_activity_notifications.body'
+    config:
+      tables:
+      - SLACK_NOTIFICATIONS.MELTANO_ACTIVITY_NOTIFICATIONS
   - name: tap-snowflake-hubspot-companies
     inherit_from: tap-snowflake
     metadata: