Decouple demo Redis caching from prod caching

Author: phildarnowsky-broad

deploy/deployctl/subcommands/browser_deployments.py

@@ -105,6 +105,19 @@
           spec:
             nodeSelector:
               cloud.google.com/gke-nodepool: 'demo-pool'
+  - patch: |-
+      apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: gnomad-api
+      spec:
+        template:
+          spec:
+            containers:
+              - name: app
+                env:
+                  - name: REDIS_CACHE_PREFIX
+                    value: '{deployment_name}'
 """
 
 
@@ -193,7 +206,7 @@ def create_deployment(name: str, browser_tag: str = None, api_tag: str = None, d
         )
 
         if demo:
-            kustomization = kustomization + DEMO_DEPLOYMENT_KUSTOMIZATION
+            kustomization = kustomization + DEMO_DEPLOYMENT_KUSTOMIZATION.format(deployment_name=name)
 
         kustomization_file.write(kustomization)
 

deploy/manifests/browser/base/api.deployment.yaml

@@ -61,6 +61,8 @@ spec:
               value: 'true'
             - name: NODE_OPTIONS
               value: '--max-old-space-size=10240'
+            - name: REDIS_CACHE_PREFIX
+              value: 'production'
           ports:
             - name: http
               containerPort: 8000

graphql-api/src/cache.ts

@@ -90,8 +90,11 @@ export const withCache = (
     jsonCacheLargeGenes = config.JSON_CACHE_LARGE_GENES,
   } = options
 
+  const redisCachePrefix = config.REDIS_CACHE_PREFIX
+
   return async (...args: any[]) => {
-    const cacheKey = keyFn(...args)
+    const unscopedCacheKey = keyFn(...args)
+    const cacheKey = `${redisCachePrefix}:${unscopedCacheKey}`
 
     if (jsonCacheEnableAll) {
       const json_cache = new JsonCache(config.JSON_CACHE_PATH, config.JSON_CACHE_COMPRESSION)

graphql-api/src/config.ts

@@ -44,9 +44,10 @@ const config: Record<string, any> = {
 
   // JSON caching
   JSON_CACHE_PATH: env.JSON_CACHE_PATH,
-  JSON_CACHE_ENABLE_ALL: env.JSON_CACHE_ENABLE_ALL === "true" || false,
-  JSON_CACHE_LARGE_GENES: env.JSON_CACHE_LARGE_GENES === "true" || false,
-  JSON_CACHE_COMPRESSION: env.JSON_CACHE_COMPRESSION === "true" || false
+  JSON_CACHE_ENABLE_ALL: env.JSON_CACHE_ENABLE_ALL === 'true' || false,
+  JSON_CACHE_LARGE_GENES: env.JSON_CACHE_LARGE_GENES === 'true' || false,
+  JSON_CACHE_COMPRESSION: env.JSON_CACHE_COMPRESSION === 'true' || false,
+  REDIS_CACHE_PREFIX: env.REDIS_CACHE_PREFIX || '',
 }
 
 const requiredConfig = ['ELASTICSEARCH_URL']