testcontainers 9.5.0 → 9.7.0

package/dist/src/wait-strategy/shell-wait-strategy.js

@@ -14,6 +14,7 @@ const logger_1 = require("../logger");
 const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
 const exec_container_1 = require("../docker/functions/container/exec-container");
+const docker_client_1 = require("../docker/docker-client");
 class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     constructor(command) {
         super();
@@ -21,13 +22,15 @@ class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     }
     waitUntilReady(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.debug(`Waiting for successful shell command ${this.command} for ${container.id}`);
+            logger_1.log.debug(`Waiting for successful shell command "${this.command}"...`, { containerId: container.id });
+            const { dockerode, provider } = yield (0, docker_client_1.dockerClient)();
             yield new retry_strategy_1.IntervalRetryStrategy(100).retryUntil(() => __awaiter(this, void 0, void 0, function* () {
-                const { exitCode } = yield (0, exec_container_1.execContainer)(container, ["/bin/sh", "-c", this.command], false);
+                const { exitCode } = yield (0, exec_container_1.execContainer)(dockerode, provider, container, ["/bin/sh", "-c", this.command], false);
                 return exitCode;
             }), (exitCode) => exitCode === 0, () => {
-                const timeout = this.startupTimeout;
-                throw new Error(`Shell command not successful after ${timeout}ms for ${container.id}`);
+                const message = `Shell command "${this.command}" not successful after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                throw new Error(message);
             }, this.startupTimeout);
         });
     }

package/dist/src/wait-strategy/startup-check-strategy.js

@@ -13,11 +13,16 @@ exports.StartupCheckStrategy = void 0;
 const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
 const docker_client_1 = require("../docker/docker-client");
+const logger_1 = require("../logger");
 class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container) {
         return __awaiter(this, void 0, void 0, function* () {
             const { dockerode } = yield (0, docker_client_1.dockerClient)();
-            const startupStatus = yield new retry_strategy_1.IntervalRetryStrategy(1000).retryUntil(() => __awaiter(this, void 0, void 0, function* () { return yield this.checkStartupState(dockerode, container.id); }), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => new Error(`Container not accessible after ${this.startupTimeout}ms for ${container.id}`), this.startupTimeout);
+            const startupStatus = yield new retry_strategy_1.IntervalRetryStrategy(1000).retryUntil(() => __awaiter(this, void 0, void 0, function* () { return yield this.checkStartupState(dockerode, container.id); }), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
+                const message = `Container not accessible after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                return new Error(message);
+            }, this.startupTimeout);
             if (startupStatus instanceof Error) {
                 throw startupStatus;
             }

package/dist/src/wait-strategy/wait-strategy.d.ts

@@ -1,11 +1,16 @@
 import { BoundPorts } from "../bound-ports";
 import Dockerode from "dockerode";
 export interface WaitStrategy {
-    waitUntilReady(container: Dockerode.Container, host: string, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
+    waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
     withStartupTimeout(startupTimeout: number): WaitStrategy;
+    isStartupTimeoutSet(): boolean;
+    getStartupTimeout(): number;
 }
 export declare abstract class AbstractWaitStrategy implements WaitStrategy {
     protected startupTimeout: number;
-    abstract waitUntilReady(container: Dockerode.Container, host: string, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
-    withStartupTimeout(startupTimeout: number): WaitStrategy;
+    private startupTimeoutSet;
+    abstract waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
+    withStartupTimeout(startupTimeout: number): this;
+    isStartupTimeoutSet(): boolean;
+    getStartupTimeout(): number;
 }

package/dist/src/wait-strategy/wait-strategy.js

@@ -4,10 +4,18 @@ exports.AbstractWaitStrategy = void 0;
 class AbstractWaitStrategy {
     constructor() {
         this.startupTimeout = 60000;
+        this.startupTimeoutSet = false;
     }
     withStartupTimeout(startupTimeout) {
         this.startupTimeout = startupTimeout;
+        this.startupTimeoutSet = true;
         return this;
     }
+    isStartupTimeoutSet() {
+        return this.startupTimeoutSet;
+    }
+    getStartupTimeout() {
+        return this.startupTimeout;
+    }
 }
 exports.AbstractWaitStrategy = AbstractWaitStrategy;

package/dist/src/wait-strategy/wait.d.ts

@@ -2,7 +2,10 @@ import { WaitStrategy } from "./wait-strategy";
 import { HttpWaitStrategy } from "./http-wait-strategy";
 import { Log } from "./log-wait-strategy";
 import { ShellWaitStrategy } from "./shell-wait-strategy";
+import { CompositeWaitStrategy } from "./composite-wait-strategy";
 export declare class Wait {
+    static forAll(waitStrategies: WaitStrategy[]): CompositeWaitStrategy;
+    static forListeningPorts(): WaitStrategy;
     static forLogMessage(message: Log | RegExp, times?: number): WaitStrategy;
     static forHealthCheck(): WaitStrategy;
     static forHttp(path: string, port: number): HttpWaitStrategy;

package/dist/src/wait-strategy/wait.js

@@ -5,7 +5,15 @@ const http_wait_strategy_1 = require("./http-wait-strategy");
 const health_check_wait_strategy_1 = require("./health-check-wait-strategy");
 const log_wait_strategy_1 = require("./log-wait-strategy");
 const shell_wait_strategy_1 = require("./shell-wait-strategy");
+const host_port_wait_strategy_1 = require("./host-port-wait-strategy");
+const composite_wait_strategy_1 = require("./composite-wait-strategy");
 class Wait {
+    static forAll(waitStrategies) {
+        return new composite_wait_strategy_1.CompositeWaitStrategy(waitStrategies);
+    }
+    static forListeningPorts() {
+        return new host_port_wait_strategy_1.HostPortWaitStrategy();
+    }
     static forLogMessage(message, times = 1) {
         return new log_wait_strategy_1.LogWaitStrategy(message, times);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.5.0",
+  "version": "9.7.0",
   "main": "dist/src/index",
   "types": "dist/src/index",
   "keywords": [
@@ -27,8 +27,8 @@
     "build": "npm run clean && tsc -p tsconfig.prod.json",
     "docs:serve": "docker-compose up",
     "clean": "rimraf dist",
-    "test": "cross-env DEBUG=testcontainers,testcontainers:exec,testcontainers:containers jest",
-    "test:ci": "cross-env DEBUG=testcontainers,testcontainers:exec,testcontainers:containers jest --runInBand --coverage",
+    "test": "cross-env DEBUG=testcontainers* jest",
+    "test:ci": "npm run test -- --runInBand --coverage",
     "format": "prettier --write package.json \"src/**/*.ts\"",
     "lint": "eslint --fix package.json \"src/**/*.ts\"",
     "lint:ci": "eslint package.json \"src/**/*.ts\" --max-warnings=0",
@@ -56,31 +56,31 @@
     "@types/async-lock": "^1.4.0",
     "@types/byline": "^4.2.33",
     "@types/debug": "4.1.7",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.15.11",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^18.16.2",
     "@types/node-fetch": "^2.6.3",
     "@types/pg": "^8.6.6",
     "@types/properties-reader": "^2.1.1",
     "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "arangojs": "^8.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
+    "arangojs": "^8.2.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.37.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "kafkajs": "^2.2.4",
-    "lint-staged": "^13.2.0",
-    "mongoose": "^6.10.4",
+    "lint-staged": "^13.2.2",
+    "mongoose": "^6.10.5",
     "mysql2": "^2.3.3",
     "nats": "^2.13.1",
-    "neo4j-driver": "^5.6.0",
+    "neo4j-driver": "^5.7.0",
     "pg": "^8.10.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "wait-for-expect": "^3.0.2"

package/dist/src/docker/functions/image/list-images.d.ts

@@ -1,3 +0,0 @@
-import { DockerImageName } from "../../../docker-image-name";
-import Dockerode from "dockerode";
-export declare const listImages: (dockerode: Dockerode) => Promise<DockerImageName[]>;

package/dist/src/docker/functions/image/list-images.js

@@ -1,34 +0,0 @@
-"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.listImages = void 0;
-const docker_image_name_1 = require("../../../docker-image-name");
-const logger_1 = require("../../../logger");
-const listImages = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const images = yield dockerode.listImages();
-        return images.reduce((dockerImageNames, image) => {
-            var _a;
-            if (isDanglingImage(image)) {
-                return dockerImageNames;
-            }
-            const repoTags = (_a = image.RepoTags) !== null && _a !== void 0 ? _a : [];
-            const dockerImageNamesForImage = repoTags.map((imageRepoTag) => docker_image_name_1.DockerImageName.fromString(imageRepoTag));
-            return [...dockerImageNames, ...dockerImageNamesForImage];
-        }, []);
-    }
-    catch (err) {
-        logger_1.log.error(`Failed to list images: ${err}`);
-        throw err;
-    }
-});
-exports.listImages = listImages;
-const isDanglingImage = (image) => image.RepoTags === null;

package/dist/src/wait-strategy/default-wait-strategy.d.ts

@@ -1,3 +0,0 @@
-import Dockerode from "dockerode";
-import { HostPortWaitStrategy } from "./host-port-wait-strategy";
-export declare const defaultWaitStrategy: (host: string, container: Dockerode.Container) => HostPortWaitStrategy;

package/dist/src/wait-strategy/default-wait-strategy.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultWaitStrategy = void 0;
-const host_port_wait_strategy_1 = require("./host-port-wait-strategy");
-const port_check_1 = require("../port-check");
-const defaultWaitStrategy = (host, container) => new host_port_wait_strategy_1.HostPortWaitStrategy(new port_check_1.HostPortCheck(host), new port_check_1.InternalPortCheck(container));
-exports.defaultWaitStrategy = defaultWaitStrategy;