refactor(spring): Bump korkVersion, refactor eureka integration (#175)

spinnaker · Jul 9, 2020 · 49cf548 · 49cf548
1 parent 75024b6
commit 49cf548
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-korkVersion=7.50.0
+korkVersion=7.51.1
 kotlinVersion=1.3.70
 org.gradle.parallel=true
 spinnakerGradleVersion=8.3.0

diff --git a/keiko-spring/build.gradle b/keiko-spring/build.gradle
@@ -6,7 +6,6 @@ dependencies {
   api("com.netflix.spinnaker.kork:kork-core") {
     exclude(module: "logback-classic")
   }
-  api "com.netflix.eureka:eureka-client"
 
   testImplementation project(":keiko-test-common")
 }
diff --git a/keiko-spring/src/main/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivator.kt b/keiko-spring/src/main/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivator.kt
@@ -16,8 +16,8 @@
 
 package com.netflix.spinnaker.q.discovery
 
-import com.netflix.appinfo.InstanceInfo.InstanceStatus.UP
-import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent
+import com.netflix.spinnaker.kork.discovery.InstanceStatus.UP
+import com.netflix.spinnaker.kork.discovery.RemoteStatusChangedEvent
 import com.netflix.spinnaker.q.Activator
 import java.util.concurrent.atomic.AtomicBoolean
 import org.slf4j.LoggerFactory

diff --git a/keiko-spring/src/test/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivatorTest.kt b/keiko-spring/src/test/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivatorTest.kt
@@ -16,11 +16,11 @@
 
 package com.netflix.spinnaker.q.discovery
 
-import com.netflix.appinfo.InstanceInfo.InstanceStatus
-import com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE
-import com.netflix.appinfo.InstanceInfo.InstanceStatus.UP
-import com.netflix.discovery.StatusChangeEvent
-import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent
+import com.netflix.spinnaker.kork.discovery.DiscoveryStatusChangeEvent
+import com.netflix.spinnaker.kork.discovery.InstanceStatus
+import com.netflix.spinnaker.kork.discovery.InstanceStatus.OUT_OF_SERVICE
+import com.netflix.spinnaker.kork.discovery.InstanceStatus.UP
+import com.netflix.spinnaker.kork.discovery.RemoteStatusChangedEvent
 import com.netflix.spinnaker.spek.and
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.spek.api.Spek
@@ -66,4 +66,4 @@ private fun DiscoveryActivator.triggerEvent(from: InstanceStatus, to: InstanceSt
   onApplicationEvent(event(from, to))
 
 private fun event(from: InstanceStatus, to: InstanceStatus) =
-  RemoteStatusChangedEvent(StatusChangeEvent(from, to))
+  RemoteStatusChangedEvent(DiscoveryStatusChangeEvent(from, to))