testcontainers 8.10.0-beta.0 → 8.11.0

package/README.md

@@ -41,6 +41,7 @@ The following environment variables are supported:
 - `TESTCONTAINERS_RYUK_PRIVILEGED=true` Run [ryuk](#ryuk) as a privileged container
 - `TESTCONTAINERS_RYUK_DISABLED=true` Disable [ryuk](#ryuk)
 - `TESTCONTAINERS_RYUK_PORT=65515` Explicitly set [ryuk](#ryuk) host port (not recommended)
+- `TESTCONTAINERS_SSHD_PORT=65515` Explicitly set [SSHd](#SSHd) host port (not recommended)
 - `RYUK_CONTAINER_IMAGE=registry.mycompany.com/mirror/ryuk:0.3.0` Custom image for [ryuk](#ryuk)
 - `SSHD_CONTAINER_IMAGE=registry.mycompany.com/mirror/sshd:1.0.0` Custom image for [SSHd](#SSHd)
 

package/dist/dockerfile-parser.js

@@ -20,8 +20,8 @@ const getDockerfileImages = (dockerfile) => __awaiter(void 0, void 0, void 0, fu
             .split(os_1.EOL)
             .filter((line) => line.toUpperCase().startsWith("FROM"))
             .map((line) => {
-            const parts = line.split(" ");
-            return parts[parts.length - 1];
+            const parts = line.split(" ").filter((part) => part !== "");
+            return parts[1];
         })
             .reduce((prev, next) => prev.add(next), new Set())
             .values()).map((image) => docker_image_name_1.DockerImageName.fromString(image));

package/dist/index.d.ts

@@ -15,3 +15,4 @@ export { Neo4jContainer, StartedNeo4jContainer } from "./modules/neo4j/neo4j-con
 export { ArangoDBContainer, StartedArangoContainer } from "./modules/arangodb/arangodb-container";
 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";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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");
@@ -42,3 +42,6 @@ Object.defineProperty(exports, "StartedElasticsearchContainer", { enumerable: tr
 var mysql_container_1 = require("./modules/mysql/mysql-container");
 Object.defineProperty(exports, "MySqlContainer", { enumerable: true, get: function () { return mysql_container_1.MySqlContainer; } });
 Object.defineProperty(exports, "StartedMySqlContainer", { enumerable: true, get: function () { return mysql_container_1.StartedMySqlContainer; } });
+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; } });

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

@@ -0,0 +1,55 @@
+import { GenericContainer } from "../../generic-container/generic-container";
+import { StartedTestContainer } from "../../test-container";
+import { AbstractStartedContainer } from "../abstract-started-container";
+export declare class NatsContainer extends GenericContainer {
+    private args;
+    constructor(image?: string);
+    withUser(user: string): this;
+    withPass(pass: string): this;
+    withArg(name: string, value: string): this;
+    private static ensureDashInFrontOfArgumentName;
+    start(): Promise<StartedNatsContainer>;
+    private getUser;
+    private getPass;
+}
+export declare class StartedNatsContainer extends AbstractStartedContainer {
+    readonly username: string;
+    readonly password: string;
+    private readonly connectionOptions;
+    constructor(startedTestContainer: StartedTestContainer, username: string, password: string);
+    getConnectionOptions(): NatsConnectionOptions;
+}
+export interface NatsConnectionOptions {
+    debug?: boolean;
+    maxPingOut?: number;
+    maxReconnectAttempts?: number;
+    name?: string;
+    noEcho?: boolean;
+    noRandomize?: boolean;
+    pass?: string;
+    pedantic?: boolean;
+    pingInterval?: number;
+    port?: number;
+    reconnect?: boolean;
+    reconnectDelayHandler?: () => number;
+    reconnectJitter?: number;
+    reconnectJitterTLS?: number;
+    reconnectTimeWait?: number;
+    servers?: Array<string> | string;
+    timeout?: number;
+    tls?: NatsTlsOptions;
+    token?: string;
+    user?: string;
+    verbose?: boolean;
+    waitOnFirstConnect?: boolean;
+    ignoreClusterUpdates?: boolean;
+    inboxPrefix?: string;
+}
+export interface NatsTlsOptions {
+    certFile?: string;
+    cert?: string;
+    caFile?: string;
+    ca?: string;
+    keyFile?: string;
+    key?: string;
+}

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

@@ -0,0 +1,98 @@
+"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.StartedNatsContainer = exports.NatsContainer = void 0;
+const generic_container_1 = require("../../generic-container/generic-container");
+const uuid_1 = require("../../uuid");
+const abstract_started_container_1 = require("../abstract-started-container");
+const wait_1 = require("../../wait");
+const CLIENT_PORT = 4222;
+const ROUTING_PORT_FOR_CLUSTERING = 6222;
+const HTTP_MANAGEMENT_PORT = 8222;
+const USER_ARGUMENT_KEY = "--user";
+const PASS_ARGUMENT_KEY = "--pass";
+class NatsContainer extends generic_container_1.GenericContainer {
+    constructor(image = "nats:2.8-alpine") {
+        super(image);
+        this.args = {};
+        this.args[USER_ARGUMENT_KEY] = new uuid_1.RandomUuid().nextUuid();
+        this.args[PASS_ARGUMENT_KEY] = new uuid_1.RandomUuid().nextUuid();
+    }
+    withUser(user) {
+        this.args[USER_ARGUMENT_KEY] = user;
+        return this;
+    }
+    withPass(pass) {
+        this.args[PASS_ARGUMENT_KEY] = pass;
+        return this;
+    }
+    withArg(name, value) {
+        name = NatsContainer.ensureDashInFrontOfArgumentName(name);
+        this.args[name] = value;
+        return this;
+    }
+    static ensureDashInFrontOfArgumentName(name) {
+        if (name.startsWith("--") || name.startsWith("-")) {
+            return name;
+        }
+        if (name.length == 1) {
+            return "-" + name;
+        }
+        else {
+            return "--" + name;
+        }
+    }
+    start() {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            function buildCmdsFromArgs(args) {
+                const result = [];
+                result.push("nats-server");
+                for (const argsKey in args) {
+                    result.push(argsKey);
+                    result.push(args[argsKey]);
+                }
+                return result;
+            }
+            this.withCmd(buildCmdsFromArgs(this.args))
+                .withExposedPorts(...(this.hasExposedPorts ? this.ports : [CLIENT_PORT, ROUTING_PORT_FOR_CLUSTERING, HTTP_MANAGEMENT_PORT]))
+                .withWaitStrategy(wait_1.Wait.forLogMessage(new RegExp(".*Server is ready.*")))
+                .withStartupTimeout(120000);
+            return new StartedNatsContainer(yield _super.start.call(this), this.getUser(), this.getPass());
+        });
+    }
+    getUser() {
+        return this.args[USER_ARGUMENT_KEY];
+    }
+    getPass() {
+        return this.args[PASS_ARGUMENT_KEY];
+    }
+}
+exports.NatsContainer = NatsContainer;
+class StartedNatsContainer extends abstract_started_container_1.AbstractStartedContainer {
+    constructor(startedTestContainer, username, password) {
+        super(startedTestContainer);
+        this.username = username;
+        this.password = password;
+        const port = startedTestContainer.getMappedPort(CLIENT_PORT);
+        this.connectionOptions = {
+            servers: `${this.startedTestContainer.getHost()}:${port}`,
+            user: this.username,
+            pass: this.password,
+        };
+    }
+    getConnectionOptions() {
+        return this.connectionOptions;
+    }
+}
+exports.StartedNatsContainer = StartedNatsContainer;

package/dist/port-forwarder.js

@@ -56,9 +56,12 @@ class PortForwarderInstance {
             logger_1.log.debug(`Creating new Port Forwarder`);
             const username = "root";
             const password = new uuid_1.RandomUuid().nextUuid();
+            const containerPort = process.env["TESTCONTAINERS_SSHD_PORT"]
+                ? { container: 22, host: Number(process.env["TESTCONTAINERS_SSHD_PORT"]) }
+                : 22;
             const container = yield new generic_container_1.GenericContainer(images_1.SSHD_IMAGE)
                 .withName(`testcontainers-port-forwarder-${session_id_1.sessionId}`)
-                .withExposedPorts(22)
+                .withExposedPorts(containerPort)
                 .withEnv("PASSWORD", password)
                 .withCmd([
                 "sh",

package/dist/reaper.js

@@ -81,13 +81,13 @@ class ReaperInstance {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const dockerSocket = (_a = process.env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"]) !== null && _a !== void 0 ? _a : "/var/run/docker.sock";
-            const reaperPort = process.env["TESTCONTAINERS_RYUK_PORT"]
+            const containerPort = process.env["TESTCONTAINERS_RYUK_PORT"]
                 ? { container: 8080, host: Number(process.env["TESTCONTAINERS_RYUK_PORT"]) }
                 : 8080;
             logger_1.log.debug(`Creating new Reaper for session: ${session_id_1.sessionId}`);
             const container = new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
                 .withName(`testcontainers-ryuk-${session_id_1.sessionId}`)
-                .withExposedPorts(reaperPort)
+                .withExposedPorts(containerPort)
                 .withBindMount(dockerSocket, "/var/run/docker.sock")
                 .withWaitStrategy(wait_1.Wait.forLogMessage(/.+ Started!/));
             if (this.isPrivileged()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.10.0-beta.0",
+  "version": "8.11.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -74,7 +74,8 @@
     "ts-jest": "^27.1.4",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.3",
-    "wait-for-expect": "^3.0.2"
+    "wait-for-expect": "^3.0.2",
+    "nats": "^2.7.1"
   },
   "lint-staged": {
     "src/**/*.ts": [