From 7d845f9130be5ef60610c9069765d8ec50745114 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Mon, 12 Dec 2016 13:54:33 -0800 Subject: [PATCH] ecs reporter: Review feedback, some trivial renames --- probe/awsecs/reporter.go | 10 +++++----- prog/probe.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/probe/awsecs/reporter.go b/probe/awsecs/reporter.go index 1f1263355..346d18609 100644 --- a/probe/awsecs/reporter.go +++ b/probe/awsecs/reporter.go @@ -78,13 +78,13 @@ func getLabelInfo(rpt report.Report) map[string]map[string]*taskLabelInfo { // Reporter implements Tagger, Reporter type Reporter struct { - clients map[string]*ecsClient + clientsByCluster map[string]*ecsClient } // New creates a new Reporter -func New() Reporter { +func Make() Reporter { return Reporter{ - clients: map[string]*ecsClient{}, + clientsByCluster: map[string]*ecsClient{}, } } @@ -97,7 +97,7 @@ func (r Reporter) Tag(rpt report.Report) (report.Report, error) { for cluster, taskMap := range clusterMap { log.Debugf("Fetching ECS info for cluster %v with %v tasks", cluster, len(taskMap)) - client, ok := r.clients[cluster] + client, ok := r.clientsByCluster[cluster] if !ok { log.Debugf("Creating new ECS client") var err error // can't use := on the next line without shadowing outer client var @@ -105,7 +105,7 @@ func (r Reporter) Tag(rpt report.Report) (report.Report, error) { if err != nil { return rpt, err } - r.clients[cluster] = client + r.clientsByCluster[cluster] = client } taskArns := make([]string, 0, len(taskMap)) diff --git a/prog/probe.go b/prog/probe.go index cd8ca164a..fd183a30b 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -206,7 +206,7 @@ func probeMain(flags probeFlags, targets []appclient.Target) { } if flags.ecsEnabled { - reporter := awsecs.New() + reporter := awsecs.Make() p.AddReporter(reporter) p.AddTagger(reporter) }