feat: Redis sentinel enabled field (#2546)

* Add sentinel enabled field

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Default sentinel to false

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix sentinel enabled test

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add log when connect to redis

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Author: CarsonCook

caching-service/src/main/java/org/zowe/apiml/caching/service/redis/RedisOperator.java

@@ -55,6 +55,7 @@ public RedisOperator(RedisClient redisClient, RedisURI redisUri, ApimlLogger api
             this.redisClient = redisClient;
             redisConnection = MasterReplica.connect(this.redisClient, StringCodec.UTF8, redisUri);
             redis = redisConnection.async();
+            log.info("Connected to Redis {}", redisUri);
         } catch (Exception e) {
             apimlLog.log("org.zowe.apiml.cache.errorInitializingStorage", "redis", e.getCause().getMessage(), e);
             System.exit(1);

caching-service/src/main/java/org/zowe/apiml/caching/service/redis/config/RedisConfig.java

@@ -56,7 +56,7 @@ public void init() {
     }
 
     public boolean usesSentinel() {
-        return sentinel != null;
+        return sentinel != null && sentinel.isEnabled();
     }
 
     public boolean usesSsl() {
@@ -65,6 +65,7 @@ public boolean usesSsl() {
 
     @Data
     public static class Sentinel {
+        private boolean enabled = false;
         private String masterInstance;
         private List<SentinelNode> nodes;
 

caching-service/src/main/resources/application.yml

@@ -4,6 +4,13 @@ caching:
         redis:
             timeout: 60
             masterNodeUri: default:heslo@localhost:6379
+            sentinel:
+                enabled: false
+                masterInstance: redismaster
+                nodes:
+                    - sentinelpassword@localhost:26379
+                    - sentinelpassword@localhost:26380
+                    - sentinelpassword@localhost:26381
             ssl:
                 enabled: true
                 keyStore: ${server.ssl.keyStore}

caching-service/src/test/java/org/zowe/apiml/caching/service/redis/config/RedisConfigTest.java

@@ -40,8 +40,17 @@ void givenNullSentinel_thenReturnFalse() {
         }
 
         @Test
-        void givenValidSentinel_thenReturnTrue() {
+        void givenSentinelNotEnabled_thenReturnFalse() {
             underTest.setSentinel(new RedisConfig.Sentinel());
+            assertFalse(underTest.usesSentinel());
+        }
+
+        @Test
+        void givenValidSentinel_thenReturnTrue() {
+            RedisConfig.Sentinel sentinel = new RedisConfig.Sentinel();
+            sentinel.setEnabled(true);
+
+            underTest.setSentinel(sentinel);
             assertTrue(underTest.usesSentinel());
         }
     }