Merge branch 'master' into releases/1.6.x

Author: mmetc

.github/workflows/docker-tests.yml

@@ -70,6 +70,7 @@ jobs:
           cd docker/test
           uv sync --all-extras --dev --locked
           uv run ruff check
+          uv run basedpyright
           uv run pytest tests -n 1 --durations=0 --color=yes
         env:
           CROWDSEC_TEST_VERSION: test

.github/workflows/go-tests-windows.yml

@@ -61,6 +61,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.63
+        version: v1.64
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.github/workflows/go-tests.yml

@@ -184,11 +184,9 @@ jobs:
       run: |
         make build BUILD_PROFILE=minimal
 
-    - name: Run tests again, dynamic
+    - name: Ensure we can do a dynamic build, without tests
       run: |
         make clean build
-        set -o pipefail
-        make go-acc | sed 's/ *coverage:.*of statements in.*//' | richgo testfilter
 
     - name: Upload unit coverage to Codecov
       uses: codecov/codecov-action@v4
@@ -200,6 +198,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.63
+        version: v1.64
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.golangci.yml

@@ -213,7 +213,6 @@ linters-settings:
   gocritic:
     enable-all: true
     disabled-checks:
-      - typeDefFirst
       - paramTypeCombine
       - httpNoBody
       - ifElseChain
@@ -241,7 +240,7 @@ linters:
     #
     # DEPRECATED by golangi-lint
     #
-    - exportloopref
+    - tenv
 
     #
     # Redundant
@@ -494,6 +493,11 @@ issues:
       text: "argument-limit: .*"
 
     # need some cleanup first: to create db in memory and share the client, not the config
+    - linters:
+        - usetesting
+      path: "(.+)_test.go"
+      text: "context.Background.*"
+
     - linters:
         - usetesting
       path: "pkg/apiserver/(.+)_test.go"

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.23-alpine3.21 AS build
+FROM docker.io/golang:1.24-alpine3.21 AS build
 
 ARG BUILD_VERSION
 

Dockerfile.debian

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.23-bookworm AS build
+FROM docker.io/golang:1.24-bookworm AS build
 
 ARG BUILD_VERSION
 

azure-pipelines.yml

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

cmd/crowdsec-cli/args/args.go

@@ -0,0 +1,27 @@
+package args
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+func MinimumNArgs(n int) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) < n {
+			cmd.Help() //nolint:errcheck
+			return fmt.Errorf("requires at least %d arg(s), only received %d", n, len(args))
+		}
+		return nil
+	}
+}
+
+func ExactArgs(n int) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) != n {
+			cmd.Help() //nolint:errcheck
+			return fmt.Errorf("accepts %d arg(s), received %d", n, len(args))
+		}
+		return nil
+	}
+}

cmd/crowdsec-cli/clialert/alerts.go

@@ -29,6 +29,13 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/types"
 )
 
+type configGetter func() *csconfig.Config
+
+type cliAlerts struct {
+	client *apiclient.ApiClient
+	cfg    configGetter
+}
+
 func decisionsFromAlert(alert *models.Alert) string {
 	ret := ""
 	decMap := make(map[string]int)
@@ -183,13 +190,6 @@ func (cli *cliAlerts) displayOneAlert(alert *models.Alert, withDetail bool) erro
 	return nil
 }
 
-type configGetter func() *csconfig.Config
-
-type cliAlerts struct {
-	client *apiclient.ApiClient
-	cfg    configGetter
-}
-
 func New(getconfig configGetter) *cliAlerts {
 	return &cliAlerts{
 		cfg: getconfig,