testcontainers 8.12.0 → 8.13.1-beta.1

package/README.md

@@ -169,7 +169,8 @@ const { GenericContainer } = require("testcontainers");
 
 const container = await new GenericContainer("alpine")
   .start();
-const restartedContainer = await container.restart();
+  
+await container.restart();
 ```
 
 Creating a container with a specified name:

package/dist/docker/docker-client.js

@@ -32,15 +32,14 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
             logger_1.log.debug(`Found applicable Docker client strategy: ${strategy.getName()}`);
             const { uri, dockerode } = yield strategy.initialise();
             logger_1.log.debug(`Testing Docker client strategy URI: ${uri}`);
-            if (yield isDockerDaemonReachable(dockerode)) {
-                const host = yield resolveHost(dockerode, uri);
-                logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
-                (0, log_system_diagnostics_1.logSystemDiagnostics)();
-                return { host, dockerode };
-            }
-            else {
-                logger_1.log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
-            }
+            // if (await isDockerDaemonReachable(dockerode)) {
+            const host = yield resolveHost(dockerode, uri);
+            logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
+            (0, log_system_diagnostics_1.logSystemDiagnostics)();
+            return { host, dockerode };
+            // } else {
+            //   log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
+            // }
         }
     }
     throw new Error("No Docker client strategy found");
@@ -148,10 +147,14 @@ const resolveHost = (dockerode, uri) => __awaiter(void 0, void 0, void 0, functi
 });
 const findGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
+    logger_1.log.debug(`Checking gateway for Docker host`);
     const inspectResult = yield dockerode.getNetwork("bridge").inspect();
     return (_c = (_b = (_a = inspectResult === null || inspectResult === void 0 ? void 0 : inspectResult.IPAM) === null || _a === void 0 ? void 0 : _a.Config) === null || _b === void 0 ? void 0 : _b.find((config) => config.Gateway !== undefined)) === null || _c === void 0 ? void 0 : _c.Gateway;
 });
-const findDefaultGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return (0, run_in_container_1.runInContainer)(dockerode, "alpine:3.14", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); });
+const findDefaultGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.log.debug(`Checking default gateway for Docker host`);
+    return (0, run_in_container_1.runInContainer)(dockerode, "alpine:3.14", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]);
+});
 const isInContainer = () => (0, fs_1.existsSync)("/.dockerenv");
 let _dockerClient;
 const dockerClient = () => {

package/dist/generic-container/generic-container.js

@@ -145,7 +145,7 @@ class GenericContainer {
                 });
             }
             if (this.tarToCopy) {
-                yield this.tarToCopy.finalize();
+                this.tarToCopy.finalize();
                 yield (0, put_container_archive_1.putContainerArchive)({ container, stream: this.tarToCopy, containerPath: "/" });
             }
             logger_1.log.info(`Starting container ${this.imageName} with ID: ${container.id}`);

package/dist/index.d.ts

@@ -16,3 +16,4 @@ export { ArangoDBContainer, StartedArangoContainer } from "./modules/arangodb/ar
 export { ElasticsearchContainer, StartedElasticsearchContainer } from "./modules/elasticsearch/elasticsearch-container";
 export { MySqlContainer, StartedMySqlContainer } from "./modules/mysql/mysql-container";
 export { NatsContainer, StartedNatsContainer, NatsConnectionOptions, NatsTlsOptions, } from "./modules/nats/nats-container";
+export { MongoDBContainer, StartedMongoDBContainer } from "./modules/mongodb/mongodb-container";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartedNatsContainer = exports.NatsContainer = exports.StartedMySqlContainer = exports.MySqlContainer = exports.StartedElasticsearchContainer = exports.ElasticsearchContainer = exports.StartedArangoContainer = exports.ArangoDBContainer = exports.StartedNeo4jContainer = exports.Neo4jContainer = exports.StartedKafkaContainer = exports.KafkaContainer = exports.StartedPostgreSqlContainer = exports.PostgreSqlContainer = exports.AlwaysPullPolicy = exports.DefaultPullPolicy = exports.Wait = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.DownedDockerComposeEnvironment = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.TestContainers = exports.GenericContainerBuilder = exports.GenericContainer = void 0;
+exports.StartedMongoDBContainer = exports.MongoDBContainer = exports.StartedNatsContainer = exports.NatsContainer = exports.StartedMySqlContainer = exports.MySqlContainer = exports.StartedElasticsearchContainer = exports.ElasticsearchContainer = exports.StartedArangoContainer = exports.ArangoDBContainer = exports.StartedNeo4jContainer = exports.Neo4jContainer = exports.StartedKafkaContainer = exports.KafkaContainer = exports.StartedPostgreSqlContainer = exports.PostgreSqlContainer = exports.AlwaysPullPolicy = exports.DefaultPullPolicy = exports.Wait = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.DownedDockerComposeEnvironment = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.TestContainers = exports.GenericContainerBuilder = exports.GenericContainer = void 0;
 var generic_container_1 = require("./generic-container/generic-container");
 Object.defineProperty(exports, "GenericContainer", { enumerable: true, get: function () { return generic_container_1.GenericContainer; } });
 var generic_container_builder_1 = require("./generic-container/generic-container-builder");
@@ -45,3 +45,6 @@ Object.defineProperty(exports, "StartedMySqlContainer", { enumerable: true, get:
 var nats_container_1 = require("./modules/nats/nats-container");
 Object.defineProperty(exports, "NatsContainer", { enumerable: true, get: function () { return nats_container_1.NatsContainer; } });
 Object.defineProperty(exports, "StartedNatsContainer", { enumerable: true, get: function () { return nats_container_1.StartedNatsContainer; } });
+var mongodb_container_1 = require("./modules/mongodb/mongodb-container");
+Object.defineProperty(exports, "MongoDBContainer", { enumerable: true, get: function () { return mongodb_container_1.MongoDBContainer; } });
+Object.defineProperty(exports, "StartedMongoDBContainer", { enumerable: true, get: function () { return mongodb_container_1.StartedMongoDBContainer; } });

package/dist/log-system-diagnostics.js

@@ -14,6 +14,7 @@ const logger_1 = require("./logger");
 const docker_compose_1 = require("./docker-compose/docker-compose");
 const get_info_1 = require("./docker/functions/get-info");
 const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.log.debug("Fetching system diagnostics");
     const info = {
         node: getNodeInfo(),
         docker: yield (0, get_info_1.getDockerInfo)(),

package/dist/modules/mongodb/mongodb-container.d.ts

@@ -0,0 +1,19 @@
+import { GenericContainer } from "../../generic-container/generic-container";
+import { AbstractStartedContainer } from "../abstract-started-container";
+import { StartedTestContainer } from "../../test-container";
+export declare class MongoDBContainer extends GenericContainer {
+    private readonly dockerImageName;
+    constructor(image?: string);
+    start(): Promise<StartedMongoDBContainer>;
+    protected postStart(startedTestContainer: StartedTestContainer): Promise<void>;
+    private initReplicaSet;
+    private executeMongoEvalCommand;
+    private buildMongoEvalCommand;
+    private getMongoCmdBasedOnImageTag;
+    private checkMongoNodeExitCode;
+    private buildMongoWaitCommand;
+}
+export declare class StartedMongoDBContainer extends AbstractStartedContainer {
+    constructor(startedTestContainer: StartedTestContainer);
+    getConnectionString(): string;
+}

package/dist/modules/mongodb/mongodb-container.js

@@ -0,0 +1,85 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StartedMongoDBContainer = exports.MongoDBContainer = void 0;
+const generic_container_1 = require("../../generic-container/generic-container");
+const abstract_started_container_1 = require("../abstract-started-container");
+const wait_1 = require("../../wait");
+const docker_image_name_1 = require("../../docker-image-name");
+const MONGODB_PORT = 27017;
+class MongoDBContainer extends generic_container_1.GenericContainer {
+    constructor(image = "mongo:4.0.1") {
+        super(image);
+        this.dockerImageName = docker_image_name_1.DockerImageName.fromString(this.image);
+    }
+    start() {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            this.withExposedPorts(MONGODB_PORT)
+                .withCmd(["--replSet", "rs0"])
+                .withWaitStrategy(wait_1.Wait.forLogMessage(new RegExp(".*waiting for connections.*", "i")))
+                .withStartupTimeout(120000);
+            return new StartedMongoDBContainer(yield _super.start.call(this));
+        });
+    }
+    postStart(startedTestContainer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initReplicaSet(startedTestContainer);
+        });
+    }
+    initReplicaSet(startedTestContainer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.executeMongoEvalCommand(startedTestContainer, "rs.initiate();");
+            yield this.executeMongoEvalCommand(startedTestContainer, this.buildMongoWaitCommand());
+        });
+    }
+    executeMongoEvalCommand(startedTestContainer, command) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const execResult = yield startedTestContainer.exec(this.buildMongoEvalCommand(command));
+            this.checkMongoNodeExitCode(execResult);
+        });
+    }
+    buildMongoEvalCommand(command) {
+        return [this.getMongoCmdBasedOnImageTag(), "--eval", command];
+    }
+    getMongoCmdBasedOnImageTag() {
+        return parseInt(this.dockerImageName.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}`);
+        }
+    }
+    buildMongoWaitCommand() {
+        return `
+    var attempt = 0;
+    while(db.runCommand({isMaster: 1}).ismaster==false) {
+      if (attempt > 60) {
+        quit(1);
+      }
+      print(attempt); sleep(100); attempt++; 
+    }
+    `;
+    }
+}
+exports.MongoDBContainer = MongoDBContainer;
+class StartedMongoDBContainer extends abstract_started_container_1.AbstractStartedContainer {
+    constructor(startedTestContainer) {
+        super(startedTestContainer);
+    }
+    getConnectionString() {
+        return `mongodb://${this.getHost()}:${this.getMappedPort(MONGODB_PORT)}`;
+    }
+}
+exports.StartedMongoDBContainer = StartedMongoDBContainer;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.12.0",
+  "version": "8.13.1-beta.1",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -66,6 +66,8 @@
     "kafkajs": "^1.16.0",
     "lint-staged": "^12.3.8",
     "mysql2": "^2.3.3",
+    "mongoose": "^5.13.15",
+    "nats": "^2.7.1",
     "neo4j-driver": "^4.4.5",
     "node-fetch": "^2.6.7",
     "pg": "^8.7.3",
@@ -74,8 +76,7 @@
     "ts-jest": "^27.1.4",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.3",
-    "wait-for-expect": "^3.0.2",
-    "nats": "^2.7.1"
+    "wait-for-expect": "^3.0.2"
   },
   "lint-staged": {
     "src/**/*.ts": [