@testcontainers/valkey 11.5.0 → 11.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,10 +2,12 @@ import { AbstractStartedContainer, GenericContainer, StartedTestContainer } from
|
|
|
2
2
|
export declare class ValkeyContainer extends GenericContainer {
|
|
3
3
|
private readonly importFilePath;
|
|
4
4
|
private password?;
|
|
5
|
+
private username?;
|
|
5
6
|
private persistenceVolume?;
|
|
6
7
|
private initialImportScriptFile?;
|
|
7
8
|
constructor(image: string);
|
|
8
9
|
withPassword(password: string): this;
|
|
10
|
+
withUsername(username: string): this;
|
|
9
11
|
withPersistence(sourcePath: string): this;
|
|
10
12
|
withInitialData(importScriptFile: string): this;
|
|
11
13
|
protected containerStarted(container: StartedTestContainer): Promise<void>;
|
|
@@ -14,9 +16,11 @@ export declare class ValkeyContainer extends GenericContainer {
|
|
|
14
16
|
}
|
|
15
17
|
export declare class StartedValkeyContainer extends AbstractStartedContainer {
|
|
16
18
|
private readonly password?;
|
|
17
|
-
|
|
19
|
+
private readonly username?;
|
|
20
|
+
constructor(startedTestContainer: StartedTestContainer, password?: string | undefined, username?: string | undefined);
|
|
18
21
|
getPort(): number;
|
|
19
22
|
getPassword(): string;
|
|
23
|
+
getUsername(): string;
|
|
20
24
|
getConnectionUrl(): string;
|
|
21
25
|
executeCliCmd(cmd: string, additionalFlags?: string[]): Promise<string>;
|
|
22
26
|
}
|
|
@@ -10,6 +10,7 @@ const VALKEY_PORT = 6379;
|
|
|
10
10
|
class ValkeyContainer extends testcontainers_1.GenericContainer {
|
|
11
11
|
importFilePath = "/tmp/import.valkey";
|
|
12
12
|
password = "";
|
|
13
|
+
username = "";
|
|
13
14
|
persistenceVolume = "";
|
|
14
15
|
initialImportScriptFile = "";
|
|
15
16
|
constructor(image) {
|
|
@@ -22,6 +23,10 @@ class ValkeyContainer extends testcontainers_1.GenericContainer {
|
|
|
22
23
|
this.password = password;
|
|
23
24
|
return this;
|
|
24
25
|
}
|
|
26
|
+
withUsername(username) {
|
|
27
|
+
this.username = username;
|
|
28
|
+
return this;
|
|
29
|
+
}
|
|
25
30
|
withPersistence(sourcePath) {
|
|
26
31
|
this.persistenceVolume = sourcePath;
|
|
27
32
|
return this;
|
|
@@ -36,9 +41,15 @@ class ValkeyContainer extends testcontainers_1.GenericContainer {
|
|
|
36
41
|
}
|
|
37
42
|
}
|
|
38
43
|
async start() {
|
|
44
|
+
const authCommand = this.password
|
|
45
|
+
? [
|
|
46
|
+
`--requirepass "${this.password}"`,
|
|
47
|
+
...(this.username ? [`--user "${this.username}" on >${this.password} ~* +@all`] : []),
|
|
48
|
+
]
|
|
49
|
+
: [];
|
|
39
50
|
this.withCommand([
|
|
40
51
|
"valkey-server",
|
|
41
|
-
...
|
|
52
|
+
...authCommand,
|
|
42
53
|
...(this.persistenceVolume ? ["--save 1 1 ", "--appendonly yes"] : []),
|
|
43
54
|
]);
|
|
44
55
|
if (this.persistenceVolume) {
|
|
@@ -58,7 +69,7 @@ class ValkeyContainer extends testcontainers_1.GenericContainer {
|
|
|
58
69
|
},
|
|
59
70
|
]);
|
|
60
71
|
}
|
|
61
|
-
return new StartedValkeyContainer(await super.start(), this.password);
|
|
72
|
+
return new StartedValkeyContainer(await super.start(), this.password, this.username);
|
|
62
73
|
}
|
|
63
74
|
async importInitialData(container) {
|
|
64
75
|
const re = await container.exec(`/tmp/import.sh ${this.password || ""}`);
|
|
@@ -70,9 +81,11 @@ class ValkeyContainer extends testcontainers_1.GenericContainer {
|
|
|
70
81
|
exports.ValkeyContainer = ValkeyContainer;
|
|
71
82
|
class StartedValkeyContainer extends testcontainers_1.AbstractStartedContainer {
|
|
72
83
|
password;
|
|
73
|
-
|
|
84
|
+
username;
|
|
85
|
+
constructor(startedTestContainer, password, username) {
|
|
74
86
|
super(startedTestContainer);
|
|
75
87
|
this.password = password;
|
|
88
|
+
this.username = username;
|
|
76
89
|
}
|
|
77
90
|
getPort() {
|
|
78
91
|
return this.getMappedPort(VALKEY_PORT);
|
|
@@ -80,20 +93,22 @@ class StartedValkeyContainer extends testcontainers_1.AbstractStartedContainer {
|
|
|
80
93
|
getPassword() {
|
|
81
94
|
return this.password ? this.password.toString() : "";
|
|
82
95
|
}
|
|
96
|
+
getUsername() {
|
|
97
|
+
return this.username ? this.username.toString() : "";
|
|
98
|
+
}
|
|
83
99
|
getConnectionUrl() {
|
|
84
100
|
const url = new URL("", "redis://");
|
|
85
101
|
url.hostname = this.getHost();
|
|
86
102
|
url.port = this.getPort().toString();
|
|
87
103
|
url.password = this.getPassword();
|
|
104
|
+
url.username = this.getUsername();
|
|
88
105
|
return url.toString();
|
|
89
106
|
}
|
|
90
107
|
async executeCliCmd(cmd, additionalFlags = []) {
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
...additionalFlags,
|
|
96
|
-
]);
|
|
108
|
+
const authCommand = this.password
|
|
109
|
+
? [`--pass ${this.password}`, ...(this.username ? [`--user ${this.username}`] : [])]
|
|
110
|
+
: [];
|
|
111
|
+
const result = await this.startedTestContainer.exec(["redis-cli", ...authCommand, `${cmd}`, ...additionalFlags]);
|
|
97
112
|
if (result.exitCode !== 0) {
|
|
98
113
|
throw new Error(`executeQuery failed with exit code ${result.exitCode} for query: ${cmd}. ${result.output}`);
|
|
99
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valkey-container.js","sourceRoot":"","sources":["../src/valkey-container.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,mDAAwG;AAExG,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAa,eAAgB,SAAQ,iCAAgB;IAClC,cAAc,GAAG,oBAAoB,CAAC;IAC/C,QAAQ,GAAI,EAAE,CAAC;IACf,iBAAiB,GAAI,EAAE,CAAC;IACxB,uBAAuB,GAAI,EAAE,CAAC;IAEtC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;aAC/B,kBAAkB,CAAC,OAAO,CAAC;aAC3B,gBAAgB,CAAC,qBAAI,CAAC,aAAa,CAAC,6BAA6B,CAAC,CAAC,CAAC;IACzE,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,eAAe,CAAC,UAAkB;QACvC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,eAAe,CAAC,gBAAwB;QAC7C,IAAI,CAAC,uBAAuB,GAAG,gBAAgB,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAEkB,KAAK,CAAC,gBAAgB,CAAC,SAA+B;QACvE,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAEe,KAAK,CAAC,KAAK;QACzB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"valkey-container.js","sourceRoot":"","sources":["../src/valkey-container.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@testcontainers/valkey",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.6.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"valkey",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"build": "tsc --project tsconfig.build.json"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"redis": "^5.
|
|
32
|
+
"redis": "^5.8.2"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"testcontainers": "^11.
|
|
35
|
+
"testcontainers": "^11.6.0"
|
|
36
36
|
}
|
|
37
37
|
}
|