feat(sql): Enables composite storage service to be backed by SQL stor… (#641)

* feat(sql): Enables composite storage service to be backed by SQL storage services. In order to wire up with storage services of same type, configuration now accepts bean name instead of storage service class names.
We only need service class names or bean names.

* feat(sql): Use injected prop beans instead of loose reference to properties

* feat(sql): Added usage comment for H2

Author: srekapalli

front50-sql/front50-sql.gradle

@@ -26,6 +26,9 @@ dependencies {
   testImplementation "org.testcontainers:postgresql"
   testImplementation "org.postgresql:postgresql"
 
+  // Only used for Initializing Datasource. For actual CRUD, test containers preferred.
+  testImplementation "com.h2database:h2"
+
 }
 
 test {

front50-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt

@@ -25,50 +25,61 @@ import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
 
 @Configuration
 @EnableConfigurationProperties(StorageServiceMigratorConfigurationProperties::class)
-class CompositeStorageServiceConfiguration() {
+class CompositeStorageServiceConfiguration(
+  private val storageServices: List<StorageService>,
+  private val applicationContext: ApplicationContext,
+  private val properties: StorageServiceMigratorConfigurationProperties,
+  private val dynamicConfigService: DynamicConfigService,
+  private val registry: Registry
+) {
   @Bean
   @Primary
   @ConditionalOnProperty("spinnaker.migration.compositeStorageService.enabled")
-  fun compositeStorageService(
-    dynamicConfigService: DynamicConfigService,
-    registry: Registry,
-    properties: StorageServiceMigratorConfigurationProperties,
-    storageServices: List<StorageService>
-  ) =
+  fun compositeStorageService() =
     CompositeStorageService(
       dynamicConfigService,
       registry,
-      storageServices.first { it.javaClass.canonicalName.equals(properties.primaryClass) },
-      storageServices.first { it.javaClass.canonicalName.equals(properties.previousClass) }
+      findStorageService(properties.primaryClass, properties.primaryName),
+      findStorageService(properties.previousClass, properties.previousName)
     )
 
   @Bean
   @ConditionalOnProperty("spinnaker.migration.compositeStorageService.enabled")
   fun storageServiceMigrator(
-    dynamicConfigService: DynamicConfigService,
-    registry: Registry,
-    properties: StorageServiceMigratorConfigurationProperties,
-    storageServices: List<StorageService>,
     entityTagsDAO: EntityTagsDAO
   ) =
     StorageServiceMigrator(
       dynamicConfigService,
       registry,
-      storageServices.first { it.javaClass.canonicalName.equals(properties.primaryClass) },
-      storageServices.first { it.javaClass.canonicalName.equals(properties.previousClass) },
+      findStorageService(properties.primaryClass, properties.primaryName),
+      findStorageService(properties.previousClass, properties.previousName),
       entityTagsDAO
     )
+
+  private fun findStorageService(
+    className: String?,
+    beanName: String?
+  ): StorageService {
+    return if (className != null && className.isNotBlank()) {
+      storageServices.first { it.javaClass.canonicalName == className }
+    } else {
+      applicationContext.getBean(beanName) as StorageService
+    }
+  }
 }
 
 @ConfigurationProperties("spinnaker.migration")
 data class StorageServiceMigratorConfigurationProperties(
   var primaryClass: String? = null,
   var previousClass: String? = null,
+  var primaryName: String? = null,
+  var previousName: String? = null,
   var writeOnly: Boolean = false
 )

front50-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt

@@ -23,6 +23,8 @@ import com.netflix.spinnaker.front50.model.SqlStorageService
 import com.netflix.spinnaker.kork.sql.config.DefaultSqlConfiguration
 import com.netflix.spinnaker.kork.sql.config.SqlProperties
 import org.jooq.DSLContext
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -47,6 +49,26 @@ class SqlConfiguration : CommonStorageServiceDAOConfig() {
       jooq,
       Clock.systemDefaultZone(),
       sqlProperties.retries,
-      1000
+      1000,
+      if (sqlProperties.connectionPools.keys.size > 1)
+        sqlProperties.connectionPools.filter { it.value.default }.keys.first() else sqlProperties.connectionPools.keys.first()
+    )
+
+  @Bean
+  @ConditionalOnBean(name = ["secondaryJooq"])
+  fun secondarySqlStorageService(
+    objectMapper: ObjectMapper,
+    registry: Registry,
+    @Qualifier("secondaryJooq") jooq: DSLContext,
+    sqlProperties: SqlProperties
+  ): SqlStorageService =
+    SqlStorageService(
+      objectMapper,
+      registry,
+      jooq,
+      Clock.systemDefaultZone(),
+      sqlProperties.retries,
+      1000,
+      sqlProperties.connectionPools.filter { !it.value.default }.keys.first()
     )
 }