modernize: replace legacy slice/map/range idioms with stdlib (#3658)

mmetc · web-flow · commit 6a8f7c2a0065 · 2025-06-03T13:56:17.000+02:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -194,7 +194,7 @@ linters:
       min-complexity: 16
 
     nlreturn:
-      block-size: 5
+      block-size: 6
 
     nolintlint:
       require-explanation: false  # don't require an explanation for nolint directives
diff --git a/pkg/acquisition/acquisition.go b/pkg/acquisition/acquisition.go
@@ -24,6 +24,7 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwversion/component"
 	"github.com/crowdsecurity/crowdsec/pkg/exprhelpers"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
+	"maps"
 )
 
 type DataSourceUnavailableError struct {
@@ -354,9 +355,7 @@ func copyEvent(evt types.Event, line string) types.Event {
 	evtCopy.Line.Raw = line
 	evtCopy.Line.Labels = make(map[string]string)
 
-	for k, v := range evt.Line.Labels {
-		evtCopy.Line.Labels[k] = v
-	}
+	maps.Copy(evtCopy.Line.Labels, evt.Line.Labels)
 
 	return evtCopy
 }
@@ -388,8 +387,8 @@ func transform(transformChan chan types.Event, output chan types.Event, acquisTo
 			case string:
 				logger.Tracef("transform expression returned %s", v)
 				output <- copyEvent(evt, v)
-			case []interface{}:
-				logger.Tracef("transform expression returned %v", v) //nolint:asasalint // We actually want to log the slice content
+			case []any:
+				logger.Tracef("transform expression returned %v", v) // We actually want to log the slice content
 
 				for _, line := range v {
 					l, ok := line.(string)
diff --git a/pkg/acquisition/modules/cloudwatch/cloudwatch.go b/pkg/acquisition/modules/cloudwatch/cloudwatch.go
@@ -22,6 +22,7 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"
 	"github.com/crowdsecurity/crowdsec/pkg/parser"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
+	"slices"
 )
 
 var openedStreams = prometheus.NewGaugeVec(
@@ -411,7 +412,7 @@ func (cw *CloudwatchSource) LogStreamManager(ctx context.Context, in chan LogStr
 					// stream exists, but is dead, remove it from list
 					if !stream.t.Alive() {
 						cw.logger.Debugf("stream %s already exists, but is dead", newStream.StreamName)
-						cw.monitoredStreams = append(cw.monitoredStreams[:idx], cw.monitoredStreams[idx+1:]...)
+						cw.monitoredStreams = slices.Delete(cw.monitoredStreams, idx, idx+1)
 
 						if cw.metricsLevel != configuration.METRICS_NONE {
 							openedStreams.With(prometheus.Labels{"group": newStream.GroupName}).Dec()
diff --git a/pkg/acquisition/modules/docker/docker.go b/pkg/acquisition/modules/docker/docker.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
+	"slices"
 )
 
 var linesRead = prometheus.NewCounterVec(
@@ -407,10 +408,8 @@ func (d *DockerSource) getContainerLabels(ctx context.Context, containerId strin
 }
 
 func (d *DockerSource) EvalContainer(ctx context.Context, container dockerTypes.Container) *ContainerConfig {
-	for _, containerID := range d.Config.ContainerID {
-		if containerID == container.ID {
-			return &ContainerConfig{ID: container.ID, Name: container.Names[0], Labels: d.Config.Labels, Tty: d.getContainerTTY(ctx, container.ID)}
-		}
+	if slices.Contains(d.Config.ContainerID, container.ID) {
+		return &ContainerConfig{ID: container.ID, Name: container.Names[0], Labels: d.Config.Labels, Tty: d.getContainerTTY(ctx, container.ID)}
 	}
 
 	for _, containerName := range d.Config.ContainerName {
diff --git a/pkg/acquisition/modules/docker/utils.go b/pkg/acquisition/modules/docker/utils.go
@@ -1,6 +1,7 @@
 package dockeracquisition
 
 import (
+	"slices"
 	"strings"
 )
 
@@ -22,10 +23,8 @@ func parseKeyToMap(m map[string]interface{}, key string, value string) {
 		return
 	}
 
-	for i := range parts {
-		if parts[i] == "" {
-			return
-		}
+	if slices.Contains(parts, "") {
+		return
 	}
 
 	for i := 1; i < len(parts)-1; i++ {
diff --git a/pkg/acquisition/modules/http/http_test.go b/pkg/acquisition/modules/http/http_test.go
@@ -544,7 +544,7 @@ func (sr *slowReader) Read(p []byte) (int, error) {
 func assertEvents(out chan types.Event, expected []string, errChan chan error) {
 	readLines := []types.Event{}
 
-	for i := 0; i < len(expected); i++ {
+	for range expected {
 		select {
 		case event := <-out:
 			readLines = append(readLines, event)
diff --git a/pkg/acquisition/modules/loki/internal/lokiclient/loki_client.go b/pkg/acquisition/modules/loki/internal/lokiclient/loki_client.go
@@ -17,6 +17,7 @@ import (
 	"gopkg.in/tomb.v2"
 
 	"github.com/crowdsecurity/crowdsec/pkg/apiclient/useragent"
+	"maps"
 )
 
 type LokiClient struct {
@@ -314,9 +315,7 @@ func (lc *LokiClient) Get(ctx context.Context, url string) (*http.Response, erro
 
 func NewLokiClient(config Config) *LokiClient {
 	headers := make(map[string]string)
-	for k, v := range config.Headers {
-		headers[k] = v
-	}
+	maps.Copy(headers, config.Headers)
 	if config.Username != "" || config.Password != "" {
 		headers["Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(config.Username+":"+config.Password))
 	}
diff --git a/pkg/acquisition/modules/syslog/internal/parser/rfc3164/perf_test.go b/pkg/acquisition/modules/syslog/internal/parser/rfc3164/perf_test.go
@@ -52,7 +52,7 @@ func BenchmarkParse(b *testing.B) {
 	var err error
 	for _, test := range tests {
 		b.Run(string(test.input), func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
+			for b.Loop() {
 				r := NewRFC3164Parser(test.opts...)
 				err = r.Parse(test.input)
 			}
diff --git a/pkg/acquisition/modules/syslog/internal/parser/rfc5424/perf_test.go b/pkg/acquisition/modules/syslog/internal/parser/rfc5424/perf_test.go
@@ -93,7 +93,7 @@ func BenchmarkParse(b *testing.B) {
 	var err error
 	for _, test := range tests {
 		b.Run(test.label, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
+			for b.Loop() {
 				r := NewRFC5424Parser()
 				err = r.Parse(test.input)
 			}
diff --git a/pkg/acquisition/modules/victorialogs/internal/vlclient/vl_client.go b/pkg/acquisition/modules/victorialogs/internal/vlclient/vl_client.go
@@ -18,6 +18,7 @@ import (
 	"gopkg.in/tomb.v2"
 
 	"github.com/crowdsecurity/crowdsec/pkg/apiclient/useragent"
+	"maps"
 )
 
 type VLClient struct {
@@ -386,9 +387,7 @@ func (lc *VLClient) Get(ctx context.Context, url string) (*http.Response, error)
 
 func NewVLClient(config Config) *VLClient {
 	headers := make(map[string]string)
-	for k, v := range config.Headers {
-		headers[k] = v
-	}
+	maps.Copy(headers, config.Headers)
 
 	if config.Username != "" || config.Password != "" {
 		headers["Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(config.Username+":"+config.Password))
diff --git a/pkg/apiclient/auth_retry.go b/pkg/apiclient/auth_retry.go
@@ -3,6 +3,7 @@ package apiclient
 import (
 	"math/rand"
 	"net/http"
+	"slices"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -19,13 +20,7 @@ type retryRoundTripper struct {
 }
 
 func (r retryRoundTripper) ShouldRetry(statusCode int) bool {
-	for _, code := range r.retryStatusCodes {
-		if code == statusCode {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(r.retryStatusCodes, statusCode)
 }
 
 func (r retryRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
diff --git a/pkg/apiclient/clone.go b/pkg/apiclient/clone.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"net/http"
+	"slices"
 )
 
 // cloneRequest returns a clone of the provided *http.Request. The clone is a
@@ -16,7 +17,7 @@ func cloneRequest(r *http.Request) *http.Request {
 	r2.Header = make(http.Header, len(r.Header))
 
 	for k, s := range r.Header {
-		r2.Header[k] = append([]string(nil), s...)
+		r2.Header[k] = slices.Clone(s)
 	}
 
 	if r.Body != nil {
diff --git a/pkg/apiserver/papi.go b/pkg/apiserver/papi.go
@@ -352,11 +352,7 @@ func (p *Papi) SendDeletedDecisions(ctx context.Context, cacheOrig *models.Decis
 	batchSize := 50
 
 	for start := 0; start < len(cache); start += batchSize {
-		end := start + batchSize
-
-		if end > len(cache) {
-			end = len(cache)
-		}
+		end := min(start+batchSize, len(cache))
 
 		if err := p.sendDeletedDecisionsBatch(ctx, cache[start:end]); err != nil {
 			p.Logger.Errorf("sending deleted decisions to central API: %s", err)
diff --git a/pkg/appsec/appsec_rules_collection.go b/pkg/appsec/appsec_rules_collection.go
@@ -30,9 +30,9 @@ type AppsecCollectionConfig struct {
 	SecLangRules      []string                 `yaml:"seclang_rules"`
 	Rules             []appsec_rule.CustomRule `yaml:"rules"`
 
-	Labels map[string]interface{} `yaml:"labels"` // Labels is K:V list aiming at providing context the overflow
+	Labels map[string]any `yaml:"labels"` // Labels is K:V list aiming at providing context the overflow
 
-	Data    interface{} `yaml:"data"` // Ignore it
+	Data    any `yaml:"data"` // Ignore it
 	hash    string
 	version string
 }
@@ -84,7 +84,7 @@ func LoadCollection(pattern string, logger *log.Entry) ([]AppsecCollection, erro
 					continue
 				}
 
-				for _, line := range strings.Split(string(c), "\n") {
+				for line := range strings.SplitSeq(string(c), "\n") {
 					if strings.HasPrefix(line, "#") {
 						continue
 					}
@@ -110,6 +110,7 @@ func LoadCollection(pattern string, logger *log.Entry) ([]AppsecCollection, erro
 					logger.Errorf("unable to convert rule %s : %s", appsecRule.Name, err)
 					return nil, err
 				}
+
 				logger.Debugf("Adding rule %s", strRule)
 				appsecCol.Rules = append(appsecCol.Rules, strRule)
 
@@ -130,11 +131,14 @@ func LoadCollection(pattern string, logger *log.Entry) ([]AppsecCollection, erro
 				}
 			}
 		}
+
 		ret = append(ret, appsecCol)
 	}
+
 	if len(ret) == 0 {
 		return nil, fmt.Errorf("no appsec-rules found for pattern %s", pattern)
 	}
+
 	return ret, nil
 }
 
@@ -143,5 +147,6 @@ func (w AppsecCollection) String() string {
 	for _, rule := range w.Rules {
 		ret += rule + "\n"
 	}
+
 	return ret
 }
diff --git a/pkg/appsec/coraza_logger.go b/pkg/appsec/coraza_logger.go
@@ -3,10 +3,10 @@ package appsec
 import (
 	"fmt"
 	"io"
-
-	log "github.com/sirupsen/logrus"
+	"maps"
 
 	dbg "github.com/corazawaf/coraza/v3/debuglog"
+	log "github.com/sirupsen/logrus"
 )
 
 var DebugRules = map[int]bool{}
@@ -95,7 +95,7 @@ func (e *crzLogEvent) Int(key string, i int) dbg.Event {
 		}
 		// this allows us to have per-rule debug logging
 		e.muted = false
-		e.fields = map[string]interface{}{}
+		e.fields = map[string]any{}
 		e.level = log.DebugLevel
 	}
 
@@ -143,12 +143,10 @@ func (c *crzLogger) NewMutedEvt(lvl log.Level) dbg.Event {
 }
 
 func (c *crzLogger) NewEvt(lvl log.Level) dbg.Event {
-	evt := &crzLogEvent{fields: map[string]interface{}{}, logger: c.logger, level: lvl}
+	evt := &crzLogEvent{fields: map[string]any{}, logger: c.logger, level: lvl}
 
 	if c.defaultFields != nil {
-		for k, v := range c.defaultFields {
-			evt.fields[k] = v
-		}
+		maps.Copy(evt.fields, c.defaultFields)
 	}
 
 	return evt
diff --git a/pkg/appsec/request.go b/pkg/appsec/request.go
diff --git a/pkg/csconfig/simulation.go b/pkg/csconfig/simulation.go
diff --git a/pkg/csplugin/broker.go b/pkg/csplugin/broker.go
diff --git a/pkg/exprhelpers/debugger.go b/pkg/exprhelpers/debugger.go
diff --git a/pkg/exprhelpers/helpers.go b/pkg/exprhelpers/helpers.go
diff --git a/pkg/types/appsec_event.go b/pkg/types/appsec_event.go

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"`
`27`	`27`	`"github.com/crowdsecurity/crowdsec/pkg/types"`
	`28`	`+ "slices"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`var linesRead = prometheus.NewCounterVec(`
`@@ -407,10 +408,8 @@ func (d *DockerSource) getContainerLabels(ctx context.Context, containerId strin`
`407`	`408`	`}`
`408`	`409`
`409`	`410`	`func (d DockerSource) EvalContainer(ctx context.Context, container dockerTypes.Container) ContainerConfig {`
`410`		`- for _, containerID := range d.Config.ContainerID {`
`411`		`- if containerID == container.ID {`
`412`		`- return &ContainerConfig{ID: container.ID, Name: container.Names[0], Labels: d.Config.Labels, Tty: d.getContainerTTY(ctx, container.ID)}`
`413`		`- }`
	`411`	`+ if slices.Contains(d.Config.ContainerID, container.ID) {`
	`412`	`+ return &ContainerConfig{ID: container.ID, Name: container.Names[0], Labels: d.Config.Labels, Tty: d.getContainerTTY(ctx, container.ID)}`
`414`	`413`	`}`
`415`	`414`
`416`	`415`	`for _, containerName := range d.Config.ContainerName {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package dockeracquisition`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "slices"`
`4`	`5`	`"strings"`
`5`	`6`	`)`
`6`	`7`
`@@ -22,10 +23,8 @@ func parseKeyToMap(m map[string]interface{}, key string, value string) {`
`22`	`23`	`return`
`23`	`24`	`}`
`24`	`25`
`25`		`- for i := range parts {`
`26`		`- if parts[i] == "" {`
`27`		`- return`
`28`		`- }`
	`26`	`+ if slices.Contains(parts, "") {`
	`27`	`+ return`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`for i := 1; i < len(parts)-1; i++ {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func BenchmarkParse(b *testing.B) {`
`52`	`52`	`var err error`
`53`	`53`	`for _, test := range tests {`
`54`	`54`	`b.Run(string(test.input), func(b *testing.B) {`
`55`		`- for i := 0; i < b.N; i++ {`
	`55`	`+ for b.Loop() {`
`56`	`56`	`r := NewRFC3164Parser(test.opts...)`
`57`	`57`	`err = r.Parse(test.input)`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func BenchmarkParse(b *testing.B) {`
`93`	`93`	`var err error`
`94`	`94`	`for _, test := range tests {`
`95`	`95`	`b.Run(test.label, func(b *testing.B) {`
`96`		`- for i := 0; i < b.N; i++ {`
	`96`	`+ for b.Loop() {`
`97`	`97`	`r := NewRFC5424Parser()`
`98`	`98`	`err = r.Parse(test.input)`
`99`	`99`	`}`