fix reserved words used as variable names

Author: knopers8

common/gera/map_test.go

@@ -250,18 +250,18 @@ pdp_workflow_parameters: ""
 		})
 
 		It("should correctly return a copy of the whole structure", func() {
-			copy := stringMap.Copy()
-			Expect(copy).NotTo(BeNil())
-			Expect(copy == stringMap).NotTo(BeTrue())
-			Expect(copy).To(Equal(stringMap))
-			Expect(copy.Raw()).To(Equal(stringMap.Raw()))
-			Expect(copy.Len()).To(Equal(stringMap.Len()))
-			copy.Set("detector", "test")
-			Expect(copy).NotTo(Equal(stringMap))
-			Expect(copy.Raw()).NotTo(Equal(stringMap.Raw()))
-			Expect(copy.Len()).To(Equal(stringMap.Len()))
-			copy.Set("detector2", "test2")
-			Expect(copy.Len()).To(Equal(stringMap.Len() + 1))
+			mapCopy := stringMap.Copy()
+			Expect(mapCopy).NotTo(BeNil())
+			Expect(mapCopy == stringMap).NotTo(BeTrue())
+			Expect(mapCopy).To(Equal(stringMap))
+			Expect(mapCopy.Raw()).To(Equal(stringMap.Raw()))
+			Expect(mapCopy.Len()).To(Equal(stringMap.Len()))
+			mapCopy.Set("detector", "test")
+			Expect(mapCopy).NotTo(Equal(stringMap))
+			Expect(mapCopy.Raw()).NotTo(Equal(stringMap.Raw()))
+			Expect(mapCopy.Len()).To(Equal(stringMap.Len()))
+			mapCopy.Set("detector2", "test2")
+			Expect(mapCopy.Len()).To(Equal(stringMap.Len() + 1))
 		})
 
 		It("should correctly return a copy of the underlying map", func() {

common/monitoring/metricsreservoirsampling.go

@@ -88,16 +88,16 @@ func (this *MetricsReservoirSampling) GetMetrics() []Metric {
 	for key, reservoirMetric := range this.metricsBuckets {
 		m := Metric{name: reservoirMetric.metric.name, tags: reservoirMetric.metric.tags, timestamp: key.timestamp}
 
-		mean, median, min, p10, p30, p70, p90, max, count, poolSize := reservoirMetric.reservoir.GetStats()
+		mean, median, minimum, p10, p30, p70, p90, maximum, count, poolSize := reservoirMetric.reservoir.GetStats()
 
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_mean", mean)
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_median", median)
-		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_min", min)
+		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_min", minimum)
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_p10", p10)
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_p30", p30)
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_p70", p70)
 		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_p90", p90)
-		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_max", max)
+		m.SetFieldFloat64(reservoirMetric.reservoir.name+"_max", maximum)
 		m.SetFieldUInt64(reservoirMetric.reservoir.name+"_count", count)
 		m.SetFieldUInt64(reservoirMetric.reservoir.name+"_poolsize", poolSize)
 

common/monitoring/monitoring_test.go

@@ -382,7 +382,7 @@ func TestApproximateHistogram(t *testing.T) {
 		histo.AddPoint(10)
 	}
 
-	mean, median, min, p10, p30, p70, p90, max, count, poolSize := histo.GetStats()
+	mean, median, minimum, p10, p30, p70, p90, maximum, count, poolSize := histo.GetStats()
 
 	if count != 20 {
 		t.Errorf("wrong count before reset, expected 20, got %d", count)
@@ -392,7 +392,7 @@ func TestApproximateHistogram(t *testing.T) {
 		t.Errorf("wrong poolSize, expected 20, got %d", poolSize)
 	}
 
-	if mean != 10 || median != 10 || min != 10 || p10 != 10 || p30 != 10 || p70 != 10 || p90 != 10 || max != 10 {
+	if mean != 10 || median != 10 || minimum != 10 || p10 != 10 || p30 != 10 || p70 != 10 || p90 != 10 || maximum != 10 {
 		t.Errorf("one of the values is not 10 when it should be 10, mean %v, median %v, 10p %v, 30p %v, 70p %v, 90p %v", mean, median, p10, p30, p70, p90)
 	}
 

core/server.go

@@ -171,9 +171,9 @@ func (m *RpcServer) GetFrameworkInfo(context.Context, *pb.GetFrameworkInfoReques
 	m.logMethod()
 	defer m.logMethodHandled()
 
-	maj, _ := strconv.ParseInt(product.VERSION_MAJOR, 10, 32)
-	min, _ := strconv.ParseInt(product.VERSION_MINOR, 10, 32)
-	pat, _ := strconv.ParseInt(product.VERSION_PATCH, 10, 32)
+	major, _ := strconv.ParseInt(product.VERSION_MAJOR, 10, 32)
+	minor, _ := strconv.ParseInt(product.VERSION_MINOR, 10, 32)
+	patch, _ := strconv.ParseInt(product.VERSION_PATCH, 10, 32)
 
 	availableDetectors, activeDetectors, allDetectors, err := m.listDetectors()
 	if err != nil {
@@ -190,9 +190,9 @@ func (m *RpcServer) GetFrameworkInfo(context.Context, *pb.GetFrameworkInfoReques
 		HostsCount:        int32(m.state.taskman.AgentCache.Count()),
 		InstanceName:      viper.GetString("instanceName"),
 		Version: &pb.Version{
-			Major:       int32(maj),
-			Minor:       int32(min),
-			Patch:       int32(pat),
+			Major:       int32(major),
+			Minor:       int32(minor),
+			Patch:       int32(patch),
 			Build:       product.BUILD,
 			VersionStr:  product.VERSION,
 			ProductName: product.PRETTY_SHORTNAME,