fix: review

traefik · May 28, 2018 · 000ebe0 · 000ebe0
1 parent db2e630
commit 000ebe0
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/provider/ecs/ecs.go b/provider/ecs/ecs.go
@@ -228,9 +228,10 @@ func (p *Provider) listInstances(ctx context.Context, client *awsClient) ([]ecsI
 				})
 				if err != nil {
 					log.Errorf("Unable to describe tasks for %s", page.TaskArns)
-				}
-				for _, t := range resp.Tasks {
-					tasks[aws.StringValue(t.TaskArn)] = t
+				} else {
+					for _, t := range resp.Tasks {
+						tasks[aws.StringValue(t.TaskArn)] = t
+					}
 				}
 			}
 			return !lastPage
@@ -272,6 +273,11 @@ func (p *Provider) listInstances(ctx context.Context, client *awsClient) ([]ecsI
 					}
 				}
 
+				if containerDefinition == nil {
+					log.Debugf("Unable to find container definition for %s", aws.StringValue(container.Name))
+					continue
+				}
+
 				var mach *machine
 				if aws.StringValue(task.LaunchType) == ecs.LaunchTypeFargate {
 					var hostPort int64
@@ -297,7 +303,7 @@ func (p *Provider) listInstances(ctx context.Context, client *awsClient) ([]ecsI
 
 				instances = append(instances, ecsInstance{
 					Name:                fmt.Sprintf("%s-%s", strings.Replace(aws.StringValue(task.Group), ":", "-", 1), *container.Name),
-					ID:                  (key)[len(key)-12:],
+					ID:                  key[len(key)-12:],
 					containerDefinition: containerDefinition,
 					machine:             mach,
 					TraefikLabels:       aws.StringValueMap(containerDefinition.DockerLabels),