fix: give redis it's own variable for its prefix

The standard "ENVIRONMENT" is not unique across environments

Author: trev-dev

backend/src/config/index.js

@@ -72,6 +72,7 @@ nconf.defaults({
     password: process.env.REDIS_PASSWORD,
     clustered: process.env.REDIS_USE_CLUSTERED,
     estimatorFacilityTTL: process.env.REDIS_FACILITY_TTL,
+    prefix: process.env.REDIS_PREFIX,
   },
   canadaPostApi: {
     apiEndpoint: process.env.CANADA_POST_API_ENDPOINT,

backend/src/util/redis/redis-client.js

@@ -4,7 +4,7 @@ const log = require('../../components/logger');
 
 class Redis {
   static client;
-  static prefix = config.get('environment');
+  static prefix = config.get('redis:prefix');
 
   static async shutdown(signal = 'quit') {
     log.info(`Received ${signal}, closing Redis connection`);
@@ -47,7 +47,7 @@ class Redis {
    * @param {args} args - The rest of the command args
    */
   static async get(key, ...args) {
-    return Redis.client.get(`${Redis.prefix}:${key}`, ...args);
+    return Redis.client.get(`${Redis.prefix}${key}`, ...args);
   }
 
   /**
@@ -58,7 +58,7 @@ class Redis {
    * @param {args} args - The rest of the command args
    */
   static async set(key, ...args) {
-    return Redis.client.set(`${Redis.prefix}:${key}`, ...args);
+    return Redis.client.set(`${Redis.prefix}${key}`, ...args);
   }
 
   /**
@@ -69,7 +69,7 @@ class Redis {
    * @param {args} args - The rest of the command args
    */
   static async jsonGet(key, ...args) {
-    return Redis.client.json.get(`${Redis.prefix}:${key}`, ...args);
+    return Redis.client.json.get(`${Redis.prefix}${key}`, ...args);
   }
 
   /**
@@ -80,7 +80,7 @@ class Redis {
    * @param {args} args - The rest of the command args
    */
   static async jsonSet(key, ...args) {
-    return Redis.client.json.set(`${Redis.prefix}:${key}`, ...args);
+    return Redis.client.json.set(`${Redis.prefix}${key}`, ...args);
   }
 
   /**
@@ -91,7 +91,7 @@ class Redis {
    * @param {args} args - The rest of the command args
    */
   static async expire(key, ...args) {
-    return Redis.client.expire(`${Redis.prefix}:${key}`, ...args);
+    return Redis.client.expire(`${Redis.prefix}${key}`, ...args);
   }
 
   static async init() {

tools/config/update-configmap.sh

@@ -100,6 +100,7 @@ oc create -n "$OPENSHIFT_NAMESPACE" configmap \
   --from-literal="REDIS_HOST=redis" \
   --from-literal="REDIS_PORT=6379" \
   --from-literal="REDIS_FACILITY_TTL=600" \
+  --from-literal="REDIS_PREFIX=$ENV_VAL:" \
   --from-literal="SERVER_FRONTEND=$SERVER_FRONTEND" \
   --from-literal="SERVER_PORT=8080" \
   --from-literal="SITEMINDER_LOGOUT_ENDPOINT=$SITE_MINDER_LOGOUT_URL" \