fix(migrations): Fix wiring secondarySqlStorage service bean

spinnaker · Jan 27, 2025 · 5e2d571 · 5e2d571
1 parent f22ddd2
commit 5e2d571
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt b/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt
@@ -71,9 +71,11 @@ class CompositeStorageServiceConfiguration(
     beanName: String?
   ): StorageService {
     return if (className != null && className.isNotBlank()) {
-      storageServices.first { it.javaClass.canonicalName == className }
+      val storageServiceClass = Class.forName(className)
+      storageServices.find { storageServiceClass.isInstance(it) }
+        ?: throw IllegalStateException("No StorageService bean of class $className found")
     } else {
-      applicationContext.getBean(beanName) as StorageService
+      beanName?.let { applicationContext.getBean(it) } as StorageService
     }
   }
 }

diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
@@ -23,8 +23,8 @@ import com.netflix.spinnaker.kork.sql.config.DefaultSqlConfiguration
 import com.netflix.spinnaker.kork.sql.config.SqlProperties
 import java.time.Clock
 import org.jooq.DSLContext
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
@@ -58,22 +58,25 @@ class SqlConfiguration {
     )
 
   @Bean
-  @ConditionalOnBean(name = ["secondaryJooq"])
+  @ConditionalOnProperty("sql.enabled", "sql.secondary.enabled")
   fun secondarySqlStorageService(
     objectMapper: ObjectMapper,
     registry: Registry,
-    @Qualifier("secondaryJooq") jooq: DSLContext,
+    @Autowired(required = false) @Qualifier("secondaryJooq") secondaryJooq: DSLContext?,
+    jooq: DSLContext,
     sqlProperties: SqlProperties,
     front50SqlProperties: Front50SqlProperties
-  ): SqlStorageService =
-    SqlStorageService(
+  ): SqlStorageService {
+    val effectiveJooq = secondaryJooq ?: jooq
+    return SqlStorageService(
       objectMapper,
       registry,
-      jooq,
+      effectiveJooq,
       Clock.systemDefaultZone(),
       sqlProperties.retries,
       1000,
       sqlProperties.connectionPools.filter { !it.value.default }.keys.first(),
       front50SqlProperties
     )
+  }
 }