Bump golangci-lint to v2.9.0

Author: martialblog

.github/workflows/golangci-lint.yml

@@ -17,4 +17,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.1.6
+          version: v2.9.0

.golangci.yml

@@ -3,7 +3,10 @@ run:
   tests: false
 linters:
   default: all
+  enable:
+    - wsl_v5
   disable:
+    - wsl
     - cyclop
     - depguard
     - err113
@@ -25,6 +28,13 @@ linters:
     - varnamelen
     - wrapcheck
     - funlen
+  settings:
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: true
+      branch-max-lines: 2
+      disable:
+        - err
   exclusions:
     generated: lax
     presets:

cmd/alert.go

@@ -100,6 +100,7 @@ inactive = 0`,
 			if cliAlertConfig.AlertName != nil {
 				check.ExitRaw(check.Unknown, "No such alert defined", "|", pdlist.String())
 			}
+
 			check.ExitRaw(noAlertsState, "No alerts defined", "|", pdlist.String())
 		}
 

cmd/config.go

@@ -90,6 +90,7 @@ func (c *Config) NewClient() *client.Client {
 	// Using a Bearer Token for authentication
 	if c.Bearer != "" {
 		var t = config.NewInlineSecret(c.Bearer)
+
 		rt = config.NewAuthorizationCredentialsRoundTripper("Bearer", t, rt)
 	}
 

cmd/health.go

@@ -29,6 +29,7 @@ Ready: Checks the readiness of an endpoint, which returns OK if the Prometheus s
 
 		// Creating an client and connecting to the API
 		c := cliConfig.NewClient()
+
 		err := c.Connect()
 		if err != nil {
 			check.ExitError(err)
@@ -61,6 +62,7 @@ Ready: Checks the readiness of an endpoint, which returns OK if the Prometheus s
 			if err != nil {
 				check.ExitError(err)
 			}
+
 			partialResult := result.NewPartialResult()
 
 			_ = partialResult.SetState(rc)

cmd/query.go

@@ -79,6 +79,7 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 		}
 
 		c := cliConfig.NewClient()
+
 		err = c.Connect()
 		if err != nil {
 			check.ExitError(err)
@@ -93,6 +94,7 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 			if strings.Contains(err.Error(), "unmarshalerDecoder: unexpected value type \"string\"") {
 				err = errors.New("string value results are not supported")
 			}
+
 			check.ExitError(err)
 		}
 
@@ -112,10 +114,8 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 		case model.ValVector:
 			// Instant vector - a set of time series containing a single sample for each time series, all sharing the same timestamp
 			vectorVal := result.(model.Vector)
-
 			// Set initial capacity to reduce memory allocations
 			for _, sample := range vectorVal {
-
 				numberValue := float64(sample.Value)
 				partial := goresult.NewPartialResult()
 
@@ -185,6 +185,7 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 			appendum := fmt.Sprintf("HTTP Warnings: %v", strings.Join(warnings, ", "))
 			overall.Summary = overall.GetOutput() + appendum
 		}
+
 		check.ExitRaw(overall.GetStatus(), overall.GetOutput())
 	},
 }

cmd/root.go

@@ -24,7 +24,9 @@ func Execute(version string) {
 	rootCmd.Version = version
 	rootCmd.VersionTemplate()
 
-	if err := rootCmd.Execute(); err != nil {
+	err := rootCmd.Execute()
+
+	if err != nil {
 		check.ExitError(err)
 	}
 }

internal/alert/alert.go

@@ -16,7 +16,7 @@ const (
 	alertnameLabelKey = "alertname"
 )
 
-// Internal representation of Prometheus Rules.
+// Rule is the internal representation of a Prometheus Rules.
 // Alert attribute will be used when iterating over multiple AlertingRules.
 type Rule struct {
 	AlertingRule v1.AlertingRule
@@ -139,7 +139,6 @@ func (a *Rule) GetOutput() (output string) {
 	// Add current value to output
 	value, _ = strconv.ParseFloat(a.Alert.Value, 32)
 	out.WriteString(fmt.Sprintf(" is %s - value: %.2f", a.AlertingRule.State, value))
-
 	// Add labels to the output
 	l, err := json.Marshal(a.Alert.Labels)
 

internal/client/client.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"fmt"
+	"maps"
 	"net/http"
 	"net/url"
 	"strings"
@@ -31,7 +32,6 @@ func (c *Client) Connect() error {
 		Address:      c.URL,
 		RoundTripper: c.RoundTripper,
 	})
-
 	if err != nil {
 		return fmt.Errorf("error creating client: %w", err)
 	}
@@ -113,10 +113,7 @@ func cloneRequest(r *http.Request) *http.Request {
 	r2 := new(http.Request)
 	*r2 = *r
 	// Deep copy of the Header.
-	r2.Header = make(http.Header)
-	for k, s := range r.Header {
-		r2.Header[k] = s
-	}
+	maps.Copy(r.Header, r2.Header)
 
 	return r2
 }