fix: executeCliCmd

Author: rqbazan

docs/modules/valkey.md

@@ -25,7 +25,13 @@ Choose an image from the [container registry](https://hub.docker.com/r/valkey/va
 ### With password
 
 <!--codeinclude-->
-[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithCredentials
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithPassword
+<!--/codeinclude-->
+
+### With username and password
+
+<!--codeinclude-->
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithUsernameAndPassword
 <!--/codeinclude-->
 
 ### With persistent data

packages/modules/valkey/src/valkey-container.test.ts

@@ -89,8 +89,27 @@ describe("ValkeyContainer", { timeout: 240_000 }, () => {
     // }
   });
 
-  it("should start with credentials and login", async () => {
-    // valkeyWithCredentials {
+  it("should start with username and password", async () => {
+    // valkeyWithUsernameAndPassword {
+    const username = "testUser";
+    const password = "testPassword";
+
+    await using container = await new ValkeyContainer(IMAGE).withUsername(username).withPassword(password).start();
+
+    expect(container.getConnectionUrl()).toEqual(`redis://${username}:${password}@${container.getHost()}:${container.getPort()}`);
+    // }
+
+    const client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
+
+    await client.set("key", "val");
+    expect(await client.get("key")).toBe("val");
+
+    client.destroy();
+  });
+
+  it("should start with password only", async () => {
+    // valkeyWithPassword {
     const password = "testPassword";
 
     await using container = await new ValkeyContainer(IMAGE).withPassword(password).start();

packages/modules/valkey/src/valkey-container.ts

@@ -71,7 +71,7 @@ export class ValkeyContainer extends GenericContainer {
       ]);
     }
 
-    return new StartedValkeyContainer(await super.start(), this.password);
+    return new StartedValkeyContainer(await super.start(), this.password, this.username);
   }
 
   private async importInitialData(container: StartedTestContainer) {
@@ -85,7 +85,8 @@ export class ValkeyContainer extends GenericContainer {
 export class StartedValkeyContainer extends AbstractStartedContainer {
   constructor(
     startedTestContainer: StartedTestContainer,
-    private readonly password?: string
+    private readonly password?: string,
+    private readonly username?: string,
   ) {
     super(startedTestContainer);
   }
@@ -98,18 +99,27 @@ export class StartedValkeyContainer extends AbstractStartedContainer {
     return this.password ? this.password.toString() : "";
   }
 
+  public getUsername(): string {
+    return this.username ? this.username.toString() : "";
+  }
+
   public getConnectionUrl(): string {
     const url = new URL("", "redis://");
     url.hostname = this.getHost();
     url.port = this.getPort().toString();
     url.password = this.getPassword();
+    url.username = this.getUsername();
     return url.toString();
   }
 
   public async executeCliCmd(cmd: string, additionalFlags: string[] = []): Promise<string> {
+    const authCommand = this.password ? [
+      `--pass ${this.password}`,
+      ...(this.username ? [`--user ${this.username}`] : [])
+    ] : [];
     const result = await this.startedTestContainer.exec([
       "redis-cli",
-      ...(this.password != "" ? [`-a ${this.password}`] : []),
+      ...authCommand,
       `${cmd}`,
       ...additionalFlags,
     ]);