chore: manually bump keiko to 3.7.4 and fix imports (#764)

spinnaker · Jul 14, 2020 · 71244ea · 71244ea
1 parent 9cfc5dd
commit 71244ea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-keikoVersion=3.7.3
+keikoVersion=3.7.4
 kotlinVersion=1.3.70
 mathCommonsVersion=3.6.1
 orcaVersion=8.8.0

diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java
@@ -16,13 +16,13 @@
 
 package com.netflix.kayenta.orca.controllers;
 
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE;
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UNKNOWN;
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UP;
+import static com.netflix.spinnaker.kork.discovery.InstanceStatus.OUT_OF_SERVICE;
+import static com.netflix.spinnaker.kork.discovery.InstanceStatus.UNKNOWN;
+import static com.netflix.spinnaker.kork.discovery.InstanceStatus.UP;
 
-import com.netflix.appinfo.InstanceInfo;
-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.RemoteStatusChangedEvent;
 import com.netflix.spinnaker.kork.web.exceptions.ValidationException;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,10 +58,11 @@ void setInstanceEnabled(@RequestBody Map<String, Boolean> enabledWrapper) {
   }
 
   private void setInstanceEnabled(boolean enabled) {
-    InstanceInfo.InstanceStatus currentStatus = enabled ? UP : OUT_OF_SERVICE;
-    InstanceInfo.InstanceStatus previousStatus = currentStatus == OUT_OF_SERVICE ? UP : UNKNOWN;
+    InstanceStatus currentStatus = enabled ? UP : OUT_OF_SERVICE;
+    InstanceStatus previousStatus = currentStatus == OUT_OF_SERVICE ? UP : UNKNOWN;
 
     publisher.publishEvent(
-        new RemoteStatusChangedEvent(new StatusChangeEvent(previousStatus, currentStatus)));
+        new RemoteStatusChangedEvent(
+            new DiscoveryStatusChangeEvent(previousStatus, currentStatus)));
   }
 }
diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/PipelineController.java b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/PipelineController.java
@@ -15,13 +15,13 @@
  */
 package com.netflix.kayenta.orca.controllers;
 
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.STARTING;
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UP;
+import static com.netflix.spinnaker.kork.discovery.InstanceStatus.STARTING;
+import static com.netflix.spinnaker.kork.discovery.InstanceStatus.UP;
 import static com.netflix.spinnaker.orca.api.pipeline.models.ExecutionType.PIPELINE;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-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.RemoteStatusChangedEvent;
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus;
 import com.netflix.spinnaker.orca.api.pipeline.models.PipelineExecution;
 import com.netflix.spinnaker.orca.pipeline.ExecutionLauncher;
@@ -84,7 +84,8 @@ void startOrcaQueueProcessing() {
       Health health = healthIndicator.health();
       if (health.getStatus() == Status.UP) {
         upAtLeastOnce = true;
-        context.publishEvent(new RemoteStatusChangedEvent(new StatusChangeEvent(STARTING, UP)));
+        context.publishEvent(
+            new RemoteStatusChangedEvent(new DiscoveryStatusChangeEvent(STARTING, UP)));
         // Cancel the scheduled task.
         postProcessor.postProcessBeforeDestruction(this, null);
         log.info("Health indicators are all reporting UP; starting orca queue processing");