From 92eb3c49cf238fe0114deb9a87fb5d1b3ec9c672 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 11 Jan 2024 11:15:09 -0500
Subject: [PATCH] Mirror Admin REDIS_ENABLED config

This changeset adjusts the REDIS_ENABLED environment variable to match how the admin app is set up to make sure the API properly connects to the Redis service.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/deploy.yml | 2 --
 deploy-config/demo.yml       | 1 +
 deploy-config/production.yml | 1 +
 deploy-config/sandbox.yml    | 1 +
 deploy-config/staging.yml    | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cf9a145b6..7e8d2bc9e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -62,7 +62,6 @@ jobs:
         NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-        REDIS_ENABLED: 1
       with:
         cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
         cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
@@ -76,7 +75,6 @@ jobs:
           --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY"
           --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL"
           --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD"
-          --var REDIS_ENABLED="$REDIS_ENABLED"
 
     - name: Check for changes to egress config
       id: changed-egress-config
diff --git a/deploy-config/demo.yml b/deploy-config/demo.yml
index aede2dcc2..38e238c30 100644
--- a/deploy-config/demo.yml
+++ b/deploy-config/demo.yml
@@ -6,4 +6,5 @@ worker_memory: 512M
 scheduler_memory: 256M
 public_api_route: notify-api-demo.app.cloud.gov
 admin_base_url: https://notify-demo.app.cloud.gov
+redis_enabled: 1
 default_toll_free_number: "+18337581259"
diff --git a/deploy-config/production.yml b/deploy-config/production.yml
index cbbd0f514..2152eae42 100644
--- a/deploy-config/production.yml
+++ b/deploy-config/production.yml
@@ -6,4 +6,5 @@ worker_memory: 512M
 scheduler_memory: 256M
 public_api_route: notify-api.app.cloud.gov
 admin_base_url: https://beta.notify.gov
+redis_enabled: 1
 default_toll_free_number: "+18447952263"
diff --git a/deploy-config/sandbox.yml b/deploy-config/sandbox.yml
index 64a652b44..d94339837 100644
--- a/deploy-config/sandbox.yml
+++ b/deploy-config/sandbox.yml
@@ -6,6 +6,7 @@ worker_memory: 512M
 scheduler_memory: 256M
 public_api_route: notify-api-sandbox.app.cloud.gov
 admin_base_url: https://notify-sandbox.app.cloud.gov
+redis_enabled: 1
 default_toll_free_number: "+18885989205"
 ADMIN_CLIENT_SECRET: sandbox-notify-secret-key
 DANGEROUS_SALT: sandbox-notify-salt
diff --git a/deploy-config/staging.yml b/deploy-config/staging.yml
index f6a2de501..c338e7bb1 100644
--- a/deploy-config/staging.yml
+++ b/deploy-config/staging.yml
@@ -6,4 +6,5 @@ worker_memory: 512M
 scheduler_memory: 256M
 public_api_route: notify-api-staging.app.cloud.gov
 admin_base_url: https://notify-staging.app.cloud.gov
+redis_enabled: 1
 default_toll_free_number: "+18556438890"