diff --git a/misk-redis/api/misk-redis.api b/misk-redis/api/misk-redis.api index 526f5563544..ac6f50730f3 100644 --- a/misk-redis/api/misk-redis.api +++ b/misk-redis/api/misk-redis.api @@ -418,24 +418,26 @@ public final class misk/redis/RedisClusterModule : misk/inject/KAbstractModule { } public final class misk/redis/RedisClusterReplicationGroupConfig { - public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;)V - public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;)V - public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;I)V - public synthetic fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V + public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V + public synthetic fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lmisk/redis/RedisNodeConfig;Ljava/lang/String;Ljava/lang/String;)V + public fun (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; } diff --git a/misk-redis/src/main/kotlin/misk/redis/RedisClusterConfig.kt b/misk-redis/src/main/kotlin/misk/redis/RedisClusterConfig.kt index be5c5126b7a..d5c75f525b6 100644 --- a/misk-redis/src/main/kotlin/misk/redis/RedisClusterConfig.kt +++ b/misk-redis/src/main/kotlin/misk/redis/RedisClusterConfig.kt @@ -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 ) diff --git a/misk-redis/src/main/kotlin/misk/redis/RedisJedisClusterService.kt b/misk-redis/src/main/kotlin/misk/redis/RedisJedisClusterService.kt index 27d7a55506c..bd8efa66ae2 100644 --- a/misk-redis/src/main/kotlin/misk/redis/RedisJedisClusterService.kt +++ b/misk-redis/src/main/kotlin/misk/redis/RedisJedisClusterService.kt @@ -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+ diff --git a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt index c3dc87c66ac..76c113fe563 100644 --- a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt +++ b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt @@ -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))