Fix lint issues

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

.golangci.yml

@@ -18,6 +18,7 @@ linters:
 
 linters-settings:
   errcheck:
-    exclude-functions: []
+    exclude-functions:
+      - (github.com/go-kit/log.Logger).Log
   goimports:
     local-prefixes: "github.com/cortexproject/cortex-tools"

cmd/sim/main.go

@@ -116,8 +116,8 @@ func run(k int, sizer func(float64) int) {
 
 	fmt.Printf("%d, %d, %d, %d, %f, %f\n",
 		k,
-		int(min(nodeSeries)),
-		int(max(nodeSeries)),
+		int(minFloat(nodeSeries)),
+		int(maxFloat(nodeSeries)),
 		int(stat.Mean(nodeSeries, nil)),
 		stat.StdDev(nodeSeries, nil),
 		float64(maxAffectedTenants)/float64(numTenants))
@@ -168,7 +168,7 @@ func shuffleShard(entropy *rand.Rand, shardSize, numReplicas int) []int {
 	return ids
 }
 
-func min(fs []float64) float64 {
+func minFloat(fs []float64) float64 {
 	result := math.MaxFloat64
 	for _, f := range fs {
 		if f < result {
@@ -178,7 +178,7 @@ func min(fs []float64) float64 {
 	return result
 }
 
-func max(fs []float64) float64 {
+func maxFloat(fs []float64) float64 {
 	result := 0.0
 	for _, f := range fs {
 		if f > result {

pkg/rules/compare.go

@@ -131,9 +131,9 @@ func rulesEqual(a, b *rulefmt.RuleNode) bool {
 
 // CompareNamespaces returns the differences between the two provided
 // namespaces
-func CompareNamespaces(original, new RuleNamespace) NamespaceChange {
+func CompareNamespaces(original, updated RuleNamespace) NamespaceChange {
 	result := NamespaceChange{
-		Namespace:     new.Namespace,
+		Namespace:     updated.Namespace,
 		State:         Unchanged,
 		GroupsUpdated: []UpdatedRuleGroup{},
 		GroupsCreated: []rwrulefmt.RuleGroup{},
@@ -145,7 +145,7 @@ func CompareNamespaces(original, new RuleNamespace) NamespaceChange {
 		origMap[g.Name] = g
 	}
 
-	for _, newGroup := range new.Groups {
+	for _, newGroup := range updated.Groups {
 		origGroup, found := origMap[newGroup.Name]
 		if !found {
 			result.State = Updated