feat(rosco): Add support for Redis SSL (#719)

Co-authored-by: Fernando Freire <fernando.freire@armory.io>
spinnaker · Dec 7, 2020 · 8662444 · 8662444
1 parent c39f83d
commit 8662444
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/persistence/config/JedisConfig.groovy b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/persistence/config/JedisConfig.groovy
@@ -36,7 +36,7 @@ class JedisConfig {
     poolConfig.setMaxTotal(100)
     poolConfig.setMinIdle(25)
     poolConfig.setMaxIdle(100)
-    new JedisPool(poolConfig, connectionInfo.host, connectionInfo.port, timeout, connectionInfo.password)
+    new JedisPool(poolConfig, connectionInfo.host, connectionInfo.port, timeout, connectionInfo.password, connectionInfo.isSSL)
   }
 
   @Bean

diff --git a/...src/main/groovy/com/netflix/spinnaker/rosco/persistence/config/RedisConnectionInfo.groovy b/...src/main/groovy/com/netflix/spinnaker/rosco/persistence/config/RedisConnectionInfo.groovy
@@ -27,6 +27,7 @@ class RedisConnectionInfo {
   int port
   int database
   String password
+  boolean isSSL
 
   boolean hasPassword() {
     password?.length() > 0
@@ -43,11 +44,14 @@ class RedisConnectionInfo {
 
     String password = JedisURIHelper.getPassword(redisConnection)
 
+    boolean isSSL = JedisURIHelper.isRedisSSLScheme(redisConnection)
+
     new RedisConnectionInfo([
         host: host,
         port: port,
         database: database,
-        password: password
+        password: password,
+        isSSL: isSSL
     ])
   }