@testcontainers/mongodb 11.6.0 → 11.7.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.
|
@@ -8,6 +8,8 @@ export declare class MongoDBContainer extends GenericContainer {
|
|
|
8
8
|
start(): Promise<StartedMongoDBContainer>;
|
|
9
9
|
private withWaitForRsHealthCheck;
|
|
10
10
|
private buildMongoEvalCommand;
|
|
11
|
+
private getRsInitCmd;
|
|
12
|
+
private isV5OrLater;
|
|
11
13
|
}
|
|
12
14
|
export declare class StartedMongoDBContainer extends AbstractStartedContainer {
|
|
13
15
|
private readonly username;
|
|
@@ -49,19 +49,15 @@ class MongoDBContainer extends testcontainers_1.GenericContainer {
|
|
|
49
49
|
}
|
|
50
50
|
withWaitForRsHealthCheck() {
|
|
51
51
|
return this.withHealthCheck({
|
|
52
|
-
test: [
|
|
53
|
-
|
|
54
|
-
this.buildMongoEvalCommand(`'try { rs.initiate(); } catch (e){} while (db.runCommand({isMaster: 1}).ismaster==false) { sleep(100); }'`),
|
|
55
|
-
],
|
|
56
|
-
interval: 250,
|
|
52
|
+
test: ["CMD-SHELL", this.buildMongoEvalCommand(this.getRsInitCmd())],
|
|
53
|
+
interval: 5000,
|
|
57
54
|
timeout: 60000,
|
|
58
55
|
retries: 1000,
|
|
59
56
|
});
|
|
60
57
|
}
|
|
61
58
|
buildMongoEvalCommand(command) {
|
|
62
|
-
const useMongosh = (0, compare_versions_1.satisfies)(this.imageName.tag, ">=5.0.0");
|
|
63
59
|
const args = [];
|
|
64
|
-
if (
|
|
60
|
+
if (this.isV5OrLater())
|
|
65
61
|
args.push("mongosh");
|
|
66
62
|
else
|
|
67
63
|
args.push("mongo", "admin");
|
|
@@ -70,6 +66,20 @@ class MongoDBContainer extends testcontainers_1.GenericContainer {
|
|
|
70
66
|
args.push("--quiet", "--eval", command);
|
|
71
67
|
return args.join(" ");
|
|
72
68
|
}
|
|
69
|
+
getRsInitCmd() {
|
|
70
|
+
if (this.isV5OrLater())
|
|
71
|
+
return `'try { rs.status(); } catch (e) { rs.initiate(); } while (db.runCommand({isMaster: 1}).ismaster==false) { sleep(100); }'`;
|
|
72
|
+
else
|
|
73
|
+
return `'try { rs.initiate(); } catch (e) {} while (db.runCommand({isMaster: 1}).ismaster==false) { sleep(100); }'`;
|
|
74
|
+
}
|
|
75
|
+
isV5OrLater() {
|
|
76
|
+
try {
|
|
77
|
+
return (0, compare_versions_1.satisfies)(this.imageName.tag, ">=5.0.0");
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
73
83
|
}
|
|
74
84
|
exports.MongoDBContainer = MongoDBContainer;
|
|
75
85
|
class StartedMongoDBContainer extends testcontainers_1.AbstractStartedContainer {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb-container.js","sourceRoot":"","sources":["../src/mongodb-container.ts"],"names":[],"mappings":";;;AAAA,uDAA6C;AAC7C,mDAAwG;AAExG,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAa,gBAAiB,SAAQ,iCAAgB;IAC5C,QAAQ,CAAqB;IAC7B,QAAQ,CAAqB;IAErC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC,qBAAI,CAAC,cAAc,EAAE,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1G,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEe,KAAK,CAAC,KAAK;QACzB,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACvD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC;gBACnB,0BAA0B,EAAE,IAAI,CAAC,QAAQ;gBACzC,0BAA0B,EAAE,IAAI,CAAC,QAAQ;aAC1C,CAAC;iBACC,0BAA0B,CAAC;gBAC1B;oBACE,OAAO,EAAE,YAAY;oBACrB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC;iBACD,WAAW,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEO,wBAAwB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC;YAC1B,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"mongodb-container.js","sourceRoot":"","sources":["../src/mongodb-container.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@testcontainers/mongodb",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.7.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mongodb",
|
|
@@ -33,6 +33,6 @@
|
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"compare-versions": "^6.1.1",
|
|
36
|
-
"testcontainers": "^11.
|
|
36
|
+
"testcontainers": "^11.7.0"
|
|
37
37
|
}
|
|
38
38
|
}
|