#626: Address gofmt issues as reported by goreportcard.com

control/metrics_test.go

@@ -84,9 +84,9 @@ func TestMetricCatalog(t *testing.T) {
 		ts := time.Now()
 		Convey("add multiple metricTypes and get them back", func() {
 			ns := [][]string{
-				[]string{"test1"},
-				[]string{"test2"},
-				[]string{"test3"},
+				{"test1"},
+				{"test2"},
+				{"test3"},
 			}
 			lp := new(loadedPlugin)
 			mt := []*metricType{
@@ -180,9 +180,9 @@ func TestMetricCatalog(t *testing.T) {
 	})
 	Convey("metricCatalog.Item()", t, func() {
 		ns := [][]string{
-			[]string{"test1"},
-			[]string{"test2"},
-			[]string{"test3"},
+			{"test1"},
+			{"test2"},
+			{"test3"},
 		}
 		lp := new(loadedPlugin)
 		t := time.Now()
@@ -221,9 +221,9 @@ func TestMetricCatalog(t *testing.T) {
 
 func TestSubscribe(t *testing.T) {
 	ns := [][]string{
-		[]string{"test1"},
-		[]string{"test2"},
-		[]string{"test3"},
+		{"test1"},
+		{"test2"},
+		{"test3"},
 	}
 	lp := new(loadedPlugin)
 	ts := time.Now()
@@ -255,9 +255,9 @@ func TestSubscribe(t *testing.T) {
 
 func TestUnsubscribe(t *testing.T) {
 	ns := [][]string{
-		[]string{"test1"},
-		[]string{"test2"},
-		[]string{"test3"},
+		{"test1"},
+		{"test2"},
+		{"test3"},
 	}
 	lp := new(loadedPlugin)
 	ts := time.Now()

control/plugin/collector_proxy_test.go

@@ -47,7 +47,7 @@ func (p *mockPlugin) GetMetricTypes(cfg PluginConfigType) ([]PluginMetricType, e
 
 func (p *mockPlugin) CollectMetrics(mockPluginMetricTypes []PluginMetricType) ([]PluginMetricType, error) {
 	for i := range mockPluginMetricTypes {
-		mockPluginMetricTypes[i].Labels_ = []core.Label{core.Label{Index: 0, Name: "test"}}
+		mockPluginMetricTypes[i].Labels_ = []core.Label{{Index: 0, Name: "test"}}
 		mockPluginMetricTypes[i].Tags_ = map[string]string{"key": "value"}
 	}
 	return mockPluginMetricTypes, nil

control/plugin/collector_test.go

@@ -40,7 +40,7 @@ func (f *MockPlugin) CollectMetrics(_ []PluginMetricType) ([]PluginMetricType, e
 
 func (c *MockPlugin) GetMetricTypes(_ PluginConfigType) ([]PluginMetricType, error) {
 	return []PluginMetricType{
-		PluginMetricType{Namespace_: []string{"foo", "bar"}},
+		{Namespace_: []string{"foo", "bar"}},
 	}, nil
 }
 

mgmt/rest/client/metric.go

@@ -139,7 +139,7 @@ func (g *GetMetricsResult) Len() int {
 
 func convertCatalog(c *rbody.MetricsReturned) []*rbody.Metric {
 	mci := make([]*rbody.Metric, len(*c))
-	for i, _ := range *c {
+	for i := range *c {
 		mci[i] = &(*c)[i]
 	}
 	return mci

mgmt/rest/client/plugin.go

@@ -148,15 +148,15 @@ type AvailablePlugin struct {
 
 func convertLoadedPlugins(r []rbody.LoadedPlugin) []LoadedPlugin {
 	lp := make([]LoadedPlugin, len(r))
-	for i, _ := range r {
+	for i := range r {
 		lp[i] = LoadedPlugin{&r[i]}
 	}
 	return lp
 }
 
 func convertAvailablePlugins(r []rbody.AvailablePlugin) []AvailablePlugin {
 	lp := make([]AvailablePlugin, len(r))
-	for i, _ := range r {
+	for i := range r {
 		lp[i] = AvailablePlugin{&r[i]}
 	}
 	return lp

mgmt/rest/plugin.go

@@ -259,7 +259,7 @@ func (s *Server) unloadPlugin(w http.ResponseWriter, r *http.Request, p httprout
 func (s *Server) getPlugins(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	var detail bool
 	// make this a function because DRY
-	for k, _ := range r.URL.Query() {
+	for k := range r.URL.Query() {
 		if k == "details" {
 			detail = true
 		}

mgmt/rest/task.go

@@ -359,7 +359,7 @@ type TaskWatchHandler struct {
 
 func (t *TaskWatchHandler) CatchCollection(m []core.Metric) {
 	sm := make([]rbody.StreamedMetric, len(m))
-	for i, _ := range m {
+	for i := range m {
 		sm[i] = rbody.StreamedMetric{
 			Namespace: core.JoinNamespace(m[i].Namespace()),
 			Data:      m[i].Data(),

mgmt/tribe/tribe.go

@@ -1088,7 +1088,7 @@ func (t *tribe) handleMemberLeave(n *memberlist.Node) {
 		if m.PluginAgreement != nil {
 			delete(t.agreements[m.PluginAgreement.Name].Members, n.Name)
 		}
-		for k, _ := range m.TaskAgreements {
+		for k := range m.TaskAgreements {
 			delete(t.agreements[k].Members, n.Name)
 		}
 		delete(t.members, n.Name)

plugin/collector/snap-collector-mock1/main_test.go

@@ -34,7 +34,7 @@ import (
 var (
 	PluginName = "snap-collector-mock1"
 	PluginType = "collector"
-	SnapPath  = os.Getenv("SNAP_PATH")
+	SnapPath   = os.Getenv("SNAP_PATH")
 	PluginPath = path.Join(SnapPath, "plugin", PluginName)
 )
 

plugin/collector/snap-collector-mock1/mock/mock.go

@@ -98,7 +98,7 @@ func (f *Mock) GetMetricTypes(cfg plugin.PluginConfigType) ([]plugin.PluginMetri
 	mts = append(mts, plugin.PluginMetricType{Namespace_: []string{"intel", "mock", "bar"}})
 	mts = append(mts, plugin.PluginMetricType{
 		Namespace_: []string{"intel", "mock", "*", "baz"},
-		Labels_:    []core.Label{core.Label{Index: 2, Name: "host"}},
+		Labels_:    []core.Label{{Index: 2, Name: "host"}},
 	})
 	return mts, nil
 }

plugin/collector/snap-collector-mock2/main_test.go

@@ -34,7 +34,7 @@ import (
 var (
 	PluginName = "snap-collector-mock2"
 	PluginType = "collector"
-	SnapPath  = os.Getenv("SNAP_PATH")
+	SnapPath   = os.Getenv("SNAP_PATH")
 	PluginPath = path.Join(SnapPath, "plugin", PluginName)
 )
 

plugin/collector/snap-collector-mock2/mock/mock.go

@@ -91,7 +91,7 @@ func (f *Mock) GetMetricTypes(cfg plugin.PluginConfigType) ([]plugin.PluginMetri
 	mts = append(mts, plugin.PluginMetricType{Namespace_: []string{"intel", "mock", "bar"}})
 	mts = append(mts, plugin.PluginMetricType{
 		Namespace_: []string{"intel", "mock", "*", "baz"},
-		Labels_:    []core.Label{core.Label{Index: 2, Name: "host"}},
+		Labels_:    []core.Label{{Index: 2, Name: "host"}},
 	})
 	return mts, nil
 }

plugin/publisher/snap-publisher-file/main_test.go

@@ -34,7 +34,7 @@ import (
 var (
 	PluginName = "snap-publisher-file"
 	PluginType = "publisher"
-	SnapPath  = os.Getenv("SNAP_PATH")
+	SnapPath   = os.Getenv("SNAP_PATH")
 	PluginPath = path.Join(SnapPath, "plugin", PluginName)
 )