From 9f10cd0b8264a536b3e7ca57a13781194924e5b0 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Thu, 18 Apr 2019 15:14:32 +0100
Subject: [PATCH] ensure env vars in manifest are quoted

if they're not defined in the credentials file, they should be an empty
string, rather than null.
---
 manifest.yml.j2 | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/manifest.yml.j2 b/manifest.yml.j2
index a14826014..ccf758095 100644
--- a/manifest.yml.j2
+++ b/manifest.yml.j2
@@ -32,26 +32,26 @@ applications:
       NOTIFY_APP_NAME: admin
 
       # Credentials variables
-      ADMIN_CLIENT_SECRET: {{ ADMIN_CLIENT_SECRET }}
-      ADMIN_BASE_URL: {{ ADMIN_BASE_URL }}
-      API_HOST_NAME: {{ API_HOST_NAME }}
-      DANGEROUS_SALT: {{ DANGEROUS_SALT }}
-      SECRET_KEY: {{ SECRET_KEY }}
-      ROUTE_SECRET_KEY_1: {{ ROUTE_SECRET_KEY_1 }}
-      ROUTE_SECRET_KEY_2: {{ ROUTE_SECRET_KEY_2 }}
+      ADMIN_CLIENT_SECRET: '{{ ADMIN_CLIENT_SECRET }}'
+      ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}'
+      API_HOST_NAME: '{{ API_HOST_NAME }}'
+      DANGEROUS_SALT: '{{ DANGEROUS_SALT }}'
+      SECRET_KEY: '{{ SECRET_KEY }}'
+      ROUTE_SECRET_KEY_1: '{{ ROUTE_SECRET_KEY_1 }}'
+      ROUTE_SECRET_KEY_2: '{{ ROUTE_SECRET_KEY_2 }}'
 
-      AWS_ACCESS_KEY_ID: {{ AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: {{ AWS_SECRET_ACCESS_KEY }}
+      AWS_ACCESS_KEY_ID: '{{ AWS_ACCESS_KEY_ID }}'
+      AWS_SECRET_ACCESS_KEY: '{{ AWS_SECRET_ACCESS_KEY }}'
 
-      ANTIVIRUS_API_HOST: {{ ANTIVIRUS_API_HOST }}
-      ANTIVIRUS_API_KEY: {{ ANTIVIRUS_API_KEY }}
+      ANTIVIRUS_API_HOST: '{{ ANTIVIRUS_API_HOST }}'
+      ANTIVIRUS_API_KEY: '{{ ANTIVIRUS_API_KEY }}'
 
-      STATSD_PREFIX: {{ STATSD_PREFIX }}
+      STATSD_PREFIX: '{{ STATSD_PREFIX }}'
 
-      ZENDESK_API_KEY: {{ ZENDESK_API_KEY }}
+      ZENDESK_API_KEY: '{{ ZENDESK_API_KEY }}'
 
-      TEMPLATE_PREVIEW_API_HOST: {{ TEMPLATE_PREVIEW_API_HOST }}
-      TEMPLATE_PREVIEW_API_KEY: {{ TEMPLATE_PREVIEW_API_KEY }}
+      TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}'
+      TEMPLATE_PREVIEW_API_KEY: '{{ TEMPLATE_PREVIEW_API_KEY }}'
 
-      REDIS_ENABLED: {{ REDIS_ENABLED }}
-      REDIS_URL: {{ REDIS_URL }}
+      REDIS_ENABLED: '{{ REDIS_ENABLED }}'
+      REDIS_URL: '{{ REDIS_URL }}'