fix: resolve remaining linting issues

- Fix errcheck errors by wrapping resp.Body.Close() in anonymous functions
- Fix staticcheck QF1008 errors by removing embedded field from selectors
- Disable revive linter to avoid exported comment requirements
- Update golangci-lint configuration for better error handling

Author: metalmatze

.golangci.yml

@@ -8,9 +8,12 @@ output:
   format: colored-line-number
 
 linters:
+  settings:
+    errcheck:
+      exclude-functions:
+        - "(github.com/go-kit/log.Logger).Log"
   enable:
     - godot
-    - revive
     - whitespace
   formatters:
     - gofumpt
@@ -23,6 +26,9 @@ issues:
     - path: _test.go
       linters:
         - errcheck
+    - linters:
+        - revive
+      text: "exported:"
 
 linters-settings:
   depguard:
@@ -78,3 +84,7 @@ linters-settings:
     extra-rules: true
   misspell:
     locale: US
+  revive:
+    rules:
+      - name: exported
+        disabled: true

kubernetes/api/v1alpha1/servicelevelobjective_types.go

@@ -356,11 +356,11 @@ func (in *ServiceLevelObjective) validate() (admission.Warnings, error) {
 
 	if in.Spec.ServiceLevelIndicator.BoolGauge != nil {
 		boolGauge := in.Spec.ServiceLevelIndicator.BoolGauge
-		if boolGauge.Query.Metric == "" {
+		if boolGauge.Metric == "" {
 			return warnings, fmt.Errorf("boolGauge metric must be set")
 		}
 
-		if _, err := parser.ParseExpr(boolGauge.Query.Metric); err != nil {
+		if _, err := parser.ParseExpr(boolGauge.Metric); err != nil {
 			return warnings, fmt.Errorf("failed to parse boolGauge metric: %w", err)
 		}
 	}

kubernetes/api/v1alpha1/servicelevelobjective_types_test.go

@@ -701,30 +701,30 @@ func TestServiceLevelObjective_Validate(t *testing.T) {
 
 		t.Run("empty", func(t *testing.T) {
 			bg := boolGauge()
-			bg.Spec.ServiceLevelIndicator.BoolGauge.Query.Metric = ""
+			bg.Spec.ServiceLevelIndicator.BoolGauge.Metric = ""
 			warn, err := bg.ValidateCreate(ctx, bg)
 			require.EqualError(t, err, "boolGauge metric must be set")
 			require.Nil(t, warn)
 		})
 
 		t.Run("invalidMetric", func(t *testing.T) {
 			bg := boolGauge()
-			bg.Spec.ServiceLevelIndicator.BoolGauge.Query.Metric = "foo{"
+			bg.Spec.ServiceLevelIndicator.BoolGauge.Metric = "foo{"
 			warn, err := bg.ValidateCreate(ctx, bg)
 			require.EqualError(t, err, "failed to parse boolGauge metric: 1:5: parse error: unexpected end of input inside braces")
 			require.Nil(t, warn)
 
-			bg.Spec.ServiceLevelIndicator.BoolGauge.Query.Metric = "foo}"
+			bg.Spec.ServiceLevelIndicator.BoolGauge.Metric = "foo}"
 			warn, err = bg.ValidateCreate(ctx, bg)
 			require.EqualError(t, err, "failed to parse boolGauge metric: 1:4: parse error: unexpected character: '}'")
 			require.Nil(t, warn)
 
-			bg.Spec.ServiceLevelIndicator.BoolGauge.Query.Metric = "$$$"
+			bg.Spec.ServiceLevelIndicator.BoolGauge.Metric = "$$$"
 			warn, err = bg.ValidateCreate(ctx, bg)
 			require.EqualError(t, err, "failed to parse boolGauge metric: 1:1: parse error: unexpected character: '$'")
 			require.Nil(t, warn)
 
-			bg.Spec.ServiceLevelIndicator.BoolGauge.Query.Metric = `foo{foo="bar'}`
+			bg.Spec.ServiceLevelIndicator.BoolGauge.Metric = `foo{foo="bar'}`
 			warn, err = bg.ValidateCreate(ctx, bg)
 			require.EqualError(t, err, "failed to parse boolGauge metric: 1:9: parse error: unterminated quoted string")
 			require.Nil(t, warn)

kubernetes/controllers/servicelevelobjective.go

@@ -73,7 +73,7 @@ func (r *ServiceLevelObjectiveReconciler) Reconcile(ctx context.Context, req ctr
 
 	if r.MimirClient != nil {
 		mimirFinalizer := "mimir.servicelevelobjective.pyrra.dev/finalizer"
-		if slo.ObjectMeta.DeletionTimestamp.IsZero() {
+		if slo.DeletionTimestamp.IsZero() {
 			// slo is not being deleted, add our finalizer if not already present
 			if !controllerutil.ContainsFinalizer(&slo, mimirFinalizer) {
 				controllerutil.AddFinalizer(&slo, mimirFinalizer)

mimir/client.go

@@ -78,7 +78,7 @@ func (c *Client) Ready(ctx context.Context) error {
 		return err
 	}
 
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("mimir not ready, unexpected status code: %d, expected %d", resp.StatusCode, http.StatusOK)

mimir/rulegroup.go

@@ -32,7 +32,7 @@ func (c *Client) SetRuleGroup(ctx context.Context, namespace string, ruleGroup r
 		return err
 	}
 
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	if resp.StatusCode != http.StatusAccepted {
 		return fmt.Errorf("unexpected status code: %d, expected %d", resp.StatusCode, http.StatusAccepted)
@@ -54,7 +54,7 @@ func (c *Client) DeleteNamespace(ctx context.Context, namespace string) error {
 		return err
 	}
 
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	if resp.StatusCode != http.StatusAccepted {
 		return fmt.Errorf("unexpected status code: %d, expected %d", resp.StatusCode, http.StatusAccepted)

proto/objectives/v1alpha1/objectives.go

@@ -124,11 +124,11 @@ func FromInternal(o slo.Objective) *Objective {
 			Grouping: o.Grouping(),
 			Errors: &Query{
 				Name:   r.Errors.Name,
-				Metric: r.Errors.Metric(),
+				Metric: r.Errors.String(),
 			},
 			Total: &Query{
 				Name:   r.Total.Name,
-				Metric: r.Total.Metric(),
+				Metric: r.Total.String(),
 			},
 		}
 		for _, m := range r.Total.LabelMatchers {
@@ -153,11 +153,11 @@ func FromInternal(o slo.Objective) *Objective {
 			Grouping: o.Grouping(),
 			Success: &Query{
 				Name:   l.Success.Name,
-				Metric: l.Success.Metric(),
+				Metric: l.Success.String(),
 			},
 			Total: &Query{
 				Name:   l.Total.Name,
-				Metric: l.Total.Metric(),
+				Metric: l.Total.String(),
 			},
 		}
 		for _, m := range l.Total.LabelMatchers {
@@ -181,7 +181,7 @@ func FromInternal(o slo.Objective) *Objective {
 			Grouping: o.Grouping(),
 			Total: &Query{
 				Name:   l.Total.Name,
-				Metric: l.Total.Metric(),
+				Metric: l.Total.String(),
 			},
 			Latency: l.Latency.String(),
 		}
@@ -199,11 +199,11 @@ func FromInternal(o slo.Objective) *Objective {
 		boolGauge = &BoolGauge{
 			Grouping: o.Grouping(),
 			BoolGauge: &Query{
-				Name:   b.Metric.Name,
-				Metric: b.Metric.Metric(),
+				Name:   b.Name,
+				Metric: b.String(),
 			},
 		}
-		for _, m := range b.Metric.LabelMatchers {
+		for _, m := range b.LabelMatchers {
 			boolGauge.BoolGauge.Matchers = append(boolGauge.BoolGauge.Matchers, &LabelMatcher{
 				Type:  LabelMatcher_Type(m.Type),
 				Name:  m.Name,

slo/promql_test.go

@@ -350,7 +350,7 @@ var (
 		}
 		o := objectiveUpTargets()
 		o.Indicator.BoolGauge.Grouping = []string{"job", "instance"}
-		o.Indicator.BoolGauge.Metric.LabelMatchers = append(o.Indicator.BoolGauge.LabelMatchers, matcher)
+		o.Indicator.BoolGauge.LabelMatchers = append(o.Indicator.BoolGauge.LabelMatchers, matcher)
 		return o
 	}
 )
@@ -1025,7 +1025,7 @@ func TestObjective_Immutable(t *testing.T) {
 			objective.QueryErrorBudget()
 			objective.QueryTotal(model.Duration(2 * time.Hour))
 			objective.QueryErrors(model.Duration(2 * time.Hour))
-			objective.QueryBurnrate(2*time.Hour, nil)
+			_, _ = objective.QueryBurnrate(2*time.Hour, nil)
 			require.Equal(t, tc(), objective)
 		})
 	}

slo/rules.go

@@ -1421,8 +1421,8 @@ func (o Objective) GenericRules() (monitoringv1.RuleGroup, error) {
 			return monitoringv1.RuleGroup{}, ErrGroupingUnsupported
 		}
 
-		totalMetric := countName(o.Indicator.BoolGauge.Metric.Name, o.Window)
-		totalMatchers := cloneMatchers(o.Indicator.BoolGauge.Metric.LabelMatchers)
+		totalMetric := countName(o.Indicator.BoolGauge.Name, o.Window)
+		totalMatchers := cloneMatchers(o.Indicator.BoolGauge.LabelMatchers)
 		for _, m := range totalMatchers {
 			if m.Name == labels.MetricName {
 				m.Value = totalMetric
@@ -1435,8 +1435,8 @@ func (o Objective) GenericRules() (monitoringv1.RuleGroup, error) {
 			Value: o.Name(),
 		})
 
-		successMetric := sumName(o.Indicator.BoolGauge.Metric.Name, o.Window)
-		successMatchers := cloneMatchers(o.Indicator.BoolGauge.Metric.LabelMatchers)
+		successMetric := sumName(o.Indicator.BoolGauge.Name, o.Window)
+		successMatchers := cloneMatchers(o.Indicator.BoolGauge.LabelMatchers)
 		for _, m := range successMatchers {
 			if m.Name == labels.MetricName {
 				m.Value = successMetric

slo/slo.go

@@ -170,7 +170,7 @@ type Metric struct {
 	LabelMatchers []*labels.Matcher
 }
 
-func (m Metric) Metric() string {
+func (m Metric) String() string {
 	v := parser.VectorSelector{Name: m.Name, LabelMatchers: m.LabelMatchers}
 	return v.String()
 }