Skip to content

Commit 2d27333

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 85a348c + 2ab30d2 commit 2d27333

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

scripts/check-env.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,5 @@ if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) {
2323
}
2424

2525
if (process.env.CLOUD_MODE) {
26-
checkMissing([
27-
'CLOUD_URL',
28-
'KAFKA_BROKER',
29-
'KAFKA_URL',
30-
'REDIS_URL',
31-
'KAFKA_SASL_MECHANISM',
32-
'KAFKA_SSL',
33-
]);
26+
checkMissing(['CLOUD_URL', 'KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL', 'KAFKA_SASL_MECHANISM']);
3427
}

src/lib/kafka.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ const enabled = Boolean(process.env.KAFKA_URL && process.env.KAFKA_BROKER);
1212
function getClient() {
1313
const { username, password } = new URL(process.env.KAFKA_URL);
1414
const brokers = process.env.KAFKA_BROKER.split(',');
15-
const sslEnabled = process.env.KAFKA_SSL.toLowerCase() === 'true';
1615
const mechanism = process.env.KAFKA_SASL_MECHANISM as 'plain' | 'scram-sha-256' | 'scram-sha-512';
1716

1817
const ssl: { ssl?: tls.ConnectionOptions | boolean; sasl?: SASLOptions } =
1918
username && password
2019
? {
21-
ssl: sslEnabled,
20+
ssl: {
21+
rejectUnauthorized: false,
22+
},
2223
sasl: {
2324
mechanism,
2425
username,

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7962,9 +7962,9 @@ nanoclone@^0.2.1:
79627962
integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
79637963

79647964
nanoid@^3.3.6, nanoid@^3.3.7:
7965-
version "3.3.7"
7966-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
7967-
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
7965+
version "3.3.8"
7966+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
7967+
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
79687968

79697969
natural-compare@^1.4.0:
79707970
version "1.4.0"

0 commit comments

Comments
 (0)