valkey

Author: cristianrgreco

docs/modules/redis.md

@@ -16,7 +16,7 @@ These examples use the following libraries:
 
 Choose an image from the [container registry](https://hub.docker.com/_/redis) and substitute `IMAGE`.
 
-### Set and get a value
+### Set/get a value
 
 <!--codeinclude-->
 [](../../packages/modules/redis/src/redis-container.test.ts) inside_block:redisStartContainer

docs/modules/valkey.md

@@ -1,6 +1,4 @@
-# Valkey Module
-
-[Valkey](https://valkey.io/) is a distributed, in-memory, key-value store.
+# Valkey
 
 ## Install
 
@@ -10,32 +8,40 @@ npm install @testcontainers/valkey --save-dev
 
 ## Examples
 
-<!--codeinclude-->
+These examples use the following libraries:
 
-[Start container:](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:startContainer
+- [redis](https://www.npmjs.com/package/redis)
 
-<!--/codeinclude-->
+        npm install redis
 
-<!--codeinclude-->
+Choose an image from the [container registry](https://hub.docker.com/r/valkey/valkey) and substitute `IMAGE`.
 
-[Connect valkey client to container:](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:simpleConnect
-
-<!--/codeinclude-->
+### Set/get a value
 
 <!--codeinclude-->
-
-[Start container with password authentication:](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:startWithCredentials
-
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyStartContainer
 <!--/codeinclude-->
 
+### With password
+
 <!--codeinclude-->
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithCredentials
+<!--/codeinclude-->
 
-[Define volume for persistent/predefined data:](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:persistentData
+### With persistent data
 
+<!--codeinclude-->
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithPersistentData
 <!--/codeinclude-->
 
+### With predefined data
+
 <!--codeinclude-->
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyWithPredefinedData
+<!--/codeinclude-->
 
-[Execute a command inside the container:](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:executeCommand
+### Execute a command inside the container
 
+<!--codeinclude-->
+[](../../packages/modules/valkey/src/valkey-container.test.ts) inside_block:valkeyExecuteCommand
 <!--/codeinclude-->

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

@@ -3,96 +3,106 @@ import os from "os";
 import path from "path";
 import { createClient } from "redis";
 import { getImage } from "../../../testcontainers/src/utils/test-helper";
-import { StartedValkeyContainer, ValkeyContainer } from "./valkey-container";
+import { ValkeyContainer } from "./valkey-container";
 
 const IMAGE = getImage(__dirname);
 
 describe("ValkeyContainer", { timeout: 240_000 }, () => {
   it("should connect and execute set-get", async () => {
+    // valkeyStartContainer {
     await using container = await new ValkeyContainer(IMAGE).start();
 
-    const client = await connectTo(container);
+    const client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
 
     await client.set("key", "val");
     expect(await client.get("key")).toBe("val");
 
-    await client.disconnect();
+    client.destroy();
+    // }
   });
 
   it("should connect with password and execute set-get", async () => {
     await using container = await new ValkeyContainer(IMAGE).withPassword("test").start();
 
-    const client = await connectTo(container);
+    const client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
 
     await client.set("key", "val");
     expect(await client.get("key")).toBe("val");
 
-    await client.disconnect();
+    client.destroy();
   });
 
   it("should reconnect with volume and persistence data", async () => {
+    // valkeyWithPersistentData {
     const sourcePath = fs.mkdtempSync(path.join(os.tmpdir(), "valkey-"));
+
     await using container = await new ValkeyContainer(IMAGE).withPassword("test").withPersistence(sourcePath).start();
-    let client = await connectTo(container);
+
+    let client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
 
     await client.set("key", "val");
-    await client.disconnect();
+    client.destroy();
+
     await container.restart();
-    client = await connectTo(container);
+    client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
+
     expect(await client.get("key")).toBe("val");
 
-    await client.disconnect();
-    try {
-      fs.rmSync(sourcePath, { force: true, recursive: true });
-    } catch (e) {
-      //Ignore clean up, when have no access on fs.
-      console.log(e);
-    }
+    client.destroy();
+    fs.rmSync(sourcePath, { force: true, recursive: true });
+    // }
   });
 
   it("should load initial data and can read it", async () => {
+    // valkeyWithPredefinedData {
     await using container = await new ValkeyContainer(IMAGE)
       .withPassword("test")
       .withInitialData(path.join(__dirname, "initData.valkey"))
       .start();
-    const client = await connectTo(container);
+
+    const client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
+
     const user = {
       first_name: "David",
       last_name: "Bloom",
       dob: "03-MAR-1981",
     };
     expect(await client.get("user:002")).toBe(JSON.stringify(user));
 
-    await client.disconnect();
+    client.destroy();
+    // }
   });
 
   it("should start with credentials and login", async () => {
+    // valkeyWithCredentials {
     const password = "testPassword";
 
     await using container = await new ValkeyContainer(IMAGE).withPassword(password).start();
+
     expect(container.getConnectionUrl()).toEqual(`redis://:${password}@${container.getHost()}:${container.getPort()}`);
+    // }
 
-    const client = await connectTo(container);
+    const client = createClient({ url: container.getConnectionUrl() });
+    await client.connect();
 
     await client.set("key", "val");
     expect(await client.get("key")).toBe("val");
 
-    await client.disconnect();
+    client.destroy();
   });
 
   it("should execute container cmd and return the result", async () => {
+    // valkeyExecuteCommand {
     await using container = await new ValkeyContainer(IMAGE).start();
 
     const queryResult = await container.executeCliCmd("info", ["clients"]);
+
     expect(queryResult).toEqual(expect.stringContaining("connected_clients:1"));
+    // }
   });
-
-  async function connectTo(container: StartedValkeyContainer) {
-    const client = createClient({
-      url: container.getConnectionUrl(),
-    });
-    await client.connect();
-    expect(client.isOpen).toBeTruthy();
-    return client;
-  }
 });