feat(sql): Ability to enable/disable StorageServiceMigrator via FP …

…or YAML `spinnaker.migration.enabled` (defaults to `false`)
spinnaker · Jul 8, 2019 · c86ff70 · c86ff70
1 parent 0b2f51a
commit c86ff70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 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
@@ -47,12 +47,13 @@ class CompositeStorageServiceConfiguration() {
     )
 
   @Bean
-  @ConditionalOnProperty("spinnaker.migration.enabled")
-  fun storageServiceMigrator(registry: Registry,
+  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) },

diff --git a/...50-sql/src/main/kotlin/com/netflix/spinnaker/front50/migrations/StorageServiceMigrator.kt b/...50-sql/src/main/kotlin/com/netflix/spinnaker/front50/migrations/StorageServiceMigrator.kt
@@ -21,6 +21,7 @@ import com.netflix.spinnaker.front50.model.ObjectType
 import com.netflix.spinnaker.front50.model.StorageService
 import com.netflix.spinnaker.front50.model.Timestamped
 import com.netflix.spinnaker.front50.model.tag.EntityTagsDAO
+import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import com.netflix.spinnaker.security.AuthenticatedRequest
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
@@ -33,11 +34,11 @@ import java.util.concurrent.TimeUnit
 import kotlin.system.measureTimeMillis
 
 class StorageServiceMigrator(
+  private val dynamicConfigService: DynamicConfigService,
   private val registry: Registry,
   private val target: StorageService,
   private val source: StorageService,
   private val entityTagsDAO: EntityTagsDAO
-
 ) {
 
   companion object {
@@ -177,6 +178,11 @@ class StorageServiceMigrator(
 
   @Scheduled(fixedDelay = 60000)
   fun migrate() {
+    if (!dynamicConfigService.isEnabled("spinnaker.migration", false)) {
+      log.info("Migrator has been disabled")
+      return
+    }
+
     val migrationDurationMs = measureTimeMillis {
       ObjectType.values().forEach {
         if (it != ObjectType.ENTITY_TAGS) {