Dependencies update (#4412)

 - Update to go 1.26
 - Update all dependancies (expect Gin)
 - Replace all `ptr.Of()` usage by `new()`

Author: blotus

azure-pipelines.yml

@@ -21,7 +21,7 @@ stages:
           - task: GoTool@0
             displayName: "Install Go"
             inputs:
-                version: '1.25.1'
+                version: '1.26.1'
 
           - pwsh: |
               choco install -y make

build/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.25-alpine3.21 AS build
+FROM docker.io/golang:1.26-alpine3.23 AS build
 
 ARG BUILD_VERSION
 
@@ -28,11 +28,11 @@ RUN make clean release DOCKER_BUILD=1 BUILD_STATIC=1 CGO_CFLAGS="-D_LARGEFILE64_
     cscli parsers install crowdsecurity/whitelists && \
     echo '{"source": "file", "filename": "/does/not/exist", "labels": {"type": "syslog"}}' > /etc/crowdsec/acquis.yaml
 
-    # we create a useless acquis.yaml, which will be overridden by a mounted volume
-    # in most cases, but is still required for the container to start during tests
+# we create a useless acquis.yaml, which will be overridden by a mounted volume
+# in most cases, but is still required for the container to start during tests
 
-    # In case we need to remove agents here..
-    # cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
+# In case we need to remove agents here..
+# cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
 
 FROM docker.io/alpine:3.21 AS slim
 

build/docker/Dockerfile.debian

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.25-bookworm AS build
+FROM docker.io/golang:1.26-trixie AS build
 
 ARG BUILD_VERSION
 
@@ -33,12 +33,12 @@ RUN make clean release DOCKER_BUILD=1 BUILD_STATIC=1 && \
     cscli parsers install crowdsecurity/whitelists && \
     echo '{"source": "file", "filename": "/does/not/exist", "labels": {"type": "syslog"}}' > /etc/crowdsec/acquis.yaml
 
-    # we create a useless acquis.yaml, which will be overridden by a mounted volume
-    # in most cases, but is still required for the container to start during tests
+# we create a useless acquis.yaml, which will be overridden by a mounted volume
+# in most cases, but is still required for the container to start during tests
 
 
-    # In case we need to remove agents here..
-    # cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
+# In case we need to remove agents here..
+# cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
 
 FROM docker.io/debian:bookworm-slim AS slim
 

cmd/crowdsec-cli/cliconsole/console.go

@@ -19,7 +19,6 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
-	"github.com/crowdsecurity/go-cs-lib/ptr"
 	"github.com/crowdsecurity/go-cs-lib/slicetools"
 
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/core/args"
@@ -399,7 +398,7 @@ func (cli *cliConsole) setConsoleOpts(args []string, wanted bool) error {
 				log.Debugf("%s already set to %t", csconfig.CONSOLE_MANAGEMENT, wanted)
 			} else {
 				log.Infof("%s set to %t", csconfig.CONSOLE_MANAGEMENT, wanted)
-				consoleCfg.ConsoleManagement = ptr.Of(wanted)
+				consoleCfg.ConsoleManagement = new(wanted)
 			}
 
 			if cfg.API.Server.OnlineClient.Credentials != nil {
@@ -432,31 +431,31 @@ func (cli *cliConsole) setConsoleOpts(args []string, wanted bool) error {
 				log.Debugf("%s already set to %t", csconfig.SEND_CUSTOM_SCENARIOS, wanted)
 			} else {
 				log.Infof("%s set to %t", csconfig.SEND_CUSTOM_SCENARIOS, wanted)
-				consoleCfg.ShareCustomScenarios = ptr.Of(wanted)
+				consoleCfg.ShareCustomScenarios = new(wanted)
 			}
 		case csconfig.SEND_TAINTED_SCENARIOS:
 			// for each flag check if it's already set before setting it
 			if consoleCfg.ShareTaintedScenarios != nil && *consoleCfg.ShareTaintedScenarios == wanted {
 				log.Debugf("%s already set to %t", csconfig.SEND_TAINTED_SCENARIOS, wanted)
 			} else {
 				log.Infof("%s set to %t", csconfig.SEND_TAINTED_SCENARIOS, wanted)
-				consoleCfg.ShareTaintedScenarios = ptr.Of(wanted)
+				consoleCfg.ShareTaintedScenarios = new(wanted)
 			}
 		case csconfig.SEND_MANUAL_SCENARIOS:
 			// for each flag check if it's already set before setting it
 			if consoleCfg.ShareManualDecisions != nil && *consoleCfg.ShareManualDecisions == wanted {
 				log.Debugf("%s already set to %t", csconfig.SEND_MANUAL_SCENARIOS, wanted)
 			} else {
 				log.Infof("%s set to %t", csconfig.SEND_MANUAL_SCENARIOS, wanted)
-				consoleCfg.ShareManualDecisions = ptr.Of(wanted)
+				consoleCfg.ShareManualDecisions = new(wanted)
 			}
 		case csconfig.SEND_CONTEXT:
 			// for each flag check if it's already set before setting it
 			if consoleCfg.ShareContext != nil && *consoleCfg.ShareContext == wanted {
 				log.Debugf("%s already set to %t", csconfig.SEND_CONTEXT, wanted)
 			} else {
 				log.Infof("%s set to %t", csconfig.SEND_CONTEXT, wanted)
-				consoleCfg.ShareContext = ptr.Of(wanted)
+				consoleCfg.ShareContext = new(wanted)
 			}
 		default:
 			return fmt.Errorf("unknown flag %s", arg)

cmd/crowdsec-cli/clidecision/import.go

@@ -18,8 +18,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/crowdsecurity/go-cs-lib/ptr"
-
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/core/args"
 	"github.com/crowdsecurity/crowdsec/pkg/models"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
@@ -171,13 +169,13 @@ func (cli *cliDecisions) import_(ctx context.Context, input string, duration str
 		}
 
 		decisions[i] = &models.Decision{
-			Value:     ptr.Of(d.Value),
-			Duration:  ptr.Of(d.Duration),
-			Origin:    ptr.Of(types.CscliImportOrigin),
-			Scenario:  ptr.Of(d.Scenario),
-			Type:      ptr.Of(d.Type),
-			Scope:     ptr.Of(d.Scope),
-			Simulated: ptr.Of(false),
+			Value:     new(d.Value),
+			Duration:  new(d.Duration),
+			Origin:    new(types.CscliImportOrigin),
+			Scenario:  new(d.Scenario),
+			Type:      new(d.Type),
+			Scope:     new(d.Scope),
+			Simulated: new(false),
 		}
 	}
 
@@ -227,22 +225,22 @@ func (cli *cliDecisions) import_(ctx context.Context, input string, duration str
 	for chunk := range slices.Chunk(actualDecisions, batch) {
 		importAlert := models.Alert{
 			CreatedAt: time.Now().UTC().Format(time.RFC3339),
-			Scenario:  ptr.Of(fmt.Sprintf("import %s: %d IPs", input, len(chunk))),
+			Scenario:  new(fmt.Sprintf("import %s: %d IPs", input, len(chunk))),
 
-			Message: ptr.Of(""),
+			Message: new(""),
 			Events:  []*models.Event{},
 			Source: &models.Source{
-				Scope: ptr.Of(""),
-				Value: ptr.Of(""),
+				Scope: new(""),
+				Value: new(""),
 			},
-			StartAt:         ptr.Of(time.Now().UTC().Format(time.RFC3339)),
-			StopAt:          ptr.Of(time.Now().UTC().Format(time.RFC3339)),
-			Capacity:        ptr.Of(int32(0)),
-			Simulated:       ptr.Of(false),
-			EventsCount:     ptr.Of(int32(len(chunk))),
-			Leakspeed:       ptr.Of(""),
-			ScenarioHash:    ptr.Of(""),
-			ScenarioVersion: ptr.Of(""),
+			StartAt:         new(time.Now().UTC().Format(time.RFC3339)),
+			StopAt:          new(time.Now().UTC().Format(time.RFC3339)),
+			Capacity:        new(int32(0)),
+			Simulated:       new(false),
+			EventsCount:     new(int32(len(chunk))),
+			Leakspeed:       new(""),
+			ScenarioHash:    new(""),
+			ScenarioVersion: new(""),
 			Decisions:       chunk,
 			Kind:            types.CscliAlertKind.String(),
 		}

cmd/crowdsec-cli/clinotifications/notifications.go

@@ -22,8 +22,6 @@ import (
 	"gopkg.in/tomb.v2"
 	"gopkg.in/yaml.v3"
 
-	"github.com/crowdsecurity/go-cs-lib/ptr"
-
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/core/args"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/core/require"
 	"github.com/crowdsecurity/crowdsec/pkg/apiclient"
@@ -321,34 +319,34 @@ func (cli *cliNotifications) newTestCmd() *cobra.Command {
 				return nil
 			})
 			alert := &models.Alert{
-				Capacity: ptr.Of(int32(0)),
+				Capacity: new(int32(0)),
 				Decisions: []*models.Decision{{
-					Duration: ptr.Of("4h"),
-					Scope:    ptr.Of("Ip"),
-					Value:    ptr.Of("10.10.10.10"),
-					Type:     ptr.Of("ban"),
-					Scenario: ptr.Of("test alert"),
-					Origin:   ptr.Of(types.CscliOrigin),
+					Duration: new("4h"),
+					Scope:    new("Ip"),
+					Value:    new("10.10.10.10"),
+					Type:     new("ban"),
+					Scenario: new("test alert"),
+					Origin:   new(types.CscliOrigin),
 				}},
 				Events:          []*models.Event{},
-				EventsCount:     ptr.Of(int32(1)),
-				Leakspeed:       ptr.Of("0"),
-				Message:         ptr.Of("test alert"),
-				ScenarioHash:    ptr.Of(""),
-				Scenario:        ptr.Of("test alert"),
-				ScenarioVersion: ptr.Of(""),
-				Simulated:       ptr.Of(false),
+				EventsCount:     new(int32(1)),
+				Leakspeed:       new("0"),
+				Message:         new("test alert"),
+				ScenarioHash:    new(""),
+				Scenario:        new("test alert"),
+				ScenarioVersion: new(""),
+				Simulated:       new(false),
 				Source: &models.Source{
 					AsName:   "",
 					AsNumber: "",
 					Cn:       "",
 					IP:       "10.10.10.10",
 					Range:    "",
-					Scope:    ptr.Of("Ip"),
-					Value:    ptr.Of("10.10.10.10"),
+					Scope:    new("Ip"),
+					Value:    new("10.10.10.10"),
 				},
-				StartAt:   ptr.Of(time.Now().UTC().Format(time.RFC3339)),
-				StopAt:    ptr.Of(time.Now().UTC().Format(time.RFC3339)),
+				StartAt:   new(time.Now().UTC().Format(time.RFC3339)),
+				StopAt:    new(time.Now().UTC().Format(time.RFC3339)),
 				CreatedAt: time.Now().UTC().Format(time.RFC3339),
 			}
 			if err := yaml.Unmarshal([]byte(alertOverride), alert); err != nil {
@@ -368,8 +366,8 @@ func (cli *cliNotifications) newTestCmd() *cobra.Command {
 		},
 	}
 	cmd.Flags().StringVarP(&alertOverride, "alert", "a", "",
-		"JSON string used to override alert fields in the generic alert " +
-		"(see crowdsec/pkg/models/alert.go in the source tree for the full definition of the object)")
+		"JSON string used to override alert fields in the generic alert "+
+			"(see crowdsec/pkg/models/alert.go in the source tree for the full definition of the object)")
 
 	return cmd
 }
@@ -489,8 +487,8 @@ cscli notifications reinject <alert_id> -a '{"remediation": true,"scenario":"not
 		},
 	}
 	cmd.Flags().StringVarP(&alertOverride, "alert", "a", "",
-		"JSON string used to override alert fields in the reinjected alert " +
-		"(see crowdsec/pkg/models/alert.go in the source tree for the full definition of the object)")
+		"JSON string used to override alert fields in the reinjected alert "+
+			"(see crowdsec/pkg/models/alert.go in the source tree for the full definition of the object)")
 
 	return cmd
 }

cmd/crowdsec/lpmetrics.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/crowdsecurity/go-cs-lib/ptr"
 	"github.com/crowdsecurity/go-cs-lib/version"
 
 	acquisitionTypes "github.com/crowdsecurity/crowdsec/pkg/acquisition/types"
@@ -213,10 +212,10 @@ func (m *MetricsProvider) gatherPromMetrics(metricsName []string, labelsMap labe
 			}
 
 			item := &models.MetricsDetailItem{
-				Name:   ptr.Of(metricName),
-				Unit:   ptr.Of(unitType),
+				Name:   new(metricName),
+				Unit:   new(unitType),
 				Labels: metricsLabels,
-				Value:  ptr.Of(value),
+				Value:  new(value),
 			}
 			m.logger.Debugf("Gathered metric: %s, item: %+v", metricFamily.GetName(), item)
 			items = append(items, item)
@@ -301,14 +300,14 @@ func (m *MetricsProvider) getAppsecBlockedMetrics() []*models.MetricsDetailItem
 
 func (m *MetricsProvider) metricsPayload() *models.AllMetrics {
 	os := &models.OSversion{
-		Name:    ptr.Of(m.static.osName),
-		Version: ptr.Of(m.static.osVersion),
+		Name:    new(m.static.osName),
+		Version: new(m.static.osVersion),
 	}
 
 	base := models.BaseMetrics{
-		UtcStartupTimestamp: ptr.Of(m.static.startupTS),
+		UtcStartupTimestamp: new(m.static.startupTS),
 		Os:                  os,
-		Version:             ptr.Of(version.String()),
+		Version:             new(version.String()),
 		FeatureFlags:        m.static.featureFlags,
 		Metrics:             make([]*models.DetailedMetrics, 0),
 	}
@@ -321,8 +320,8 @@ func (m *MetricsProvider) metricsPayload() *models.AllMetrics {
 
 	met.Metrics = append(met.Metrics, &models.DetailedMetrics{
 		Meta: &models.MetricsMeta{
-			UtcNowTimestamp:   ptr.Of(time.Now().Unix()),
-			WindowSizeSeconds: ptr.Of(int64(m.interval.Seconds())),
+			UtcNowTimestamp:   new(time.Now().Unix()),
+			WindowSizeSeconds: new(int64(m.interval.Seconds())),
 		},
 		Items: make([]*models.MetricsDetailItem, 0),
 	})