[CAE-342] Move password to serverArguments

Author: htemelski-oss

packages/client/lib/sentinel/index.spec.ts

@@ -11,7 +11,13 @@ import { exec } from 'node:child_process';
 const execAsync = promisify(exec);
 
 [GLOBAL.SENTINEL.OPEN, GLOBAL.SENTINEL.PASSWORD].forEach(testOptions => {
-  describe(`test with password - ${testOptions.password}`, () => {
+  const passIndex = testOptions.serverArguments.indexOf('--requirepass')+1;
+  let password: string | undefined = undefined;
+  if (passIndex != 0) {
+    password = testOptions.serverArguments[passIndex];
+  }
+
+  describe(`test with password - ${password}`, () => {
     testUtils.testWithClientSentinel('client should be authenticated', async sentinel => {
       await assert.doesNotReject(sentinel.set('x', 1));
     }, testOptions);

packages/client/lib/test-utils.ts

@@ -130,45 +130,37 @@ export const GLOBAL = {
   SENTINEL: {
     OPEN: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
     },
     PASSWORD: {
-      serverArguments: [...DEBUG_MODE_ARGS],
-      password: 'test_password',
+      serverArguments: ['--requirepass', 'test_password', ...DEBUG_MODE_ARGS],
     },
     WITH_SCRIPT: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       scripts: {
         square: SQUARE_SCRIPT,
       },
     },
     WITH_FUNCTION: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       functions: {
         math: MATH_FUNCTION.library,
       },
     },
     WITH_MODULE: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       modules: RedisBloomModules,
     },
     WITH_REPLICA_POOL_SIZE_1: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       replicaPoolSize: 1,
     },
     WITH_RESERVE_CLIENT_MASTER_POOL_SIZE_2: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       masterPoolSize: 2,
       reserveClient: true,
     },
     WITH_MASTER_POOL_SIZE_2: {
       serverArguments: [...DEBUG_MODE_ARGS],
-      password: undefined,
       masterPoolSize: 2,
     }
   }

packages/test-utils/lib/dockers.ts

@@ -333,7 +333,6 @@ const RUNNING_SENTINELS = new Map<Array<string>, Array<RedisServerDocker>>();
 export async function spawnRedisSentinel(
   dockerConfigs: RedisServerDockerOptions,
   serverArguments: Array<string>,
-  password?: string,
 ): Promise<Array<RedisServerDocker>> {
     const runningNodes = RUNNING_SENTINELS.get(serverArguments);
     if (runningNodes) {
@@ -344,9 +343,14 @@ export async function spawnRedisSentinel(
       dockerConfigs.env = new Map();
     }
 
+    const passIndex = serverArguments.indexOf('--requirepass')+1;
+    let password: string | undefined = undefined;
+    if (passIndex != 0) {
+      password = serverArguments[passIndex];
+    }
+
     if (password !== undefined) {
       dockerConfigs.env.set("REDIS_PASSWORD", password);
-      serverArguments.push("--requirepass", password)
     }
 
     const master = await spawnRedisServerDocker(dockerConfigs, serverArguments);

packages/test-utils/lib/index.ts

@@ -84,7 +84,6 @@ interface SentinelTestOptions<
   scripts?: S;
   functions?: F;
   modules?: M;
-  password?: string;
   disableClientSetup?: boolean;
   replicaPoolSize?: number;
   masterPoolSize?: number;
@@ -310,12 +309,17 @@ export default class TestUtils {
   ): void {
     let dockerPromises: ReturnType<typeof spawnRedisSentinel>;
 
+    const passIndex = options.serverArguments.indexOf('--requirepass')+1;
+    let password: string | undefined = undefined;
+    if (passIndex != 0) {
+      password = options.serverArguments[passIndex];
+    }
+    
     if (this.isVersionGreaterThan(options.minimumDockerVersion)) {
       const dockerImage = this.#DOCKER_IMAGE;
       before(function () {
         this.timeout(30000);
-
-        dockerPromises = spawnRedisSentinel(dockerImage, options.serverArguments, options?.password);
+        dockerPromises = spawnRedisSentinel(dockerImage, options.serverArguments);
         return dockerPromises;
       });
     }
@@ -336,10 +340,10 @@ export default class TestUtils {
         name: 'mymaster', 
         sentinelRootNodes: rootNodes, 
         nodeClientOptions: { 
-          password: options?.password || undefined,
+          password: password || undefined,
         },
         sentinelClientOptions: { 
-          password: options?.password || undefined,
+          password: password || undefined,
         },
         replicaPoolSize: options?.replicaPoolSize || 0,
         scripts: options?.scripts || {},