fix(kafka): support ZooKeeper broker discovery

This commit is contained in:
miracle authored and GitHub committed 2026-07-23 00:20:47 +08:00
1 parent 34448cba9d
commit 8adf802444
18 files changed
+977 -77

No files matched your search

@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
import { normalizeKafkaBootstrapServers } from "@/lib/connection/kafkaBootstrapServers";
import { normalizeKafkaBootstrapServers, parseKafkaBootstrapServers, resolveKafkaSecurityProtocol } from "@/lib/connection/kafkaBootstrapServers";
describe("Kafka bootstrap servers", () => {
it("keeps comma-separated bootstrap servers", () => {
@@ -14,11 +14,34 @@ describe("Kafka bootstrap servers", () => {
expect(normalizeKafkaBootstrapServers("[::1]:9092;[2001:db8::1]:9092")).toBe("[::1]:9092,[2001:db8::1]:9092");
});
it("rejects bootstrap servers with URL schemes", () => {
expect(() => normalizeKafkaBootstrapServers("PLAINTEXT://broker1:9092,broker2:9092")).toThrow("Kafka bootstrap servers must be host:port values without a URL scheme");
it("normalizes Kafka listener URIs and exposes the inferred security protocol", () => {
expect(parseKafkaBootstrapServers("PLAINTEXT://broker1:9092, broker2:9092")).toEqual({
bootstrapServers: "broker1:9092,broker2:9092",
inferredSecurityProtocol: "PLAINTEXT",
});
expect(parseKafkaBootstrapServers("SASL_SSL://secure-broker:9093")).toEqual({
bootstrapServers: "secure-broker:9093",
inferredSecurityProtocol: "SASL_SSL",
});
});
it("rejects bootstrap servers that declare conflicting security protocols", () => {
expect(() => normalizeKafkaBootstrapServers("SSL://broker1:9093,PLAINTEXT://broker2:9092")).toThrow("Kafka bootstrap servers must use one security protocol");
});
it("rejects unknown listener URI schemes", () => {
expect(() => normalizeKafkaBootstrapServers("INTERNAL://broker1:9092")).toThrow("Kafka bootstrap server protocol is invalid");
});
it("uses an inferred protocol only when security remains automatic", () => {
expect(resolveKafkaSecurityProtocol("", "SASL_SSL")).toBe("SASL_SSL");
expect(resolveKafkaSecurityProtocol("SSL", "SASL_SSL")).toBe("SSL");
expect(resolveKafkaSecurityProtocol("", undefined)).toBe("");
});
it("rejects invalid bootstrap server values", () => {
expect(() => normalizeKafkaBootstrapServers("broker1:9092/path,broker2:9092")).toThrow("Kafka bootstrap servers are invalid");
expect(() => normalizeKafkaBootstrapServers("broker1")).toThrow("Kafka bootstrap servers must be host:port values");
expect(() => normalizeKafkaBootstrapServers("broker1:70000")).toThrow("Kafka bootstrap servers are invalid");
});
});
@@ -0,0 +1,76 @@
import { describe, expect, it } from "vitest";
import { buildMqKafkaConnectionExtra, mqKafkaConnectionTarget, normalizeMqKafkaZooKeeperServers, resolveMqKafkaConnectionSource } from "@/lib/connection/mqKafkaConnection";
describe("MQ Kafka connection", () => {
it("keeps existing configurations on the Bootstrap source", () => {
expect(resolveMqKafkaConnectionSource({ bootstrapServers: "broker-1:9092" })).toBe("bootstrap");
expect(resolveMqKafkaConnectionSource({})).toBe("bootstrap");
});
it("recognizes explicit and legacy ZooKeeper discovery configurations", () => {
expect(resolveMqKafkaConnectionSource({ connectionSource: "zookeeper", zookeeperServers: "zk-1:2181" })).toBe("zookeeper");
expect(resolveMqKafkaConnectionSource({ zookeeperServers: "zk-legacy:2181" })).toBe("zookeeper");
});
it("builds Bootstrap extra fields from listener URIs without persisting the scheme", () => {
expect(
buildMqKafkaConnectionExtra({
connectionSource: "bootstrap",
bootstrapServers: "SASL_SSL://broker-1:9093, broker-2:9093",
zookeeperServers: "ignored:2181",
securityProtocol: "",
}),
).toEqual({ bootstrapServers: "broker-1:9093,broker-2:9093", securityProtocol: "SASL_SSL" });
});
it("keeps an explicit security protocol ahead of the listener URI hint", () => {
expect(
buildMqKafkaConnectionExtra({
connectionSource: "bootstrap",
bootstrapServers: "PLAINTEXT://broker-1:9092",
zookeeperServers: "",
securityProtocol: "SSL",
}),
).toEqual({ bootstrapServers: "broker-1:9092", securityProtocol: "SSL" });
});
it("builds ZooKeeper discovery fields without a fake Bootstrap address", () => {
expect(
buildMqKafkaConnectionExtra({
connectionSource: "zookeeper",
bootstrapServers: "ignored:9092",
zookeeperServers: "zookeeper://zk-1:2181; zk-2:2181/kafka",
securityProtocol: "PLAINTEXT",
}),
).toEqual({
connectionSource: "zookeeper",
zookeeperServers: "zk-1:2181,zk-2:2181/kafka",
securityProtocol: "PLAINTEXT",
});
});
it("rejects malformed ZooKeeper discovery addresses", () => {
expect(() => normalizeMqKafkaZooKeeperServers("zk-1:not-a-port/kafka")).toThrow("Kafka ZooKeeper servers are invalid");
expect(() => normalizeMqKafkaZooKeeperServers("zk-1:70000/kafka")).toThrow("Kafka ZooKeeper servers are invalid");
});
it("maps the active source to the generic connection target", () => {
expect(
mqKafkaConnectionTarget({
connectionSource: "bootstrap",
bootstrapServers: "SSL://broker-1:9093,broker-2:9093",
zookeeperServers: "",
securityProtocol: "",
}),
).toEqual({ host: "broker-1", port: 9093, ssl: true });
expect(
mqKafkaConnectionTarget({
connectionSource: "zookeeper",
bootstrapServers: "",
zookeeperServers: "zk-1:2281,zk-2:2181/kafka",
securityProtocol: "SASL_SSL",
}),
).toEqual({ host: "zk-1", port: 2281, ssl: false });
});
});