github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid null dereferences in ECS client

Browse Source
This commit is contained in:
Alfonso Acosta
2017-05-10 15:28:53 +00:00
parent 7ef6ae0051
commit 26eaadbbaa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
probe/awsecs/client.go
View File

@@ -140,8 +140,13 @@ func (c ecsClientImpl) listServices() []string {
err := c.client.ListServicesPages(
&ecs.ListServicesInput{Cluster: &c.cluster},
func(page *ecs.ListServicesOutput, lastPage bool) bool {
if page == nil {
return true
}
for _, name := range page.ServiceArns {
results = append(results, *name)
if name != nil {
results = append(results, *name)
}
}
return true
},
@@ -233,7 +238,9 @@ func (c ecsClientImpl) getTasks(taskARNs []string) {
}
for _, task := range resp.Tasks {
c.taskCache.Set(*task.TaskArn, newECSTask(task))
if task.TaskArn != nil {
c.taskCache.Set(*task.TaskArn, newECSTask(task))
}
}
}