Skip to content

Commit 1d4808a

Browse files
committed
chore: additionalGlobalConfig
1 parent 517c17d commit 1d4808a

File tree

3 files changed

+38
-33
lines changed

3 files changed

+38
-33
lines changed

packages/modules/kafka/src/kafka-container-7.test.ts

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,18 @@ describe("KafkaContainer", { timeout: 240_000 }, () => {
8484
})
8585
.start();
8686

87-
await assertMessageProducedAndConsumed(container, {
88-
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
89-
sasl: {
90-
username: "app-user",
91-
password: "userPassword",
92-
mechanism: "scram-sha-512",
93-
},
94-
ssl: {
95-
ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
87+
await assertMessageProducedAndConsumed(container,
88+
{
89+
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
90+
ssl: true,
9691
},
97-
});
92+
{
93+
"sasl.username": "app-user",
94+
"sasl.password": "userPassword",
95+
"sasl.mechanism": "scram-sha-512",
96+
ssl_ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
97+
}
98+
);
9899
// }
99100
});
100101

@@ -121,17 +122,18 @@ describe("KafkaContainer", { timeout: 240_000 }, () => {
121122
})
122123
.start();
123124

124-
await assertMessageProducedAndConsumed(container, {
125-
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
126-
sasl: {
127-
username: "app-user",
128-
password: "userPassword",
129-
mechanism: "scram-sha-512",
130-
},
131-
ssl: {
132-
ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
125+
await assertMessageProducedAndConsumed(container,
126+
{
127+
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
128+
ssl: true,
133129
},
134-
});
130+
{
131+
"sasl.username": "app-user",
132+
"sasl.password": "userPassword",
133+
"sasl.mechanism": "scram-sha-512",
134+
ssl_ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
135+
}
136+
);
135137
});
136138

137139
it(`should connect within Docker network`, async () => {

packages/modules/kafka/src/kafka-container-latest.test.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,18 @@ describe("KafkaContainer", { timeout: 240_000 }, () => {
5555

5656
await using container = await new KafkaContainer(IMAGE).withSaslSslListener(saslConfig).start();
5757

58-
await assertMessageProducedAndConsumed(container, {
59-
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
60-
sasl: {
61-
username: "app-user",
62-
password: "userPassword",
63-
mechanism: "scram-sha-512",
64-
},
65-
ssl: {
66-
ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
58+
await assertMessageProducedAndConsumed(container,
59+
{
60+
brokers: [`${container.getHost()}:${container.getMappedPort(9096)}`],
61+
ssl: true,
6762
},
68-
});
63+
{
64+
"sasl.username": "app-user",
65+
"sasl.password": "userPassword",
66+
"sasl.mechanism": "scram-sha-512",
67+
ssl_ca: [fs.readFileSync(path.resolve(certificatesDir, "kafka.client.truststore.pem"))],
68+
}
69+
);
6970
// }
7071
});
7172

packages/modules/kafka/src/test-helper.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
import { KafkaJS } from "@confluentinc/kafka-javascript";
1+
import { GlobalConfig, KafkaJS } from "@confluentinc/kafka-javascript";
22
import { StartedKafkaContainer } from "./kafka-container";
33

44
// kafkaTestHelper {
55
export async function assertMessageProducedAndConsumed(
66
container: StartedKafkaContainer,
7-
additionalConfig: Partial<KafkaJS.KafkaConfig> = {}
7+
additionalKafkaConfig: Partial<KafkaJS.KafkaConfig> = {},
8+
additionalGlobalConfig: Partial<GlobalConfig> = {}
89
) {
910
const brokers = [`${container.getHost()}:${container.getMappedPort(9093)}`];
1011
const kafka = new KafkaJS.Kafka({
1112
kafkaJS: {
1213
logLevel: KafkaJS.logLevel.NOTHING,
1314
brokers: brokers,
14-
...additionalConfig,
15+
...additionalKafkaConfig,
1516
},
17+
...additionalGlobalConfig,
1618
});
1719

1820
const producer = kafka.producer();

0 commit comments

Comments
 (0)