Merge pull request #1707 from navikt/dev-redis-common

Bruker en felles redis-instans for dev1 og dev2

Author: anders-nom

.nais/config.yml

@@ -30,7 +30,7 @@ spec:
   leaderElection: true
   redis:
     - instance: {{ redis.instance }}
-      access: readwrite
+      access: admin
   ingresses:
     {{#each ingresses as |url|}}
     - {{url}}

.nais/vars/vars-dev1.yml

@@ -21,5 +21,5 @@ replicas:
 redis:
   plan: hobbyist
   project: nav-dev
-  instance: pagecache-dev1
+  instance: pagecache
   endpointId: f20f5b48-18f4-4e2a-8e5f-4ab3edb19733

.nais/vars/vars-dev2.yml

@@ -21,5 +21,5 @@ replicas:
 redis:
   plan: hobbyist
   project: nav-dev
-  instance: pagecache-dev2
+  instance: pagecache
   endpointId: f20f5b48-18f4-4e2a-8e5f-4ab3edb19733

nodeenv.d.ts

@@ -18,6 +18,10 @@ declare global {
             NAVNO_API_URL: string;
             ASSET_PREFIX: string;
             TELEMETRY_URL: string;
+            NEXT_PHASE: string;
+            REDIS_URI_PAGECACHE: string;
+            REDIS_USERNAME_PAGECACHE: string;
+            REDIS_PASSWORD_PAGECACHE: string;
         }
     }
 

server/src/cache/page-cache-handler.ts

@@ -8,10 +8,9 @@ const CACHE_TTL_24_HOURS_IN_MS = 3600 * 24 * 1000;
 
 const TTL_RESOLUTION_MS = 60 * 1000;
 
-export const redisCache =
-    process.env.ENV === 'localhost' && !process.env.REDIS_URI_PAGECACHE
-        ? new RedisCacheDummy()
-        : new RedisCache({ ttl: CACHE_TTL_24_HOURS_IN_MS });
+export const redisCache = !process.env.REDIS_URI_PAGECACHE
+    ? new RedisCacheDummy()
+    : new RedisCache({ ttl: CACHE_TTL_24_HOURS_IN_MS });
 
 const localCache = new LRUCache<string, CacheHandlerValue>({
     max: 2000,

server/src/cache/redis.ts

@@ -2,29 +2,11 @@ import { createClient, RedisClientOptions } from 'redis';
 import { CacheHandlerValue } from 'next/dist/server/lib/incremental-cache';
 import { logger } from 'srcCommon/logger';
 
-type AppEnv = typeof process.env.ENV;
-
-const clientOptions: Record<AppEnv, RedisClientOptions> = {
-    localhost: {
-        url: process.env.REDIS_URI_PAGECACHE,
-        username: process.env.REDIS_USERNAME_PAGECACHE,
-        password: process.env.REDIS_PASSWORD_PAGECACHE,
-    },
-    prod: {
-        url: process.env.REDIS_URI_PAGECACHE,
-        username: process.env.REDIS_USERNAME_PAGECACHE,
-        password: process.env.REDIS_PASSWORD_PAGECACHE,
-    },
-    dev1: {
-        url: process.env.REDIS_URI_PAGECACHE_DEV1,
-        username: process.env.REDIS_USERNAME_PAGECACHE_DEV1,
-        password: process.env.REDIS_PASSWORD_PAGECACHE_DEV1,
-    },
-    dev2: {
-        url: process.env.REDIS_URI_PAGECACHE_DEV2,
-        username: process.env.REDIS_USERNAME_PAGECACHE_DEV2,
-        password: process.env.REDIS_PASSWORD_PAGECACHE_DEV2,
-    },
+const clientOptions: RedisClientOptions = {
+    url: process.env.REDIS_URI_PAGECACHE,
+    username: process.env.REDIS_USERNAME_PAGECACHE,
+    password: process.env.REDIS_PASSWORD_PAGECACHE,
+    socket: { keepAlive: 5000, connectTimeout: 10000 },
 } as const;
 
 interface IRedisCache {
@@ -45,21 +27,9 @@ export class RedisCache implements IRedisCache {
     private keyPrefix: string = '';
 
     constructor({ ttl }: ConstructorProps) {
-        const env = process.env.ENV;
-        const options = clientOptions[env];
-
-        if (!options) {
-            throw Error(
-                `Redis client options were not defined for the current app environment: ${env}`
-            );
-        }
-
         this.ttl = ttl;
 
-        this.client = createClient({
-            ...options,
-            socket: { keepAlive: 5000, connectTimeout: 10000 },
-        })
+        this.client = createClient(clientOptions)
             .on('connect', () => {
                 logger.info('Redis client connected');
             })
@@ -76,11 +46,11 @@ export class RedisCache implements IRedisCache {
                 logger.error(`Redis client error: ${err}`);
             });
 
-        logger.info(`Created redis client with url ${options.url}`);
+        logger.info(`Created redis client with url ${clientOptions.url}`);
     }
 
     public async init(keyPrefix: string) {
-        this.keyPrefix = keyPrefix;
+        this.keyPrefix = `${process.env.ENV}:${keyPrefix}`;
 
         return this.client.connect().then(() => {
             logger.info(