Enable modernize linter (#4750)

SuperQ · web-flow · commit f65627315905 · 2025-11-18T11:46:15.000+01:00
Enable the golangci-lint modernize linter.
* Add exception for the omitempty struct issue.
* Apply modernize fixes.

Signed-off-by: SuperQ &lt;superq@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,6 +5,7 @@ linters:
     - errorlint
     - godot
     - misspell
+    - modernize
     - revive
     - sloglint
     - testifylint
@@ -77,6 +78,9 @@ linters:
       - linters:
           - errcheck
         path: _test.go
+      - linters:
+          - modernize
+        text: "omitzero: Omitempty has no effect on nested struct fields"
     warn-unused: true
 issues:
   max-issues-per-linter: 0
diff --git a/api/api.go b/api/api.go
@@ -118,10 +118,7 @@ func New(opts Options) (*API, error) {
 	}
 	concurrency := opts.Concurrency
 	if concurrency < 1 {
-		concurrency = runtime.GOMAXPROCS(0)
-		if concurrency < 8 {
-			concurrency = 8
-		}
+		concurrency = max(runtime.GOMAXPROCS(0), 8)
 	}
 
 	v2, err := apiv2.NewAPI(
diff --git a/api/v2/api.go b/api/v2/api.go
@@ -20,6 +20,7 @@ import (
 	"log/slog"
 	"net/http"
 	"regexp"
+	"slices"
 	"sort"
 	"sync"
 	"time"
@@ -286,7 +287,7 @@ func (api *API) getAlertsHandler(params alert_ops.GetAlertsParams) middleware.Re
 			receivers = append(receivers, r.RouteOpts.Receiver)
 		}
 
-		if receiverFilter != nil && !receiversMatchFilter(receivers, receiverFilter) {
+		if receiverFilter != nil && !slices.ContainsFunc(receivers, receiverFilter.MatchString) {
 			continue
 		}
 
@@ -474,16 +475,6 @@ func removeEmptyLabels(ls prometheus_model.LabelSet) {
 	}
 }
 
-func receiversMatchFilter(receivers []string, filter *regexp.Regexp) bool {
-	for _, r := range receivers {
-		if filter.MatchString(r) {
-			return true
-		}
-	}
-
-	return false
-}
-
 func alertMatchesFilterLabels(a *prometheus_model.Alert, matchers []*labels.Matcher) bool {
 	sms := make(map[string]string)
 	for name, value := range a.Labels {
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -216,10 +216,7 @@ func Create(
 
 	p.register(reg, name)
 
-	retransmit := len(knownPeers) / 2
-	if retransmit < 3 {
-		retransmit = 3
-	}
+	retransmit := max(len(knownPeers)/2, 3)
 	p.delegate = newDelegate(l, reg, p, retransmit)
 
 	cfg := memberlist.DefaultLANConfig()
diff --git a/cmd/alertmanager/main_test.go b/cmd/alertmanager/main_test.go
@@ -79,7 +79,6 @@ func TestExternalURL(t *testing.T) {
 			err:      true,
 		},
 	} {
-		tc := tc
 		if tc.hostnameResolver == nil {
 			tc.hostnameResolver = func() (string, error) {
 				return hostname, nil
diff --git a/config/config_test.go b/config/config_test.go
@@ -1398,7 +1398,6 @@ func TestUnmarshalHostPort(t *testing.T) {
 			err: true,
 		},
 	} {
-		tc := tc
 		t.Run(tc.in, func(t *testing.T) {
 			hp := HostPort{}
 			err := yaml.Unmarshal([]byte(tc.in), &hp)
diff --git a/config/notifiers.go b/config/notifiers.go
@@ -569,7 +569,7 @@ type IncidentioConfig struct {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (c *IncidentioConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *IncidentioConfig) UnmarshalYAML(unmarshal func(any) error) error {
 	*c = DefaultIncidentioConfig
 	type plain IncidentioConfig
 	if err := unmarshal((*plain)(c)); err != nil {
@@ -1102,7 +1102,7 @@ type MattermostField struct {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface for MattermostField.
-func (c *MattermostField) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *MattermostField) UnmarshalYAML(unmarshal func(any) error) error {
 	type plain MattermostField
 	if err := unmarshal((*plain)(c)); err != nil {
 		return err
@@ -1157,7 +1157,7 @@ type MattermostConfig struct {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (c *MattermostConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *MattermostConfig) UnmarshalYAML(unmarshal func(any) error) error {
 	*c = DefaultMattermostConfig
 	type plain MattermostConfig
 	if err := unmarshal((*plain)(c)); err != nil {
diff --git a/config/receiver/receiver_test.go b/config/receiver/receiver_test.go
@@ -69,7 +69,6 @@ func TestBuildReceiverIntegrations(t *testing.T) {
 			err: true,
 		},
 	} {
-		tc := tc
 		t.Run("", func(t *testing.T) {
 			integrations, err := BuildReceiverIntegrations(tc.receiver, nil, nil)
 			if tc.err {
diff --git a/dispatch/dispatch_test.go b/dispatch/dispatch_test.go
@@ -700,7 +700,7 @@ func TestDispatcherRaceOnFirstAlertNotDeliveredWhenGroupWaitIsZero(t *testing.T)
 	defer dispatcher.Stop()
 
 	// Push all alerts.
-	for i := 0; i < numAlerts; i++ {
+	for i := range numAlerts {
 		alert := newAlert(model.LabelSet{"alertname": model.LabelValue(fmt.Sprintf("Alert_%d", i))})
 		require.NoError(t, alerts.Put(alert))
 	}
diff --git a/featurecontrol/featurecontrol.go b/featurecontrol/featurecontrol.go
@@ -113,7 +113,7 @@ func NewFlags(logger *slog.Logger, features string) (Flagger, error) {
 		return NoopFlags{}, nil
 	}
 
-	for _, feature := range strings.Split(features, ",") {
+	for feature := range strings.SplitSeq(features, ",") {
 		switch feature {
 		case FeatureReceiverNameInMetrics:
 			opts = append(opts, enableReceiverNameInMetrics())
diff --git a/matcher/parse/lexer_test.go b/matcher/parse/lexer_test.go
@@ -759,7 +759,7 @@ func TestLexer_Peek(t *testing.T) {
 // error has occurred.
 func TestLexer_PeekError(t *testing.T) {
 	l := lexer{input: "\"hello"}
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		tok, err := l.peek()
 		require.Equal(t, token{}, tok)
 		require.EqualError(t, err, "0:6: \"hello: missing end \"")
diff --git a/matcher/parse/token.go b/matcher/parse/token.go
@@ -16,6 +16,7 @@ package parse
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 	"unicode/utf8"
 )
@@ -73,12 +74,7 @@ func (t token) isEOF() bool {
 
 // isOneOf returns true if the token is one of the specified kinds.
 func (t token) isOneOf(kinds ...tokenKind) bool {
-	for _, k := range kinds {
-		if k == t.kind {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(kinds, t.kind)
 }
 
 // unquote the value in token. If unquoted returns it unmodified.
diff --git a/nflog/nflog.go b/nflog/nflog.go
@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"maps"
 	"math/rand"
 	"os"
 	"sync"
@@ -159,9 +160,7 @@ type state map[string]*pb.MeshEntry
 
 func (s state) clone() state {
 	c := make(state, len(s))
-	for k, v := range s {
-		c[k] = v
-	}
+	maps.Copy(c, s)
 	return c
 }
 
diff --git a/notify/email/email.go b/notify/email/email.go
@@ -80,7 +80,7 @@ func (n *Email) auth(mechs string) (smtp.Auth, error) {
 	}
 
 	err := &types.MultiError{}
-	for _, mech := range strings.Split(mechs, " ") {
+	for mech := range strings.SplitSeq(mechs, " ") {
 		switch mech {
 		case "CRAM-MD5":
 			secret := string(n.conf.AuthSecret)
diff --git a/notify/email/email_test.go b/notify/email/email_test.go
@@ -300,7 +300,6 @@ func TestEmailNotifyWithErrors(t *testing.T) {
 			hasEmail: true,
 		},
 	} {
-		tc := tc
 		t.Run(tc.title, func(t *testing.T) {
 			if len(tc.errMsg) == 0 {
 				t.Fatal("please define the expected error message")
@@ -579,7 +578,6 @@ func TestEmailNotifyWithAuthentication(t *testing.T) {
 			retry:  true,
 		},
 	} {
-		tc := tc
 		t.Run(tc.title, func(t *testing.T) {
 			emailCfg := &config.EmailConfig{
 				Smarthost: c.Smarthost,
diff --git a/notify/jira/jira_test.go b/notify/jira/jira_test.go
@@ -142,7 +142,6 @@ func TestSearchExistingIssue(t *testing.T) {
 			expectedJQL: `statusCategory != Done and project="PROJ" and labels="ALERT{1}" order by status ASC,resolutiondate DESC`,
 		},
 	} {
-		tc := tc
 		t.Run(tc.title, func(t *testing.T) {
 			expectedJQL = tc.expectedJQL
 			tc.cfg.APIURL = &config.URL{URL: u}
@@ -300,7 +299,6 @@ func TestPrepareSearchRequest(t *testing.T) {
 			expectedURLPath: "/rest/api/2",
 		},
 	} {
-		tc := tc
 		t.Run(tc.title, func(t *testing.T) {
 			tc.cfg.HTTPConfig = &commoncfg.HTTPClientConfig{}
 
@@ -402,8 +400,6 @@ func TestJiraTemplating(t *testing.T) {
 			errMsg: "template: :1: unclosed action",
 		},
 	} {
-		tc := tc
-
 		t.Run(tc.title, func(t *testing.T) {
 			capturedBody = nil
 
@@ -778,8 +774,6 @@ func TestJiraNotify(t *testing.T) {
 			errMsg:             "can't find transition REOPEN for issue OPS-3",
 		},
 	} {
-		tc := tc
-
 		t.Run(tc.title, func(t *testing.T) {
 			srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				switch r.URL.Path {
@@ -1118,8 +1112,6 @@ func TestJiraPriority(t *testing.T) {
 			"Medium",
 		},
 	} {
-		tc := tc
-
 		t.Run(tc.title, func(t *testing.T) {
 			t.Parallel()
 			u, err := url.Parse("http://example.com/")
diff --git a/notify/jira/types.go b/notify/jira/types.go
@@ -15,6 +15,7 @@ package jira
 
 import (
 	"encoding/json"
+	"maps"
 )
 
 type issue struct {
@@ -97,9 +98,7 @@ func (i issueFields) MarshalJSON() ([]byte, error) {
 		jsonFields["status"] = i.Status
 	}
 
-	for key, field := range i.Fields {
-		jsonFields[key] = field
-	}
+	maps.Copy(jsonFields, i.Fields)
 
 	return json.Marshal(jsonFields)
 }
diff --git a/notify/mattermost/mattermost_test.go b/notify/mattermost/mattermost_test.go
@@ -58,7 +58,7 @@ func TestMattermostTemplating(t *testing.T) {
 	// Create a fake HTTP server to simulate the Mattermost webhook
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		dec := json.NewDecoder(r.Body)
-		out := make(map[string]interface{})
+		out := make(map[string]any)
 		err := dec.Decode(&out)
 		if err != nil {
 			panic(err)
diff --git a/notify/opsgenie/opsgenie.go b/notify/opsgenie/opsgenie.go
@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
+	"maps"
 	"net/http"
 	"os"
 	"strings"
@@ -141,9 +142,7 @@ func (n *Notifier) createRequests(ctx context.Context, as ...*types.Alert) ([]*h
 
 	details := make(map[string]string)
 
-	for k, v := range data.CommonLabels {
-		details[k] = v
-	}
+	maps.Copy(details, data.CommonLabels)
 
 	for k, v := range n.conf.Details {
 		details[k] = tmpl(v)
diff --git a/notify/pagerduty/pagerduty_test.go b/notify/pagerduty/pagerduty_test.go
@@ -313,7 +313,6 @@ func TestErrDetails(t *testing.T) {
 			exp: "",
 		},
 	} {
-		tc := tc
 		t.Run("", func(t *testing.T) {
 			err := errDetails(tc.status, tc.body)
 			require.Contains(t, err, tc.exp)
diff --git a/notify/sns/sns_test.go b/notify/sns/sns_test.go
@@ -113,7 +113,6 @@ func TestNotifyWithInvalidTemplate(t *testing.T) {
 			},
 		},
 	} {
-		tc := tc
 		t.Run(tc.title, func(t *testing.T) {
 			snsCfg := &config.SNSConfig{
 				HTTPConfig: &commoncfg.HTTPClientConfig{},
diff --git a/pkg/labels/parse.go b/pkg/labels/parse.go
@@ -127,8 +127,8 @@ func ParseMatcher(s string) (_ *Matcher, err error) {
 		expectTrailingQuote bool
 	)
 
-	if strings.HasPrefix(rawValue, "\"") {
-		rawValue = strings.TrimPrefix(rawValue, "\"")
+	if after, ok := strings.CutPrefix(rawValue, "\""); ok {
+		rawValue = after
 		expectTrailingQuote = true
 	}
 
diff --git a/provider/mem/mem.go b/provider/mem/mem.go
@@ -166,13 +166,6 @@ func (a *Alerts) Close() {
 	}
 }
 
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
 // Subscribe returns an iterator over active alerts that have not been
 // resolved and successfully notified about.
 // They are not guaranteed to be in chronological order.
diff --git a/provider/mem/mem_test.go b/provider/mem/mem_test.go
@@ -221,8 +221,7 @@ func TestAlertsPut(t *testing.T) {
 func TestAlertsSubscribe(t *testing.T) {
 	marker := types.NewMarker(prometheus.NewRegistry())
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 	alerts, err := NewAlerts(ctx, marker, 30*time.Minute, noopCallback{}, promslog.NewNopLogger(), prometheus.NewRegistry())
 	if err != nil {
 		t.Fatal(err)
@@ -246,7 +245,7 @@ func TestAlertsSubscribe(t *testing.T) {
 		wg     sync.WaitGroup
 	)
 	wg.Add(nb)
-	for i := 0; i < nb; i++ {
+	for i := range nb {
 		go func(i int) {
 			defer wg.Done()
 
@@ -576,7 +575,7 @@ func TestAlertsConcurrently(t *testing.T) {
 	}()
 	expire := 10 * time.Millisecond
 	wg := sync.WaitGroup{}
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
diff --git a/silence/silence.go b/silence/silence.go
@@ -25,6 +25,7 @@ import (
 	"os"
 	"reflect"
 	"regexp"
+	"slices"
 	"sort"
 	"sync"
 	"time"
@@ -932,10 +933,8 @@ func QState(states ...types.SilenceState) QueryParam {
 		f := func(sil *pb.Silence, _ *Silences, now time.Time) (bool, error) {
 			s := getState(sil, now)
 
-			for _, ps := range states {
-				if s == ps {
-					return true, nil
-				}
+			if slices.Contains(states, s) {
+				return true, nil
 			}
 			return false, nil
 		}
diff --git a/silence/silence_bench_test.go b/silence/silence_bench_test.go
diff --git a/template/template.go b/template/template.go
diff --git a/template/template_test.go b/template/template_test.go
diff --git a/test/cli/acceptance.go b/test/cli/acceptance.go
diff --git a/test/cli/collector.go b/test/cli/collector.go
diff --git a/test/cli/mock.go b/test/cli/mock.go
diff --git a/test/with_api_v2/collector.go b/test/with_api_v2/collector.go
diff --git a/test/with_api_v2/mock.go b/test/with_api_v2/mock.go
diff --git a/types/types_test.go b/types/types_test.go

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,7 @@ func New(opts Options) (*API, error) {`
`118`	`118`	`}`
`119`	`119`	`concurrency := opts.Concurrency`
`120`	`120`	`if concurrency < 1 {`
`121`		`- concurrency = runtime.GOMAXPROCS(0)`
`122`		`- if concurrency < 8 {`
`123`		`- concurrency = 8`
`124`		`- }`
	`121`	`+ concurrency = max(runtime.GOMAXPROCS(0), 8)`
`125`	`122`	`}`
`126`	`123`
`127`	`124`	`v2, err := apiv2.NewAPI(`
Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ func TestDispatcherRaceOnFirstAlertNotDeliveredWhenGroupWaitIsZero(t *testing.T)`
`700`	`700`	`defer dispatcher.Stop()`
`701`	`701`
`702`	`702`	`// Push all alerts.`
`703`		`- for i := 0; i < numAlerts; i++ {`
	`703`	`+ for i := range numAlerts {`
`704`	`704`	`alert := newAlert(model.LabelSet{"alertname": model.LabelValue(fmt.Sprintf("Alert_%d", i))})`
`705`	`705`	`require.NoError(t, alerts.Put(alert))`
`706`	`706`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func NewFlags(logger *slog.Logger, features string) (Flagger, error) {`
`113`	`113`	`return NoopFlags{}, nil`
`114`	`114`	`}`
`115`	`115`
`116`		`- for _, feature := range strings.Split(features, ",") {`
	`116`	`+ for feature := range strings.SplitSeq(features, ",") {`
`117`	`117`	`switch feature {`
`118`	`118`	`case FeatureReceiverNameInMetrics:`
`119`	`119`	`opts = append(opts, enableReceiverNameInMetrics())`