FLS-1452 - Simplify code in AdapterCacheService around Redis client

Currently we have duplicate Redis client configuration code in the private AdapterCacheService method getRedisClient and in the catboxProvider function. The way the code is formatted is also unnecessarily space-consuming. This commit creates a new shared utility function createRedisClient which can be used in both places, and uses concise formatting to reduce lines of code significantly.

Author: wjrm500

runner/src/server/services/AdapterCacheService.ts

@@ -42,6 +42,22 @@ enum ADDITIONAL_IDENTIFIER {
     Confirmation = ":confirmation",
 }
 
+const createRedisClient = (): Redis | null => {
+   if (redisHost || redisUri) {
+       const redisOptions: {password?: string; tls?: {};} = {};
+       if (redisPassword) redisOptions.password = redisPassword;
+       if (redisTls) redisOptions.tls = {};
+       
+       return isSingleRedis
+           ? new Redis(redisUri ?? {host: redisHost, port: redisPort, password: redisPassword})
+           : new Redis.Cluster(
+               [{host: redisHost, port: redisPort}],
+               {dnsLookup: (address, callback) => callback(null, address, 4), redisOptions}
+           );
+   }
+   return null;
+};
+
 export class AdapterCacheService extends CacheService {
 
     constructor(server: HapiServer) {
@@ -253,49 +269,16 @@ export class AdapterCacheService extends CacheService {
         throw Boom.notFound("Cannot find the given form");
     }
 
-    private getRedisClient() {
-        if (redisHost || redisUri) {
-            const redisOptions: {
-                password?: string;
-                tls?: {};
-            } = {};
-
-            if (redisPassword) {
-                redisOptions.password = redisPassword;
-            }
-
-            if (redisTls) {
-                redisOptions.tls = {};
-            }
-
-            const client = isSingleRedis
-                ? new Redis(
-                    redisUri ?? {
-                        host: redisHost,
-                        port: redisPort,
-                        password: redisPassword,
-                    }
-                )
-                : new Redis.Cluster(
-                    [
-                        {
-                            host: redisHost,
-                            port: redisPort,
-                        },
-                    ],
-                    {
-                        dnsLookup: (address, callback) => callback(null, address, 4),
-                        redisOptions,
-                    }
-                );
-            return client;
-        } else {
-            console.log({
-                ...LOGGER_DATA,
-                message: `[FORM-CACHE] using memory caching`,
-            })
-        }
-    }
+    private getRedisClient(): Redis | null {
+       const client = createRedisClient();
+       if (!client) {
+           console.log({
+               ...LOGGER_DATA,
+               message: `[FORM-CACHE] using memory caching`,
+           });
+       }
+       return client;
+   }
 }
 
 export const catboxProvider = () => {
@@ -305,49 +288,16 @@ export const catboxProvider = () => {
      */
     const provider = {
         constructor: redisHost || redisUri ? CatboxRedis.Engine : CatboxMemory.Engine,
-        options: {},
+        options: {partition},
     };
 
     if (redisHost || redisUri) {
-        console.log("Starting redis session management")
-        const redisOptions: {
-            password?: string;
-            tls?: {};
-        } = {};
-
-        if (redisPassword) {
-            redisOptions.password = redisPassword;
-        }
-
-        if (redisTls) {
-            redisOptions.tls = {};
-        }
-
-        const client = isSingleRedis
-            ? new Redis(
-                redisUri ?? {
-                    host: redisHost,
-                    port: redisPort,
-                    password: redisPassword,
-                }
-            )
-            : new Redis.Cluster(
-                [
-                    {
-                        host: redisHost,
-                        port: redisPort,
-                    },
-                ],
-                {
-                    dnsLookup: (address, callback) => callback(null, address, 4),
-                    redisOptions,
-                }
-            );
-        provider.options = {client, partition};
-        console.log(`Redis Url : ${redisUri} session management`);
+       console.log("Starting redis session management");
+       const client = createRedisClient();
+       provider.options = {client, partition};
+       console.log(`Redis Url : ${redisUri} session management`);
     } else {
-        console.log("Starting in memory session management")
-        provider.options = {partition};
+        console.log("Starting in memory session management");
     }
 
     return provider;