@testcontainers/mongodb 11.3.2 → 11.5.0

package/build/mongodb-container.d.ts

@@ -1,16 +1,17 @@
 import { AbstractStartedContainer, GenericContainer, StartedTestContainer } from "testcontainers";
 export declare class MongoDBContainer extends GenericContainer {
+    private username;
+    private password;
     constructor(image: string);
+    withUsername(username: string): this;
+    withPassword(password: string): this;
     start(): Promise<StartedMongoDBContainer>;
-    protected containerStarted(startedTestContainer: StartedTestContainer): Promise<void>;
-    private initReplicaSet;
-    private executeMongoEvalCommand;
+    private withWaitForRsHealthCheck;
     private buildMongoEvalCommand;
-    private getMongoCmdBasedOnImageTag;
-    private checkMongoNodeExitCode;
-    private buildMongoWaitCommand;
 }
 export declare class StartedMongoDBContainer extends AbstractStartedContainer {
-    constructor(startedTestContainer: StartedTestContainer);
+    private readonly username;
+    private readonly password;
+    constructor(startedTestContainer: StartedTestContainer, username: string | undefined, password: string | undefined);
     getConnectionString(): string;
 }

package/build/mongodb-container.js

@@ -1,60 +1,88 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartedMongoDBContainer = exports.MongoDBContainer = void 0;
+const compare_versions_1 = require("compare-versions");
 const testcontainers_1 = require("testcontainers");
 const MONGODB_PORT = 27017;
 class MongoDBContainer extends testcontainers_1.GenericContainer {
+    username;
+    password;
     constructor(image) {
         super(image);
-        this.withExposedPorts(MONGODB_PORT)
-            .withCommand(["--replSet", "rs0"])
-            .withWaitStrategy(testcontainers_1.Wait.forLogMessage(/.*waiting for connections.*/i))
-            .withStartupTimeout(120_000);
+        this.withExposedPorts(MONGODB_PORT).withWaitStrategy(testcontainers_1.Wait.forHealthCheck()).withStartupTimeout(120_000);
     }
-    async start() {
-        return new StartedMongoDBContainer(await super.start());
-    }
-    async containerStarted(startedTestContainer) {
-        await this.initReplicaSet(startedTestContainer);
-    }
-    async initReplicaSet(startedTestContainer) {
-        await this.executeMongoEvalCommand(startedTestContainer, "rs.initiate();");
-        await this.executeMongoEvalCommand(startedTestContainer, this.buildMongoWaitCommand());
+    withUsername(username) {
+        if (!username)
+            throw new Error("Username should not be empty.");
+        this.username = username;
+        return this;
     }
-    async executeMongoEvalCommand(startedTestContainer, command) {
-        const execResult = await startedTestContainer.exec(this.buildMongoEvalCommand(command));
-        this.checkMongoNodeExitCode(execResult);
-    }
-    buildMongoEvalCommand(command) {
-        return [this.getMongoCmdBasedOnImageTag(), "--eval", command];
+    withPassword(password) {
+        if (!password)
+            throw new Error("Password should not be empty.");
+        this.password = password;
+        return this;
     }
-    getMongoCmdBasedOnImageTag() {
-        return parseInt(this.imageName.tag[0]) >= 5 ? "mongosh" : "mongo";
-    }
-    checkMongoNodeExitCode(execResult) {
-        const { exitCode, output } = execResult;
-        if (execResult.exitCode !== 0) {
-            throw new Error(`Error running mongo command. Exit code ${exitCode}: ${output}`);
+    async start() {
+        const cmdArgs = ["--replSet", "rs0"];
+        if (!this.healthCheck)
+            this.withWaitForRsHealthCheck();
+        if (this.username && this.password) {
+            cmdArgs.push("--keyFile", "/data/db/key.txt");
+            this.withEnvironment({
+                MONGO_INITDB_ROOT_USERNAME: this.username,
+                MONGO_INITDB_ROOT_PASSWORD: this.password,
+            })
+                .withCopyContentToContainer([
+                {
+                    content: "1111111111",
+                    mode: 0o400,
+                    target: "/data/db/key.txt",
+                },
+            ])
+                .withCommand(cmdArgs);
         }
+        else {
+            this.withCommand(cmdArgs);
+        }
+        return new StartedMongoDBContainer(await super.start(), this.username, this.password);
     }
-    buildMongoWaitCommand() {
-        return `
-    var attempt = 0;
-    while(db.runCommand({isMaster: 1}).ismaster==false) {
-      if (attempt > 60) {
-        quit(1);
-      }
-      print(attempt); sleep(100); attempt++;
+    withWaitForRsHealthCheck() {
+        return this.withHealthCheck({
+            test: [
+                "CMD-SHELL",
+                this.buildMongoEvalCommand(`'try { rs.initiate(); } catch (e){} while (db.runCommand({isMaster: 1}).ismaster==false) { sleep(100); }'`),
+            ],
+            interval: 250,
+            timeout: 60000,
+            retries: 1000,
+        });
     }
-    `;
+    buildMongoEvalCommand(command) {
+        const useMongosh = (0, compare_versions_1.satisfies)(this.imageName.tag, ">=5.0.0");
+        const args = [];
+        if (useMongosh)
+            args.push("mongosh");
+        else
+            args.push("mongo", "admin");
+        if (this.username && this.password)
+            args.push("-u", this.username, "-p", this.password);
+        args.push("--quiet", "--eval", command);
+        return args.join(" ");
     }
 }
 exports.MongoDBContainer = MongoDBContainer;
 class StartedMongoDBContainer extends testcontainers_1.AbstractStartedContainer {
-    constructor(startedTestContainer) {
+    username;
+    password;
+    constructor(startedTestContainer, username, password) {
         super(startedTestContainer);
+        this.username = username;
+        this.password = password;
     }
     getConnectionString() {
+        if (this.username && this.password)
+            return `mongodb://${this.username}:${this.password}@${this.getHost()}:${this.getMappedPort(MONGODB_PORT)}?authSource=admin`;
         return `mongodb://${this.getHost()}:${this.getMappedPort(MONGODB_PORT)}`;
     }
 }

package/build/mongodb-container.js.map

@@ -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"}
+{"version":3,"file":"mongodb-container.js","sourceRoot":"","sources":["../src/mongodb-container.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testcontainers/mongodb",
-  "version": "11.3.2",
+  "version": "11.5.0",
   "license": "MIT",
   "keywords": [
     "mongodb",
@@ -32,6 +32,7 @@
     "mongoose": "^8.16.4"
   },
   "dependencies": {
-    "testcontainers": "^11.3.2"
+    "compare-versions": "^6.1.1",
+    "testcontainers": "^11.5.0"
   }
 }