fix(wait for *): Allow min/max/desired to be strings (cos expressions)

spinnaker · May 21, 2019 · 79eec77 · 79eec77
1 parent 6c57ca9
commit 79eec77
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 189 deletions.
diff --git a/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/instance/WaitForUpInstancesTask.groovy b/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/instance/WaitForUpInstancesTask.groovy
@@ -16,15 +16,14 @@
 
 package com.netflix.spinnaker.orca.clouddriver.tasks.instance
 
+import java.util.concurrent.TimeUnit
 import com.netflix.spinnaker.orca.clouddriver.utils.HealthHelper
 import com.netflix.spinnaker.orca.clouddriver.utils.HealthHelper.HealthCountSnapshot
 import com.netflix.spinnaker.orca.pipeline.model.Stage
 import groovy.util.logging.Slf4j
 import org.slf4j.MDC
 import org.springframework.stereotype.Component
 
-import java.util.concurrent.TimeUnit
-
 @Component
 @Slf4j
 class WaitForUpInstancesTask extends AbstractWaitingForInstancesTask {
@@ -120,7 +119,7 @@ class WaitForUpInstancesTask extends AbstractWaitingForInstancesTask {
     Integer targetDesiredSize
 
     if (useConfiguredCapacity(stage, currentCapacity)) {
-      targetDesiredSize = ((Map<String, Integer>) stage.context.capacity).desired
+      targetDesiredSize = ((Map<String, Integer>) stage.context.capacity).desired as Integer
       splainer.add("setting targetDesiredSize=${targetDesiredSize} from the configured stage context.capacity=${stage.context.capacity}")
     } else {
       targetDesiredSize = currentCapacity.desired as Integer
@@ -158,7 +157,9 @@ class WaitForUpInstancesTask extends AbstractWaitingForInstancesTask {
   // targetDesired from the configured capacity. This relaxes the need for clouddriver onDemand
   // cache updates while resizing serverGroups.
   static boolean useConfiguredCapacity(Stage stage, Map<String, Integer> current) {
-    Map<String, Integer> configured = stage.context.getOrDefault("capacity", [:]) as Map<String, Integer>
+    Map<String, Integer> configured =
+      (stage.context.getOrDefault("capacity", [:]))
+      .collectEntries { k, v -> [(k): v as Integer] } as Map<String, Integer>
 
     if (configured.desired == null) {
       return false

diff --git a/.../com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/WaitForCapacityMatchTask.groovy b/.../com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/WaitForCapacityMatchTask.groovy
@@ -52,7 +52,7 @@ class WaitForCapacityMatchTask extends AbstractInstancesCheckTask {
       Integer desired
 
       if (WaitForUpInstancesTask.useConfiguredCapacity(stage, serverGroup.capacity as Map<String, Integer>)) {
-        desired = ((Map<String, Integer>) stage.context.capacity).desired
+        desired = ((Map<String, Integer>) stage.context.capacity).desired as Integer
         splainer.add("using desired from stage.context.capacity ($desired)")
       } else {
         desired = ((Map<String, Integer>)serverGroup.capacity).desired