Skip to content

[RedisJedisClusterService] Add support for a 'user' field #3584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sw-square wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −7
Open

[RedisJedisClusterService] Add support for a 'user' field #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d6c15
[RedisJedisClusterService] Add support for a 'user' field
sw-square Dec 5, 2025
b8a4aba
Merge branch 'master' into swesterman.2025-12-04.add-support-for-user…
adrw Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions misk-redis/api/misk-redis.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,24 +418,26 @@ public final class misk/redis/RedisClusterModule : misk/inject/KAbstractModule {
}

public final class misk/redis/RedisClusterReplicationGroupConfig {
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;I)V
public synthetic fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V
public synthetic fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;Ljava/lang/String;)V
public fun <init> (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Lmisk/redis/RedisNodeConfig;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()I
public final fun component4 ()Ljava/lang/String;
public final fun component5 ()I
public final fun copy (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;I)Lmisk/redis/RedisClusterReplicationGroupConfig;
public static synthetic fun copy$default (Lmisk/redis/RedisClusterReplicationGroupConfig;Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;IILjava/lang/Object;)Lmisk/redis/RedisClusterReplicationGroupConfig;
public final fun component5 ()Ljava/lang/String;
public final fun component6 ()I
public final fun copy (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)Lmisk/redis/RedisClusterReplicationGroupConfig;
public static synthetic fun copy$default (Lmisk/redis/RedisClusterReplicationGroupConfig;Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;IILjava/lang/Object;)Lmisk/redis/RedisClusterReplicationGroupConfig;
public fun equals (Ljava/lang/Object;)Z
public final fun getClient_name ()Ljava/lang/String;
public final fun getConfiguration_endpoint ()Lmisk/redis/RedisNodeConfig;
public final fun getMax_attempts ()I
public final fun getRedis_auth_password ()Ljava/lang/String;
public final fun getTimeout_ms ()I
public final fun getUser ()Ljava/lang/String;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand Down
1 change: 1 addition & 0 deletions misk-redis/src/main/kotlin/misk/redis/RedisClusterConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ data class RedisClusterReplicationGroupConfig @JvmOverloads constructor(
val max_attempts: Int = DEFAULT_MAX_ATTEMPTS,
@Redact
val redis_auth_password: String,
val user: String,
val timeout_ms: Int = Protocol.DEFAULT_TIMEOUT
)

3 changes: 3 additions & 0 deletions misk-redis/src/main/kotlin/misk/redis/RedisJedisClusterService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ internal class RedisJedisClusterService(
.password(replicationGroup.redis_auth_password
.ifEmpty { null }
)
.user(replicationGroup.user
.ifEmpty { null }
)
.clientName(replicationGroup.client_name)
.ssl(useSsl)
//CLIENT SETINFO is only supported in Redis v7.2+
Expand Down
1 change: 1 addition & 0 deletions misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ object DockerRedisCluster : ExternalDependency {
configuration_endpoint = redisNodeConfig,
redis_auth_password = "",
timeout_ms = 1_000,
user = "",
)
val config = RedisClusterConfig(mapOf("test-group" to replicationGroupConfig))

Expand Down