@testcontainers/mongodb 11.3.1 → 11.4.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.
Files changed (4) hide show
  1. package/build/mongodb-container.d.ts +8 -7
  2. package/build/mongodb-container.js +64 -36
  3. package/build/mongodb-container.js.map +1 -1
  4. package/package.json +4 -3
package/build/mongodb-container.d.ts CHANGED
@@ -1,16 +1,17 @@
1
1
  import { AbstractStartedContainer, GenericContainer, StartedTestContainer } from "testcontainers";
2
2
  export declare class MongoDBContainer extends GenericContainer {
3
+ private username;
4
+ private password;
3
5
  constructor(image: string);
6
+ withUsername(username: string): this;
7
+ withPassword(password: string): this;
4
8
  start(): Promise<StartedMongoDBContainer>;
5
- protected containerStarted(startedTestContainer: StartedTestContainer): Promise<void>;
6
- private initReplicaSet;
7
- private executeMongoEvalCommand;
9
+ private withWaitForRsHealthCheck;
8
10
  private buildMongoEvalCommand;
9
- private getMongoCmdBasedOnImageTag;
10
- private checkMongoNodeExitCode;
11
- private buildMongoWaitCommand;
12
11
  }
13
12
  export declare class StartedMongoDBContainer extends AbstractStartedContainer {
14
- constructor(startedTestContainer: StartedTestContainer);
13
+ private readonly username;
14
+ private readonly password;
15
+ constructor(startedTestContainer: StartedTestContainer, username: string | undefined, password: string | undefined);
15
16
  getConnectionString(): string;
16
17
  }
package/build/mongodb-container.js CHANGED
@@ -1,60 +1,88 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.StartedMongoDBContainer = exports.MongoDBContainer = void 0;
4
+ const compare_versions_1 = require("compare-versions");
4
5
  const testcontainers_1 = require("testcontainers");
5
6
  const MONGODB_PORT = 27017;
6
7
  class MongoDBContainer extends testcontainers_1.GenericContainer {
8
+ username;
9
+ password;
7
10
  constructor(image) {
8
11
  super(image);
9
- this.withExposedPorts(MONGODB_PORT)
10
- .withCommand(["--replSet", "rs0"])
11
- .withWaitStrategy(testcontainers_1.Wait.forLogMessage(/.*waiting for connections.*/i))
12
- .withStartupTimeout(120_000);
12
+ this.withExposedPorts(MONGODB_PORT).withWaitStrategy(testcontainers_1.Wait.forHealthCheck()).withStartupTimeout(120_000);
13
13
  }
14
- async start() {
15
- return new StartedMongoDBContainer(await super.start());
16
- }
17
- async containerStarted(startedTestContainer) {
18
- await this.initReplicaSet(startedTestContainer);
19
- }
20
- async initReplicaSet(startedTestContainer) {
21
- await this.executeMongoEvalCommand(startedTestContainer, "rs.initiate();");
22
- await this.executeMongoEvalCommand(startedTestContainer, this.buildMongoWaitCommand());
14
+ withUsername(username) {
15
+ if (!username)
16
+ throw new Error("Username should not be empty.");
17
+ this.username = username;
18
+ return this;
23
19
  }
24
- async executeMongoEvalCommand(startedTestContainer, command) {
25
- const execResult = await startedTestContainer.exec(this.buildMongoEvalCommand(command));
26
- this.checkMongoNodeExitCode(execResult);
27
- }
28
- buildMongoEvalCommand(command) {
29
- return [this.getMongoCmdBasedOnImageTag(), "--eval", command];
20
+ withPassword(password) {
21
+ if (!password)
22
+ throw new Error("Password should not be empty.");
23
+ this.password = password;
24
+ return this;
30
25
  }
31
- getMongoCmdBasedOnImageTag() {
32
- return parseInt(this.imageName.tag[0]) >= 5 ? "mongosh" : "mongo";
33
- }
34
- checkMongoNodeExitCode(execResult) {
35
- const { exitCode, output } = execResult;
36
- if (execResult.exitCode !== 0) {
37
- throw new Error(`Error running mongo command. Exit code ${exitCode}: ${output}`);
26
+ async start() {
27
+ const cmdArgs = ["--replSet", "rs0"];
28
+ if (!this.healthCheck)
29
+ this.withWaitForRsHealthCheck();
30
+ if (this.username && this.password) {
31
+ cmdArgs.push("--keyFile", "/data/db/key.txt");
32
+ this.withEnvironment({
33
+ MONGO_INITDB_ROOT_USERNAME: this.username,
34
+ MONGO_INITDB_ROOT_PASSWORD: this.password,
35
+ })
36
+ .withCopyContentToContainer([
37
+ {
38
+ content: "1111111111",
39
+ mode: 0o400,
40
+ target: "/data/db/key.txt",
41
+ },
42
+ ])
43
+ .withCommand(cmdArgs);
38
44
  }
45
+ else {
46
+ this.withCommand(cmdArgs);
47
+ }
48
+ return new StartedMongoDBContainer(await super.start(), this.username, this.password);
39
49
  }
40
- buildMongoWaitCommand() {
41
- return `
42
- var attempt = 0;
43
- while(db.runCommand({isMaster: 1}).ismaster==false) {
44
- if (attempt > 60) {
45
- quit(1);
46
- }
47
- print(attempt); sleep(100); attempt++;
50
+ withWaitForRsHealthCheck() {
51
+ return this.withHealthCheck({
52
+ test: [
53
+ "CMD-SHELL",
54
+ this.buildMongoEvalCommand(`'try { rs.initiate(); } catch (e){} while (db.runCommand({isMaster: 1}).ismaster==false) { sleep(100); }'`),
55
+ ],
56
+ interval: 250,
57
+ timeout: 60000,
58
+ retries: 1000,
59
+ });
48
60
  }
49
- `;
61
+ buildMongoEvalCommand(command) {
62
+ const useMongosh = (0, compare_versions_1.satisfies)(this.imageName.tag, ">=5.0.0");
63
+ const args = [];
64
+ if (useMongosh)
65
+ args.push("mongosh");
66
+ else
67
+ args.push("mongo", "admin");
68
+ if (this.username && this.password)
69
+ args.push("-u", this.username, "-p", this.password);
70
+ args.push("--quiet", "--eval", command);
71
+ return args.join(" ");
50
72
  }
51
73
  }
52
74
  exports.MongoDBContainer = MongoDBContainer;
53
75
  class StartedMongoDBContainer extends testcontainers_1.AbstractStartedContainer {
54
- constructor(startedTestContainer) {
76
+ username;
77
+ password;
78
+ constructor(startedTestContainer, username, password) {
55
79
  super(startedTestContainer);
80
+ this.username = username;
81
+ this.password = password;
56
82
  }
57
83
  getConnectionString() {
84
+ if (this.username && this.password)
85
+ return `mongodb://${this.username}:${this.password}@${this.getHost()}:${this.getMappedPort(MONGODB_PORT)}?authSource=admin`;
58
86
  return `mongodb://${this.getHost()}:${this.getMappedPort(MONGODB_PORT)}`;
59
87
  }
60
88
  }
package/build/mongodb-container.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mongodb-container.js","sourceRoot":"","sources":["../src/mongodb-container.ts"],"names":[],"mappings":";;;AAAA,mDAAoH;AAEpH,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAa,gBAAiB,SAAQ,iCAAgB;IACpD,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;aAChC,WAAW,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;aACjC,gBAAgB,CAAC,qBAAI,CAAC,aAAa,CAAC,8BAA8B,CAAC,CAAC;aACpE,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEe,KAAK,CAAC,KAAK;QACzB,OAAO,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEkB,KAAK,CAAC,gBAAgB,CAAC,oBAA0C;QAClF,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,oBAA0C;QACrE,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;QAC3E,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACzF,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,oBAA0C,EAAE,OAAe;QAC/F,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAEO,qBAAqB,CAAC,OAAe;QAC3C,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAEO,0BAA0B;QAChC,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;IACpE,CAAC;IAEO,sBAAsB,CAAC,UAAsB;QACnD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QACxC,IAAI,UAAU,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,KAAK,MAAM,EAAE,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,OAAO;;;;;;;;KAQN,CAAC;IACJ,CAAC;CACF;AArDD,4CAqDC;AAED,MAAa,uBAAwB,SAAQ,yCAAwB;IACnE,YAAY,oBAA0C;QACpD,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC9B,CAAC;IAEM,mBAAmB;QACxB,OAAO,aAAa,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3E,CAAC;CACF;AARD,0DAQC"}
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.1",
3
+ "version": "11.4.0",
4
4
  "license": "MIT",
5
5
  "keywords": [
6
6
  "mongodb",
@@ -29,9 +29,10 @@
29
29
  "build": "tsc --project tsconfig.build.json"
30
30
  },
31
31
  "devDependencies": {
32
- "mongoose": "^8.16.1"
32
+ "mongoose": "^8.16.4"
33
33
  },
34
34
  "dependencies": {
35
- "testcontainers": "^11.3.1"
35
+ "compare-versions": "^6.1.1",
36
+ "testcontainers": "^11.4.0"
36
37
  }
37
38
  }