0.10.6: redis sentinel support (proto + Redisson config); submodule bump

Author: doctorpangloss

build.gradle

@@ -24,7 +24,7 @@ dependencies {
 }
 
 allprojects {
-  project.version = '0.10.5'
+  project.version = '0.10.6'
 }
 
 subprojects {

spellsource-private/src/secrets

@@ -37,9 +37,15 @@ message ServerConfiguration {
       string user = 3;
     }
 
+    message SentinelServers {
+      repeated string sentinelAddresses = 1;
+      string masterName = 2;
+    }
+
     oneof connection {
       HostPortUser hostPortUser = 1;
       string uri = 2;
+      SentinelServers sentinelServers = 3;
     }
   }
 

spellsource-protos/src/main/proto/hiddenswitch.proto

@@ -98,10 +98,20 @@ public class Environment {
 	}
 
 	private static RedissonClient redissonClientConstructor(Vertx vertx) {
-		var configuration = getConfiguration();
+		var redisConf = getConfiguration().getRedis();
 		var config = new Config();
-		// todo: this should probably come out of the configuration, shouldn't it?
-		config.useSingleServer().setAddress(configuration.getRedis().getUri());
+		switch (redisConf.getConnectionCase()) {
+			case SENTINELSERVERS -> {
+				var sentinel = redisConf.getSentinelServers();
+				var sentinelConf = config.useSentinelServers().setMasterName(sentinel.getMasterName());
+				sentinel.getSentinelAddressesList().forEach(sentinelConf::addSentinelAddress);
+			}
+			case HOSTPORTUSER -> {
+				var hpu = redisConf.getHostPortUser();
+				config.useSingleServer().setAddress("redis://" + hpu.getHost() + ":" + hpu.getPort());
+			}
+			case URI, CONNECTION_NOT_SET -> config.useSingleServer().setAddress(redisConf.getUri());
+		}
 		return Redisson.create(config);
 	}