From b0f8a51f990da7ff4242685a21803226a0fbd507 Mon Sep 17 00:00:00 2001
From: Christa Hartsock <christa.hartsock@gsa.gov>
Date: Thu, 23 Jun 2022 13:45:58 -0700
Subject: [PATCH] Move config into manifest, update for SNS provider

Keeps secrets in .env files
---
 .env.deploy.sample |  8 --------
 manifest.yml       | 30 +++++++++++-------------------
 sample.env         |  2 ++
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/.env.deploy.sample b/.env.deploy.sample
index aab9f0f9e..3fc7f2baa 100644
--- a/.env.deploy.sample
+++ b/.env.deploy.sample
@@ -1,13 +1,5 @@
 
-NOTIFY_APP_NAME: api
 SECRET_KEY: "dev-notify-secret-key"
 DANGEROUS_SALT: "dev-notify-salt"
-MMG_API_KEY: asdf
-FIRETEXT_API_KEY: asdf
-FIRETEXT_INTERNATIONAL_API_KEY: asdf
-ZENDESK_API_KEY: asdf
-AWS_REGION: "us-west-2"
 AWS_ACCESS_KEY_ID: <replace me>
 AWS_SECRET_ACCESS_KEY: <replace me>
-NOTIFY_ENVIRONMENT: live
-NOTIFY_EMAIL_DOMAIN: "dispostable.com"
diff --git a/manifest.yml b/manifest.yml
index fda89e6f4..95a07af99 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -16,34 +16,26 @@ applications:
       - api-redis
 
     env:
-      NOTIFY_APP_NAME: ((NOTIFY_APP_NAME))
+      NOTIFY_APP_NAME: api
       NOTIFY_LOG_PATH: /home/vcap/logs/app.log
       FLASK_APP: application.py
       FLASK_ENV: production
-      NOTIFY_ENVIRONMENT: ((NOTIFY_ENVIRONMENT))
 
-      # Credentials variables
-      ADMIN_BASE_URL: notifications-admin.app.cloud.gov
+      NOTIFY_ENVIRONMENT: live
       API_HOST_NAME: notifications-api.app.cloud.gov
+      ADMIN_BASE_URL: notifications-admin.app.cloud.gov
+      NOTIFICATION_QUEUE_PREFIX: prototype_10x
+      STATSD_HOST: localhost
+      
+      # Credentials variables
       DANGEROUS_SALT: ((DANGEROUS_SALT))
       SECRET_KEY: ((SECRET_KEY))
-
-      NOTIFICATION_QUEUE_PREFIX: prototype_10x
+      AWS_REGION: us-west-2
+      AWS_PINPOINT_REGION: us-west-2
       AWS_ACCESS_KEY_ID: ((AWS_ACCESS_KEY_ID))
       AWS_SECRET_ACCESS_KEY: ((AWS_SECRET_ACCESS_KEY))
-
-      STATSD_HOST: localhost
-
-      ZENDESK_API_KEY: ((ZENDESK_API_KEY))
-
-      MMG_API_KEY: ((MMG_API_KEY))
-      MMG_INBOUND_SMS_AUTH: {}
-      MMG_INBOUND_SMS_USERNAME: {}
-
-      FIRETEXT_API_KEY: ((FIRETEXT_API_KEY))
-      FIRETEXT_INTERNATIONAL_API_KEY: ((FIRETEXT_INTERNATIONAL_API_KEY))
-      FIRETEXT_INBOUND_SMS_AUTH: {}
+      AWS_US_TOLL_FREE_NUMBER: +18446120782
 
       DVLA_EMAIL_ADDRESSES: []
 
-      NOTIFY_EMAIL_DOMAIN: ((NOTIFY_EMAIL_DOMAIN))
+      NOTIFY_EMAIL_DOMAIN: dispostable.com
diff --git a/sample.env b/sample.env
index eba3714f2..fec9cba17 100644
--- a/sample.env
+++ b/sample.env
@@ -37,3 +37,5 @@ SQLALCHEMY_DATABASE_TEST_URI=postgresql://postgres:chummy@db:5432/test_notificat
 AWS_REGION=us-west-2
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
+AWS_PINPOINT_REGION=
+AWS_US_TOLL_FREE_NUMBER=
\ No newline at end of file