fix(dynamicConfig): Removed rogue no-op service

spinnaker · May 16, 2019 · e3f866c · e3f866c
1 parent 468dead
commit e3f866c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt b/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt
@@ -19,8 +19,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PRO
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
-import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService.NOOP
 import com.netflix.spinnaker.orca.TaskResolver
 import com.netflix.spinnaker.orca.pipeline.model.Execution.ExecutionType
 import com.netflix.spinnaker.orca.q.redis.migration.ExecutionTypeDeserializer
@@ -33,7 +31,6 @@ import com.netflix.spinnaker.q.redis.RedisDeadMessageHandler
 import com.netflix.spinnaker.q.redis.RedisQueue
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -88,8 +85,4 @@ class RedisOrcaQueueConfiguration : RedisQueueConfiguration() {
     mapper: ObjectMapper
   ) =
     RedisPendingExecutionService(jedisPool, mapper)
-
-  @Bean
-  @ConditionalOnMissingBean(DynamicConfigService::class)
-  internal fun springTransientConfigService(): DynamicConfigService = NOOP
 }
diff --git a/...eue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt b/...eue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.orca.q.redis
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.config.RedisOrcaQueueConfiguration
+import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import com.netflix.spinnaker.kork.jedis.RedisClientDelegate
 import com.netflix.spinnaker.kork.jedis.RedisClientSelector
 import com.netflix.spinnaker.orca.config.JedisConfiguration
@@ -59,7 +60,8 @@ class RedisTestConfig {
     TestConfig::class,
     RedisConfiguration::class,
     RedisTestConfig::class,
-    RedisOrcaQueueConfiguration::class
+    RedisOrcaQueueConfiguration::class,
+    DynamicConfigService.NoopDynamicConfig::class
   ],
   properties = [
     "queue.retry.delay.ms=10",