From 3cd15e97e20f50cd24926434bdbfc3ff67ddc43c Mon Sep 17 00:00:00 2001
From: Christa Hartsock <christa.hartsock@gsa.gov>
Date: Wed, 22 Jun 2022 14:53:15 -0700
Subject: [PATCH] Update manifest to use proper templates for vars-file

---
 .env.deploy.sample |  6 ------
 manifest.yml       | 41 ++++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.env.deploy.sample b/.env.deploy.sample
index 271581c05..aab9f0f9e 100644
--- a/.env.deploy.sample
+++ b/.env.deploy.sample
@@ -1,19 +1,13 @@
 
 NOTIFY_APP_NAME: api
-ADMIN_BASE_URL: "notifications-admin.app.cloud.gov"
-API_HOST_NAME: "notifications-api-web.app.cloud.gov"
 SECRET_KEY: "dev-notify-secret-key"
 DANGEROUS_SALT: "dev-notify-salt"
 MMG_API_KEY: asdf
 FIRETEXT_API_KEY: asdf
 FIRETEXT_INTERNATIONAL_API_KEY: asdf
-NOTIFICATION_QUEUE_PREFIX: "prototype_10x"
 ZENDESK_API_KEY: asdf
 AWS_REGION: "us-west-2"
 AWS_ACCESS_KEY_ID: <replace me>
 AWS_SECRET_ACCESS_KEY: <replace me>
 NOTIFY_ENVIRONMENT: live
-FLASK_ENV: production
 NOTIFY_EMAIL_DOMAIN: "dispostable.com"
-ADMIN_CLIENT_ID: "notify-admin"
-GOVUK_ALERTS_CLIENT_ID: "govuk-alerts"
diff --git a/manifest.yml b/manifest.yml
index e4b439536..f3107e61e 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -8,39 +8,42 @@ applications:
     disk_quota: 1G
     health-check-type: process
     health-check-invocation-timeout: 1
+    routes:
+    - route: notifications-api.app.cloud.gov
 
     services:
       - api-psql
       - api-redis
 
     env:
-      NOTIFY_APP_NAME: '{{ NOTIFY_APP_NAME }}'
+      NOTIFY_APP_NAME: ((NOTIFY_APP_NAME))
       NOTIFY_LOG_PATH: /home/vcap/logs/app.log
       FLASK_APP: application.py
-      NOTIFY_ENVIRONMENT: '{{ NOTIFY_ENVIRONMENT }}'
+      FLASK_ENV: production
+      NOTIFY_ENVIRONMENT: ((NOTIFY_ENVIRONMENT))
 
       # Credentials variables
-      ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}'
-      API_HOST_NAME: '{{ API_HOST_NAME }}'
-      DANGEROUS_SALT: '{{ DANGEROUS_SALT }}'
-      SECRET_KEY: '{{ SECRET_KEY }}'
+      ADMIN_BASE_URL: notifications-admin.app.cloud.gov
+      API_HOST_NAME: notifications-api.app.cloud.gov
+      DANGEROUS_SALT: ((DANGEROUS_SALT))
+      SECRET_KEY: ((SECRET_KEY))
 
-      NOTIFICATION_QUEUE_PREFIX: '{{ NOTIFICATION_QUEUE_PREFIX }}'
-      AWS_ACCESS_KEY_ID: '{{ AWS_ACCESS_KEY_ID }}'
-      AWS_SECRET_ACCESS_KEY: '{{ AWS_SECRET_ACCESS_KEY }}'
+      NOTIFICATION_QUEUE_PREFIX: prototype_10x
+      AWS_ACCESS_KEY_ID: ((AWS_ACCESS_KEY_ID))
+      AWS_SECRET_ACCESS_KEY: ((AWS_SECRET_ACCESS_KEY))
 
-      STATSD_HOST: "notify-statsd-exporter-{{ NOTIFY_ENVIRONMENT }}.apps.internal"
+      STATSD_HOST: "notify-statsd-exporter-((NOTIFY_ENVIRONMENT)).apps.internal"
 
-      ZENDESK_API_KEY: '{{ ZENDESK_API_KEY }}'
+      ZENDESK_API_KEY: ((ZENDESK_API_KEY))
 
-      MMG_API_KEY: '{{ MMG_API_KEY }}'
-      MMG_INBOUND_SMS_AUTH: '{{ MMG_INBOUND_SMS_AUTH | tojson }}'
-      MMG_INBOUND_SMS_USERNAME: '{{ MMG_INBOUND_SMS_USERNAME | tojson }}'
+      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: '{{ FIRETEXT_INBOUND_SMS_AUTH | tojson }}'
+      FIRETEXT_API_KEY: ((FIRETEXT_API_KEY))
+      FIRETEXT_INTERNATIONAL_API_KEY: ((FIRETEXT_INTERNATIONAL_API_KEY))
+      FIRETEXT_INBOUND_SMS_AUTH: {}
 
-      DVLA_EMAIL_ADDRESSES: '{{ DVLA_EMAIL_ADDRESSES | tojson  }}'
+      DVLA_EMAIL_ADDRESSES: []
 
-      NOTIFY_EMAIL_DOMAIN: '{{ NOTIFY_EMAIL_DOMAIN }}'
+      NOTIFY_EMAIL_DOMAIN: ((NOTIFY_EMAIL_DOMAIN))