fix(eureka): getInstanceToModify calculation was incorrect with mul…

…tiple health statuses (#2384) Previously it was iterating through each `health` and double counting instances that had both eureka and non-eureka health statuses.
spinnaker · Feb 21, 2018 · 40842e0 · 40842e0
1 parent c1477b1
commit 40842e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...n/groovy/com/netflix/spinnaker/clouddriver/eureka/deploy/ops/AbstractEurekaSupport.groovy b/...n/groovy/com/netflix/spinnaker/clouddriver/eureka/deploy/ops/AbstractEurekaSupport.groovy
@@ -275,8 +275,15 @@ abstract class AbstractEurekaSupport {
 
     instances.each { instanceId ->
       def instanceInExistingServerGroup = serverGroup.instances.find { it.name == instanceId }
-      instanceInExistingServerGroup?.health?.each { Map<String, String> health ->
-        if (DiscoveryStatus.Enable.value.equalsIgnoreCase(health?.eurekaStatus)) {
+      if (instanceInExistingServerGroup) {
+        boolean isUp = false
+        instanceInExistingServerGroup.health?.flatten()?.each { Map<String, String> health ->
+          if (DiscoveryStatus.Enable.value.equalsIgnoreCase(health?.eurekaStatus)) {
+            isUp = true
+          }
+        }
+
+        if (isUp) {
           unmodified.add(instanceId)
         } else {
           modified.add(instanceId)

diff --git a/...oovy/com/netflix/spinnaker/clouddriver/eureka/deploy/ops/AbstractEurekaSupportSpec.groovy b/...oovy/com/netflix/spinnaker/clouddriver/eureka/deploy/ops/AbstractEurekaSupportSpec.groovy
@@ -39,7 +39,7 @@ class AbstractEurekaSupportSpec extends Specification {
     1 * clusterProvider.getServerGroup("test", "us-west-2", "asg-v001") >> {
       return serverGroup(
         instancesInServerGroup.collect {
-          instance(it.key, ["eurekaStatus": it.value])
+          instance(it.key, [["eurekaStatus": it.value], ["notEurekaStatus": it.value]])
         }
       )
     }
@@ -63,10 +63,10 @@ class AbstractEurekaSupportSpec extends Specification {
     }
   }
 
-  Instance instance(String name, Map<String, String> health) {
+  Instance instance(String name, List<Map<String, String>> healths) {
     return Mock(Instance) {
       _ * getName() >> { return name }
-      _ * getHealth() >> { return [health] }
+      _ * getHealth() >> { return healths }
     }
   }