Avoid naked returns

linode-obs · Nov 18, 2022 · dfb54d8 · dfb54d8
1 parent d7a2e93
commit dfb54d8
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 75 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -22,6 +22,7 @@ linters:
     - gocritic
     - importas
     - maligned
+    - nakedret
     - prealloc
     - promlinter
     - unconvert
@@ -40,3 +41,5 @@ linters-settings:
     local-prefixes: github.com/cloudflare/pint
   gofumpt:
     extra-rules: true
+  nakedret:
+    max-func-lines: 0
diff --git a/cmd/pint/lint.go b/cmd/pint/lint.go
@@ -119,5 +119,5 @@ func verifyOwners(entries []discovery.Entry) (reports []reporter.Report) {
 			},
 		})
 	}
-	return
+	return reports
 }
diff --git a/internal/checks/alerts_comparison.go b/internal/checks/alerts_comparison.go
@@ -67,7 +67,7 @@ func (c ComparisonCheck) Check(ctx context.Context, path string, rule parser.Rul
 		Severity: Warning,
 	})
 
-	return
+	return problems
 }
 
 func hasComparision(n promParser.Node) *promParser.BinaryExpr {

diff --git a/internal/checks/alerts_count.go b/internal/checks/alerts_count.go
@@ -65,7 +65,7 @@ func (c AlertsCheck) Check(ctx context.Context, path string, rule parser.Rule, e
 			Text:     text,
 			Severity: severity,
 		})
-		return
+		return problems
 	}
 
 	if len(qr.Series.Ranges) > 0 {
@@ -105,5 +105,5 @@ func (c AlertsCheck) Check(ctx context.Context, path string, rule parser.Rule, e
 		Text:     fmt.Sprintf("%s would trigger %d alert(s) in the last %s", promText(c.prom.Name(), qr.URI), alerts, output.HumanizeDuration(delta)),
 		Severity: Information,
 	})
-	return
+	return problems
 }
diff --git a/internal/checks/alerts_for.go b/internal/checks/alerts_for.go
@@ -46,7 +46,7 @@ func (c AlertsForChecksFor) Check(ctx context.Context, path string, rule parser.
 			Text:     fmt.Sprintf("invalid duration: %s", err),
 			Severity: Bug,
 		})
-		return
+		return problems
 	}
 
 	if d == 0 {
@@ -60,5 +60,5 @@ func (c AlertsForChecksFor) Check(ctx context.Context, path string, rule parser.
 		})
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/alerts_template.go b/internal/checks/alerts_template.go
@@ -491,7 +491,7 @@ func checkMetricLabels(msg, name, text string, metricLabels []string, excludeLab
 		}
 	}
 
-	return
+	return msgs
 }
 
 func absentLabels(f utils.PromQLFragment) []string {

diff --git a/internal/checks/base.go b/internal/checks/base.go
@@ -144,7 +144,7 @@ func textAndSeverityFromError(err error, reporter, prom string, s Severity) (tex
 		}
 		severity = s
 	}
-	return
+	return text, severity
 }
 
 func promText(name, uri string) string {

diff --git a/internal/checks/base_test.go b/internal/checks/base_test.go
@@ -531,7 +531,7 @@ func generateSampleStream(labels map[string]string, from, until time.Time, step
 		})
 		from = from.Add(step)
 	}
-	return
+	return s
 }
 
 func checkErrorBadData(name, uri, err string) string {

diff --git a/internal/checks/promql_aggregation.go b/internal/checks/promql_aggregation.go
@@ -76,7 +76,7 @@ func (c AggregationCheck) Check(ctx context.Context, path string, rule parser.Ru
 		})
 	}
 
-	return
+	return problems
 }
 
 func (c AggregationCheck) checkNode(node *parser.PromQLNode) (problems []exprProblem) {
@@ -103,7 +103,7 @@ func (c AggregationCheck) checkNode(node *parser.PromQLNode) (problems []exprPro
 		if !n.Without && !c.keep && len(n.Grouping) == 0 {
 			// most outer aggregation is stripping a label that we want to get rid of
 			// we can skip further checks
-			return
+			return problems
 		}
 
 		var found bool
@@ -132,7 +132,7 @@ func (c AggregationCheck) checkNode(node *parser.PromQLNode) (problems []exprPro
 			// most outer aggregation is stripping a label that we want to get rid of
 			// we can skip further checks
 			if found && !c.keep {
-				return
+				return problems
 			}
 		} else {
 			if found && !c.keep {
@@ -152,7 +152,7 @@ func (c AggregationCheck) checkNode(node *parser.PromQLNode) (problems []exprPro
 			// most outer aggregation is stripping a label that we want to get rid of
 			// we can skip further checks
 			if !found && !c.keep {
-				return
+				return problems
 			}
 		}
 	}
@@ -177,5 +177,5 @@ NEXT:
 		problems = append(problems, c.checkNode(child)...)
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/promql_fragile.go b/internal/checks/promql_fragile.go
@@ -47,7 +47,7 @@ func (c FragileCheck) Check(ctx context.Context, path string, rule parser.Rule,
 			Severity: Warning,
 		})
 	}
-	return
+	return problems
 }
 
 func (c FragileCheck) checkNode(node *parser.PromQLNode) (problems []exprProblem) {
@@ -96,5 +96,5 @@ NEXT:
 		problems = append(problems, c.checkNode(child)...)
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/promql_range_query.go b/internal/checks/promql_range_query.go
@@ -85,7 +85,7 @@ func (c RangeQueryCheck) Check(ctx context.Context, path string, rule parser.Rul
 		})
 	}
 
-	return
+	return problems
 }
 
 func (c RangeQueryCheck) checkNode(ctx context.Context, node *parser.PromQLNode, retention time.Duration, uri string) (problems []exprProblem) {
@@ -104,5 +104,5 @@ func (c RangeQueryCheck) checkNode(ctx context.Context, node *parser.PromQLNode,
 		problems = append(problems, c.checkNode(ctx, child, retention, uri)...)
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/promql_rate.go b/internal/checks/promql_rate.go
@@ -72,7 +72,7 @@ func (c RateCheck) Check(ctx context.Context, path string, rule parser.Rule, ent
 		})
 	}
 
-	return
+	return problems
 }
 
 func (c RateCheck) checkNode(ctx context.Context, node *parser.PromQLNode, cfg *promapi.ConfigResult, done *completedList) (problems []exprProblem) {
@@ -127,7 +127,7 @@ func (c RateCheck) checkNode(ctx context.Context, node *parser.PromQLNode, cfg *
 		problems = append(problems, c.checkNode(ctx, child, cfg, done)...)
 	}
 
-	return
+	return problems
 }
 
 type completedList struct {

diff --git a/internal/checks/promql_regexp.go b/internal/checks/promql_regexp.go
@@ -99,5 +99,5 @@ func (c RegexpCheck) Check(ctx context.Context, path string, rule parser.Rule, e
 		}
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/promql_series.go b/internal/checks/promql_series.go
@@ -411,7 +411,7 @@ func (c SeriesCheck) Check(ctx context.Context, path string, rule parser.Rule, e
 		}
 	}
 
-	return
+	return problems
 }
 
 func (c SeriesCheck) queryProblem(err error, selector string, expr parser.PromQLExpr) Problem {
@@ -507,7 +507,7 @@ func getSelectors(n *parser.PromQLNode) (selectors []promParser.VectorSelector)
 		selectors = append(selectors, getSelectors(child)...)
 	}
 
-	return
+	return selectors
 }
 
 func stripLabels(selector promParser.VectorSelector) promParser.VectorSelector {
@@ -582,7 +582,7 @@ func oldest(ranges []promapi.MetricTimeRange) (ts time.Time) {
 			ts = r.Start
 		}
 	}
-	return
+	return ts
 }
 
 func newest(ranges []promapi.MetricTimeRange) (ts time.Time) {
@@ -591,5 +591,5 @@ func newest(ranges []promapi.MetricTimeRange) (ts time.Time) {
 			ts = r.End
 		}
 	}
-	return
+	return ts
 }
diff --git a/internal/checks/promql_syntax.go b/internal/checks/promql_syntax.go
@@ -41,5 +41,5 @@ func (c SyntaxCheck) Check(ctx context.Context, path string, rule parser.Rule, e
 			Severity: Fatal,
 		})
 	}
-	return
+	return problems
 }
diff --git a/internal/checks/promql_vector_matching.go b/internal/checks/promql_vector_matching.go
@@ -57,7 +57,7 @@ func (c VectorMatchingCheck) Check(ctx context.Context, path string, rule parser
 		})
 	}
 
-	return
+	return problems
 }
 
 func (c VectorMatchingCheck) checkNode(ctx context.Context, node *parser.PromQLNode) (problems []exprProblem) {
@@ -198,7 +198,7 @@ NEXT:
 		problems = append(problems, c.checkNode(ctx, child)...)
 	}
 
-	return
+	return problems
 }
 
 func (c VectorMatchingCheck) seriesLabels(ctx context.Context, query string, ignored ...model.LabelName) (labelSets, error) {

diff --git a/internal/checks/query_cost.go b/internal/checks/query_cost.go
@@ -48,7 +48,7 @@ func (c CostCheck) Check(ctx context.Context, path string, rule parser.Rule, ent
 	expr := rule.Expr()
 
 	if expr.SyntaxError != nil {
-		return
+		return problems
 	}
 
 	query := fmt.Sprintf("count(%s)", expr.Value.Value)
@@ -62,7 +62,7 @@ func (c CostCheck) Check(ctx context.Context, path string, rule parser.Rule, ent
 			Text:     text,
 			Severity: severity,
 		})
-		return
+		return problems
 	}
 
 	var series int
@@ -95,5 +95,5 @@ func (c CostCheck) Check(ctx context.Context, path string, rule parser.Rule, ent
 		Text:     fmt.Sprintf("%s returned %d result(s)%s%s", promText(c.prom.Name(), qr.URI), series, estimate, above),
 		Severity: severity,
 	})
-	return
+	return problems
 }
diff --git a/internal/checks/rule_label.go b/internal/checks/rule_label.go
@@ -44,7 +44,7 @@ func (c LabelCheck) Check(ctx context.Context, path string, rule parser.Rule, en
 		problems = append(problems, c.checkAlertingRule(rule)...)
 	}
 
-	return
+	return problems
 }
 
 func (c LabelCheck) checkRecordingRule(rule parser.Rule) (problems []Problem) {
@@ -58,7 +58,7 @@ func (c LabelCheck) checkRecordingRule(rule parser.Rule) (problems []Problem) {
 				Severity: c.severity,
 			})
 		}
-		return
+		return problems
 	}
 
 	val := rule.RecordingRule.Labels.GetValue(c.key)
@@ -72,12 +72,12 @@ func (c LabelCheck) checkRecordingRule(rule parser.Rule) (problems []Problem) {
 				Severity: c.severity,
 			})
 		}
-		return
+		return problems
 	}
 
 	problems = append(problems, c.checkValue(rule, val)...)
 
-	return
+	return problems
 }
 
 func (c LabelCheck) checkAlertingRule(rule parser.Rule) (problems []Problem) {
@@ -91,7 +91,7 @@ func (c LabelCheck) checkAlertingRule(rule parser.Rule) (problems []Problem) {
 				Severity: c.severity,
 			})
 		}
-		return
+		return problems
 	}
 
 	val := rule.AlertingRule.Labels.GetValue(c.key)
@@ -105,12 +105,12 @@ func (c LabelCheck) checkAlertingRule(rule parser.Rule) (problems []Problem) {
 				Severity: c.severity,
 			})
 		}
-		return
+		return problems
 	}
 
 	problems = append(problems, c.checkValue(rule, val)...)
 
-	return
+	return problems
 }
 
 func (c LabelCheck) checkValue(rule parser.Rule, val *parser.YamlNode) (problems []Problem) {
@@ -123,5 +123,5 @@ func (c LabelCheck) checkValue(rule parser.Rule, val *parser.YamlNode) (problems
 			Severity: c.severity,
 		})
 	}
-	return
+	return problems
 }
diff --git a/internal/checks/rule_link.go b/internal/checks/rule_link.go
@@ -126,5 +126,5 @@ func (c RuleLinkCheck) Check(ctx context.Context, path string, rule parser.Rule,
 		log.Debug().Str("uri", uri).Str("status", resp.Status).Msg("Link request returned a valid status code")
 	}
 
-	return
+	return problems
 }
diff --git a/internal/checks/rule_reject.go b/internal/checks/rule_reject.go
@@ -60,7 +60,7 @@ func (c Reject) Check(ctx context.Context, path string, rule parser.Rule, entrie
 			problems = append(problems, c.reject(rule, ann, "annotation")...)
 		}
 	}
-	return
+	return problems
 }
 
 func (c Reject) reject(rule parser.Rule, label *parser.YamlKeyValue, kind string) (problems []Problem) {
@@ -82,5 +82,5 @@ func (c Reject) reject(rule parser.Rule, label *parser.YamlKeyValue, kind string
 			Severity: c.severity,
 		})
 	}
-	return
+	return problems
 }
diff --git a/internal/checks/template.go b/internal/checks/template.go
@@ -88,7 +88,7 @@ func newTemplateContext(rule parser.Rule) (c TemplateContext) {
 			}
 		}
 	}
-	return
+	return c
 }
 
 type TemplateContext struct {

diff --git a/internal/config/match.go b/internal/config/match.go
@@ -249,15 +249,15 @@ func parseDurationMatch(expr string) (dm durationMatch, err error) {
 	parts := strings.SplitN(expr, opSeparator, 2)
 	if len(parts) == 2 {
 		if dm.op, err = parseMatchOperation(parts[0]); err != nil {
-			return
+			return dm, err
 		}
 		dm.dur, err = parseDuration(parts[1])
 	} else {
 		dm.op = opEqual
 		dm.dur, err = parseDuration(expr)
 	}
 
-	return
+	return dm, err
 }
 
 type durationMatch struct {

diff --git a/internal/config/parser.go b/internal/config/parser.go
@@ -22,5 +22,5 @@ func (p Parser) CompileRelaxed() (r []*regexp.Regexp) {
 	for _, pattern := range p.Relaxed {
 		r = append(r, regexp.MustCompile("^"+pattern+"$"))
 	}
-	return
+	return r
 }