IS-3066: Bytter til Valkey (#1636)

Author: geir-waagboe

.nais/naiserator-dev.yaml

@@ -47,7 +47,7 @@ spec:
       claims:
         extra:
           - "NAVident"
-  redis:
+  valkey:
     - instance: cache
       access: readwrite
   accessPolicy:

.nais/naiserator-prod.yaml

@@ -47,7 +47,7 @@ spec:
       claims:
         extra:
           - "NAVident"
-  redis:
+  valkey:
     - instance: cache
       access: readwrite
   accessPolicy:

README.md

@@ -29,9 +29,9 @@ $ cp .env.template .env # for å sette opp lokale miljøvariabler
 $ npm install # installerer avhengigheter
 ```
 
-## Redis Cache
+## Valkey Cache
 
-Bruker teamsykefravr sin felles Redis-cache på Aiven for å cache bruker-sessions.
+Bruker teamsykefravr sin felles Valkey-cache på Aiven for å cache bruker-sessions.
 
 ## Event tracking
 

server/config.ts

@@ -411,10 +411,13 @@ export const auth = {
   },
 };
 
-export const redis = {
-  uri: envVar({ name: "REDIS_URI_CACHE", defaultValue: "" }),
-  username: envVar({ name: "REDIS_USERNAME_CACHE", defaultValue: "" }),
-  password: envVar({ name: "REDIS_PASSWORD_CACHE", defaultValue: "" }),
+export const valkey = {
+  uri: envVar({ name: "VALKEY_URI_CACHE", defaultValue: "" }).replace(
+    "valkeys",
+    "rediss"
+  ),
+  username: envVar({ name: "VALKEY_USERNAME_CACHE", defaultValue: "" }),
+  password: envVar({ name: "VALKEY_PASSWORD_CACHE", defaultValue: "" }),
   database: 18,
 };
 
@@ -427,7 +430,7 @@ module.exports = {
   auth: auth,
   isDev: isDev,
   isProd: isProd,
-  redis: redis,
+  valkey: valkey,
   unleash: unleash,
   server: server,
 };

server/session.ts

@@ -9,21 +9,21 @@ const SESSION_MAX_AGE_MILLIS = 12 * 60 * 60 * 1000;
 
 const SESSION_MAX_AGE_SECONDS = SESSION_MAX_AGE_MILLIS / 1000;
 
-const getRedisClient = () => {
-  const redisClient = redis.createClient({
-    url: Config.redis.uri,
+const getValkeyClient = () => {
+  const valkeyClient = redis.createClient({
+    url: Config.valkey.uri,
     no_ready_check: true,
   });
-  redisClient.auth(Config.redis.password, Config.redis.username);
-  redisClient.select(Config.redis.database);
-  return redisClient;
+  valkeyClient.auth(Config.valkey.password, Config.valkey.username);
+  valkeyClient.select(Config.valkey.database);
+  return valkeyClient;
 };
 
-const getRedisStore = () => {
+const getValkeyStore = () => {
   if (Config.isDev) return undefined;
   const RedisStore = connectRedis(session);
   return new RedisStore({
-    client: getRedisClient(),
+    client: getValkeyClient(),
     ttl: SESSION_MAX_AGE_SECONDS,
     disableTouch: true,
   });
@@ -45,7 +45,7 @@ export const setupSession = (app: express.Application) => {
       resave: true,
       saveUninitialized: false,
       unset: "destroy",
-      store: getRedisStore(),
+      store: getValkeyStore(),
       rolling: true,
     })
   );