fix null pointer on wait for up instances task

(cherry picked from commit be9b5bac4b710eba68da26f9a263b55dec23a267)
ziggyw · Apr 28, 2021 · dba6c18 · dba6c18
1 parent f445e36
commit dba6c18
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/instance/WaitForUpInstancesTask.groovy b/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/instance/WaitForUpInstancesTask.groovy
@@ -69,7 +69,7 @@ class WaitForUpInstancesTask extends AbstractInstancesCheckTask {
     return allInstancesMatch(stage, serverGroup, instances, interestingHealthProviderNames, null)
   }
 
-   public static boolean allInstancesMatch(StageExecution stage,
+  public static boolean allInstancesMatch(StageExecution stage,
                                           Map<String, Object> serverGroup,
                                           List<Map<String, Object>> instances,
                                           Collection<String> interestingHealthProviderNames,
@@ -382,6 +382,7 @@ class WaitForUpInstancesTask extends AbstractInstancesCheckTask {
               .map({ deployment ->
                 deployment.get("capacity") as Map<String, Integer>
               })
+              .filter({ it != null })
               .findFirst()
         })
         .orElse(null)