Set TLS configuration under csm.platform in CsmPlatformProperties (rename usages)

Author: jreynard-code

src/main/kotlin/com/cosmotech/api/config/CsmPlatformProperties.kt

@@ -46,6 +46,8 @@ data class CsmPlatformProperties(
     /** Argo Service */
     val argo: Argo,
 
+    val tls: TlsConfig = TlsConfig(),
+
     /** Cosmo Tech core images */
     val images: CsmImages,
 
@@ -395,9 +397,6 @@ data class CsmPlatformProperties(
       /** Twin cache port */
       val port: String = "6379",
 
-      /** Twin cache tls enabled */
-      val tls: CsmTwinCacheTLS = CsmTwinCacheTLS(),
-
       /** Twin cache user */
       val username: String = "default",
 
@@ -434,10 +433,6 @@ data class CsmPlatformProperties(
       /** Twin cache query page information for solution */
       val solution: PageSizing = PageSizing(),
   ) {
-    data class CsmTwinCacheTLS(
-        val enabled: Boolean = false,
-        val bundle: String? = null,
-    )
 
     data class PageSizing(
         /** Max result for a single page */
@@ -459,4 +454,6 @@ data class CsmPlatformProperties(
         val workspaces: List<String> = emptyList(),
     )
   }
+
+  data class TlsConfig(val enabled: Boolean = false, val bundle: String = "")
 }

src/main/kotlin/com/cosmotech/api/redis/RedisConfig.kt

@@ -20,26 +20,26 @@ open class RedisConfig {
   @Value("\${spring.data.redis.port}") private lateinit var twincachePort: String
 
   // This property path is not compatible with spring.data.redis used by redis-om auto configuration
-  @Value("\${csm.platform.twincache.tls.enabled}") private var twincacheTLS: Boolean = false
+  @Value("\${csm.platform.tls.enabled}") private val tlsEnabled: Boolean = false
 
   // This property path is not compatible with spring.data.redis used by redis-om auto configuration
   // It is duplicated since spring.data.redis.ssl.bundle cannot be empty
-  @Value("\${csm.platform.tls.bundle}") private var customTLSBundle: String = ""
+  @Value("\${csm.platform.tls.bundle}") private var tlsBundle: String = ""
 
   @Value("\${spring.data.redis.password}") private lateinit var twincachePassword: String
 
   @Bean
   open fun csmJedisClientConfig(sslBundles: SslBundles): JedisClientConfig {
-    return if (twincacheTLS && customTLSBundle.isNotBlank()) {
+    return if (tlsEnabled && tlsBundle.isNotBlank()) {
       DefaultJedisClientConfig.builder()
-          .ssl(twincacheTLS)
-          .sslSocketFactory(sslBundles.getBundle(customTLSBundle).createSslContext().socketFactory)
+          .ssl(tlsEnabled)
+          .sslSocketFactory(sslBundles.getBundle(tlsBundle).createSslContext().socketFactory)
           .password(twincachePassword)
           .timeoutMillis(Protocol.DEFAULT_TIMEOUT)
           .build()
     } else {
       DefaultJedisClientConfig.builder()
-          .ssl(twincacheTLS)
+          .ssl(tlsEnabled)
           .password(twincachePassword)
           .timeoutMillis(Protocol.DEFAULT_TIMEOUT)
           .build()