Merge branch 'master' into flush/agents

Author: sabban

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,4 +81,4 @@ jobs:
        make clean build BUILD_RE2_WASM=1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3

.github/workflows/docker-tests.yml

@@ -39,7 +39,7 @@ jobs:
           buildkitd-config: .github/buildkit.toml
 
       - name: "Build image"
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: .
           file: ./build/docker/Dockerfile${{ matrix.flavor == 'debian' && '.debian' || '' }}
@@ -54,7 +54,7 @@ jobs:
         run: docker network create net-test
 
       - name: Install uv
-        uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
+        uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
         with:
           version: 0.5.24
           enable-cache: true

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

@@ -58,6 +58,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
       with:
-        version: v2.8
+        version: v2.9
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.github/workflows/go-tests.yml

@@ -214,6 +214,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
       with:
-        version: v2.8
+        version: v2.9
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.github/workflows/publish-docker.yml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Build and push image (slim)
         if: ${{ inputs.slim }}
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: .
           file: ./build/docker/Dockerfile${{ inputs.debian && '.debian' || '' }}
@@ -108,7 +108,7 @@ jobs:
             BUILD_VERSION=${{ inputs.crowdsec_version }}
 
       - name: Build and push image (full)
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: .
           file: ./build/docker/Dockerfile${{ inputs.debian && '.debian' || '' }}

.github/workflows/version.yml

@@ -9,6 +9,10 @@ on:
         description: "CrowdSec version/tag to deploy (e.g. v1.6.0). Leave empty to deploy latest release."
         required: false
         type: string
+      date:
+        description: "Deployment date (YYYY-MM-DDTHH:MM:SSZ). Cannot be empty if version is not empty."
+        required: false
+        type: string
 
 jobs:
   deploy:
@@ -19,32 +23,42 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4
         with:
           node-version: 20
 
       - name: Pick CrowdSec version
         id: pick_version
         env:
           INPUT_VERSION: ${{ inputs.version }}
+          INPUT_DATE: ${{ inputs.date }}
           GH_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
 
+          if [ -n "${INPUT_VERSION:-}" ] && [ -z "${INPUT_DATE:-}" ]; then
+            echo "Error: If version is provided, date must also be provided." >&2
+            exit 1
+          fi
+
           if [ -n "${INPUT_VERSION:-}" ]; then
             TAG="${INPUT_VERSION}"
+            DATE="${INPUT_DATE}"
           else
             # latest non-prerelease tag
-            TAG="$(gh release list --json tagName --exclude-pre-releases --limit 1 | jq -r '.[0].tagName')"
+            JSON_CONTENT="$(gh release list --json tagName,publishedAt --exclude-pre-releases --limit 1)"
+            TAG="$(echo "$JSON_CONTENT" | jq -r '.[0].tagName')"
+            DATE="$(echo "$JSON_CONTENT" | jq -r '.[0].publishedAt')"
           fi
 
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "date=$DATE" >> "$GITHUB_OUTPUT"
 
       - name: Write dist artifact
         run: |
           set -euo pipefail
           mkdir -p ./dist
-          echo '{"name":"${{ steps.pick_version.outputs.tag }}"}' > ./dist/latest
+          echo '{"name":"${{ steps.pick_version.outputs.tag }}", "tag_name":"${{ steps.pick_version.outputs.tag }}", "published_at":"${{ steps.pick_version.outputs.date }}"}' > ./dist/latest
           cat ./dist/latest
 
       # Deploy the build output directory (adjust ./dist to your framework output)

.golangci.yml

@@ -597,11 +597,6 @@ linters:
         path: cmd/crowdsec/win_service.go
         text: 'deep-exit: .*'
 
-      - linters:
-          - revive
-        path: cmd/crowdsec/flags.go
-        text: 'deep-exit: .*'
-
       - linters:
           - revive
         path: cmd/crowdsec-cli/clisetup/setup/systemd_test.go

build/docker/test/.python-version

@@ -1 +1 @@
-3.12
+3.14

build/docker/test/pyproject.toml

@@ -3,7 +3,7 @@ name = "crowdsec-docker-tests"
 version = "0.1.0"
 description = "Docker tests for Crowdsec"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.14"
 dependencies = [
     "pytest>=8.3.4",
     "pytest-cs>=0.7.24",

build/docker/test/tests/conftest.py

@@ -1,4 +1,10 @@
-from _pytest.config import Config
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from _pytest.config import Config
 
 pytest_plugins = ("cs",)