fix(ecs): Handle task def not cached yet (#3980)

spinnaker · Aug 30, 2019 · b93a55d · b93a55d
1 parent 95ea8e4
commit b93a55d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/...ain/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskHealthCachingAgent.java b/...ain/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskHealthCachingAgent.java
@@ -165,6 +165,10 @@ private TaskHealth inferHealthNetworkInterfacedContainer(
       Service loadBalancerService,
       TaskDefinition taskDefinition) {
 
+    if (taskDefinition == null) {
+      return null;
+    }
+
     List<LoadBalancer> loadBalancers = loadBalancerService.getLoadBalancers();
 
     for (LoadBalancer loadBalancer : loadBalancers) {

diff --git a/...vy/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskHealthCachingAgentSpec.groovy b/...vy/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskHealthCachingAgentSpec.groovy
@@ -243,6 +243,30 @@ class TaskHealthCachingAgentSpec extends Specification {
     taskHealth.getTaskId() == CommonCachingAgent.TASK_ID_1
   }
 
+  def 'should skip tasks with a non-cached task definition and aws-vpc mode'() {
+    given:
+    ObjectMapper mapper = new ObjectMapper()
+    Map<String, Object> containerMap = mapper.convertValue(new Container().withNetworkInterfaces(
+            new NetworkInterface().withPrivateIpv4Address("192.168.0.100")),
+            Map.class)
+    def taskAttributes = [
+            taskId               : CommonCachingAgent.TASK_ID_1,
+            taskArn              : CommonCachingAgent.TASK_ARN_1,
+            startedAt            : new Date().getTime(),
+            group                : 'service:' + CommonCachingAgent.SERVICE_NAME_1,
+            containers           : Collections.singletonList(containerMap)
+    ]
+    def taskKey = Keys.getTaskKey(CommonCachingAgent.ACCOUNT, CommonCachingAgent.REGION, CommonCachingAgent.TASK_ID_1)
+    def taskCacheData = new DefaultCacheData(taskKey, taskAttributes, Collections.emptyMap())
+    providerCache.getAll(TASKS.toString(), _) >> Collections.singletonList(taskCacheData)
+
+    when:
+    def taskHealthList = agent.getItems(ecs, providerCache)
+
+    then:
+    taskHealthList == []
+  }
+
   def 'should generate fresh data'() {
     given:
     def taskIds = [CommonCachingAgent.TASK_ID_1, CommonCachingAgent.TASK_ID_2]