@testcontainers/kafka 11.13.0 → 12.0.0

package/build/kafka-container.d.ts

@@ -23,7 +23,7 @@ export declare class KafkaContainer extends GenericContainer {
     private zooKeeperHost?;
     private zooKeeperPort?;
     private saslSslConfig?;
-    private originalWaitinStrategy;
+    private originalWaitStrategy;
     constructor(image: string);
     withZooKeeper(host: string, port: number): this;
     withKraft(): this;

package/build/kafka-container.js

@@ -8,7 +8,7 @@ const KAFKA_BROKER_PORT = 9092;
 const KAFKA_CONTROLLER_PORT = 9094;
 const DEFAULT_ZOOKEEPER_PORT = 2181;
 const DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
-const STARTER_SCRIPT = "/testcontainers_start.sh";
+const STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 const WAIT_FOR_SCRIPT_MESSAGE = "Waiting for script...";
 // https://docs.confluent.io/platform/7.0.0/release-notes/index.html#ak-raft-kraft
 const MIN_KRAFT_VERSION = "7.0.0";
@@ -25,7 +25,7 @@ class KafkaContainer extends testcontainers_1.GenericContainer {
     zooKeeperHost;
     zooKeeperPort;
     saslSslConfig;
-    originalWaitinStrategy;
+    originalWaitStrategy;
     constructor(image) {
         super(image);
         if ((0, compare_versions_1.satisfies)(this.imageName.tag, ">=8.0.0")) {
@@ -42,7 +42,7 @@ class KafkaContainer extends testcontainers_1.GenericContainer {
             KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: "0",
             KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE: "false",
         });
-        this.originalWaitinStrategy = this.waitStrategy;
+        this.originalWaitStrategy = this.waitStrategy;
     }
     withZooKeeper(host, port) {
         this.mode = KafkaMode.PROVIDED_ZOOKEEPER;
@@ -93,7 +93,7 @@ class KafkaContainer extends testcontainers_1.GenericContainer {
         }
         // Change the wait strategy to wait for a log message from a fake starter script
         // so that we can put a real starter script in place at that moment
-        this.originalWaitinStrategy = this.waitStrategy;
+        this.originalWaitStrategy = this.waitStrategy;
         this.waitStrategy = testcontainers_1.Wait.forLogMessage(WAIT_FOR_SCRIPT_MESSAGE);
         this.withEntrypoint(["sh"]);
         this.withCommand([
@@ -134,8 +134,13 @@ class KafkaContainer extends testcontainers_1.GenericContainer {
         await container.copyContentToContainer([{ content: command, target: STARTER_SCRIPT, mode: 0o777 }]);
         const client = await (0, testcontainers_1.getContainerRuntimeClient)();
         const dockerContainer = client.container.getById(container.getId());
+        const dockerInspectResult = await client.container.inspect(dockerContainer);
         const boundPorts = testcontainers_1.BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, inspectResult).filter(this.exposedPorts);
-        await (0, testcontainers_1.waitForContainer)(client, dockerContainer, this.originalWaitinStrategy, boundPorts);
+        const waitStrategy = await this.selectWaitStrategy(client, dockerInspectResult, this.originalWaitStrategy);
+        if (this.startupTimeoutMs !== undefined) {
+            waitStrategy.withStartupTimeout(this.startupTimeoutMs);
+        }
+        await (0, testcontainers_1.waitForContainer)(client, dockerContainer, waitStrategy, boundPorts);
         if (this.saslSslConfig && this.mode !== KafkaMode.KRAFT) {
             await this.createUser(container, this.saslSslConfig.sasl);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testcontainers/kafka",
-  "version": "11.13.0",
+  "version": "12.0.0",
   "license": "MIT",
   "keywords": [
     "kafka",
@@ -29,10 +29,10 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@confluentinc/kafka-javascript": "^1.8.2"
+    "@confluentinc/kafka-javascript": "^1.9.0"
   },
   "dependencies": {
     "compare-versions": "^6.1.1",
-    "testcontainers": "^11.13.0"
+    "testcontainers": "^12.0.0"
   }
 }