fix(ecs): search through whole list of tasks for vpc ID (#3886) (#3902)

Fixes spinnaker/spinnaker#4620
spinnaker · Jul 25, 2019 · e44f8ed · e44f8ed
1 parent a4ba5d3
commit e44f8ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/...in/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java b/...in/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProvider.java
@@ -318,13 +318,6 @@ private EcsServerGroup buildEcsServerGroup(
     Set<String> securityGroups = new HashSet<>();
 
     if (!instances.isEmpty()) {
-      String taskId = instances.iterator().next().getName();
-      String taskKey = Keys.getTaskKey(account, region, taskId);
-      Task task = taskCacheClient.get(taskKey);
-
-      com.amazonaws.services.ec2.model.Instance ec2Instance =
-          containerInformationService.getEc2Instance(account, region, task);
-
       if (eniSubnets != null
           && !eniSubnets.isEmpty()
           && eniSecurityGroups != null
@@ -340,12 +333,25 @@ private EcsServerGroup buildEcsServerGroup(
 
           vpcId = vpcIds.iterator().next();
         }
-      } else if (ec2Instance != null) {
-        vpcId = ec2Instance.getVpcId();
-        securityGroups =
-            ec2Instance.getSecurityGroups().stream()
-                .map(GroupIdentifier::getGroupId)
-                .collect(Collectors.toSet());
+      } else {
+        for (Instance instance : instances) {
+          String taskId = instance.getName();
+          String taskKey = Keys.getTaskKey(account, region, taskId);
+          Task task = taskCacheClient.get(taskKey);
+
+          if (task != null) {
+            com.amazonaws.services.ec2.model.Instance ec2Instance =
+                containerInformationService.getEc2Instance(account, region, task);
+            if (ec2Instance != null) {
+              vpcId = ec2Instance.getVpcId();
+              securityGroups =
+                  ec2Instance.getSecurityGroups().stream()
+                      .map(GroupIdentifier::getGroupId)
+                      .collect(Collectors.toSet());
+              break;
+            }
+          }
+        }
       }
     }
 

diff --git a/...y/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy b/...y/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsServerClusterProviderSpec.groovy
@@ -189,6 +189,7 @@ class EcsServerClusterProviderSpec extends Specification {
     cacheView.filterIdentifiers(_, _) >> ['key']
     cacheView.getAll(Keys.Namespace.SERVICES.ns, _) >> [serviceCacheData, serviceCacheData2]
     cacheView.getAll(Keys.Namespace.TASKS.ns, _) >> [taskCacheData]
+    cacheView.get(Keys.Namespace.TASKS.ns, _) >> taskCacheData
   }
 
   def 'should produce an ecs cluster'() {