Merge pull request #1425 from mapped/logs_auth

Use general Redis auth when also using the general Redis host
balena-io · Sep 20, 2023 · ab97d17 · ab97d17
2 parents 3fb309f + 9d8252d
commit ab97d17
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -170,11 +170,13 @@ function redisOpts(prefix: string): RedisOpts;
 function redisOpts(
 	prefix: string,
 	defaultHosts: HostPort[],
+	defaultAuth: RedisAuth,
 	defaultIsCluster: boolean,
 ): RedisOpts;
 function redisOpts(
 	prefix: string,
 	defaultHosts?: HostPort[],
+	defaultAuth?: RedisAuth,
 	defaultIsCluster?: boolean,
 ): RedisOpts {
 	const hostVarName = `${prefix}_HOST`;
@@ -183,7 +185,7 @@ function redisOpts(
 	const roAuthVarName = `${prefix}_RO_AUTH`;
 	const isCluster = boolVar(`${prefix}_IS_CLUSTER`, defaultIsCluster);
 	const hosts = hostPortsVar(hostVarName, defaultHosts);
-	const auth = redisAuthVar(authVarName);
+	const auth = redisAuthVar(authVarName, defaultAuth);
 	if (isCluster == null) {
 		throw new Error(`Missing env: '${prefix}_IS_CLUSTER'`);
 	}
@@ -229,7 +231,12 @@ if (generalRedis.isCluster) {
 
 export const REDIS = {
 	general: generalRedis,
-	logs: redisOpts('REDIS_LOGS', [generalRedis.host], generalRedis.isCluster),
+	logs: redisOpts(
+		'REDIS_LOGS',
+		[generalRedis.host],
+		generalRedis.auth,
+		generalRedis.isCluster,
+	),
 };
 export const REDIS_LOGS_SHARDED_PUBSUB = boolVar(
 	'REDIS_LOGS_SHARDED_PUBSUB',