chore(build): Bump kork version & fix tests (#4218)

* chore(build): bump korkVersion to 7.115.2 * fix(test): create MonitorableQueue bean instead Queue on integration tests
spinnaker · Feb 11, 2022 · 82a7dc3 · 82a7dc3
1 parent dc204ef
commit 82a7dc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.28.0
-korkVersion=7.115.0
+korkVersion=7.115.2
 kotlinVersion=1.4.32
 org.gradle.parallel=true
 spinnakerGradleVersion=8.15.0

diff --git a/...lugins-test/src/test/kotlin/com/netflix/spinnaker/orca/plugins/test/OrcaPluginsFixture.kt b/...lugins-test/src/test/kotlin/com/netflix/spinnaker/orca/plugins/test/OrcaPluginsFixture.kt
@@ -33,9 +33,9 @@ import com.netflix.spinnaker.orca.plugins.PreconfiguredJobConfigurationProviderE
 import com.netflix.spinnaker.orca.plugins.StageDefinitionBuilderExtension
 import com.netflix.spinnaker.orca.plugins.TaskExtension1
 import com.netflix.spinnaker.orca.plugins.TaskExtension2
-import com.netflix.spinnaker.q.Queue
 import com.netflix.spinnaker.q.memory.InMemoryQueue
 import com.netflix.spinnaker.q.metrics.EventPublisher
+import com.netflix.spinnaker.q.metrics.MonitorableQueue
 import java.io.File
 import java.time.Clock
 import java.time.Duration
@@ -111,7 +111,7 @@ internal class PluginTestConfiguration {
 
   @Bean
   @Primary
-  fun queue(clock: Clock?, publisher: EventPublisher?): Queue {
+  fun queue(clock: Clock?, publisher: EventPublisher?): MonitorableQueue {
     return InMemoryQueue(
       clock!!, Duration.ofMinutes(1), emptyList(), false, publisher!!
     )

diff --git a/orca-web/src/test/groovy/com/netflix/spinnaker/orca/StartupTestConfiguration.java b/orca-web/src/test/groovy/com/netflix/spinnaker/orca/StartupTestConfiguration.java
@@ -16,9 +16,9 @@
 
 package com.netflix.spinnaker.orca;
 
-import com.netflix.spinnaker.q.Queue;
 import com.netflix.spinnaker.q.memory.InMemoryQueue;
 import com.netflix.spinnaker.q.metrics.EventPublisher;
+import com.netflix.spinnaker.q.metrics.MonitorableQueue;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Collections;
@@ -30,7 +30,7 @@
 class StartupTestConfiguration {
   @Bean
   @Primary
-  Queue queue(Clock clock, EventPublisher publisher) {
+  MonitorableQueue queue(Clock clock, EventPublisher publisher) {
     return new InMemoryQueue(
         clock, Duration.ofMinutes(1), Collections.emptyList(), false, publisher);
   }