Merge branch 'master' into appsec-handle-chunked-requests

Author: mmetc

.github/workflows/bats-hub.yml

@@ -33,7 +33,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: "Install bats dependencies"
       env:

.github/workflows/bats-mysql.yml

@@ -36,7 +36,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: "Install bats dependencies"
       env:

.github/workflows/bats-postgres.yml

@@ -45,7 +45,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: "Install bats dependencies"
       env:

.github/workflows/bats-sqlite-coverage.yml

@@ -31,7 +31,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: "Install bats dependencies"
       env:

.github/workflows/ci-windows-build-msi.yml

@@ -35,7 +35,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: Build
       run: make windows_installer BUILD_RE2_WASM=1

.github/workflows/codeql-analysis.yml

@@ -52,7 +52,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
         cache-dependency-path: "**/go.sum"
 
     # Initializes the CodeQL tools for scanning.

.github/workflows/docker-tests.yml

@@ -49,28 +49,31 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=min
 
-      - name: "Setup Python"
+      - name: "Create Docker network"
+        run: docker network create net-test
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: 0.5.24
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+
+      - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: "3.x"
-          cache: 'pipenv'
+          python-version-file: "./docker/test/.python-version"
 
-      - name: "Install dependencies"
+      # running serially to reduce test flakiness
+      - name: Lint and run the tests
         run: |
           cd docker/test
-          python -m pip install --upgrade pipenv wheel
-          pipenv install --deploy
-
-      - name: "Create Docker network"
-        run: docker network create net-test
-
-      - name: "Run tests"
+          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
           CROWDSEC_TEST_FLAVORS: ${{ matrix.flavor }}
           CROWDSEC_TEST_NETWORK: net-test
           CROWDSEC_TEST_TIMEOUT: 90
-        # running serially to reduce test flakiness
-        run: |
-          cd docker/test
-          pipenv run pytest -n 1 --durations=0 --color=yes

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

@@ -34,7 +34,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: Build
       run: |
@@ -61,6 +61,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.61
+        version: v1.64
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.github/workflows/go-tests.yml

@@ -42,7 +42,6 @@ jobs:
           DEBUG: ""
           LAMBDA_EXECUTOR: ""
           KINESIS_ERROR_PROBABILITY: ""
-          DOCKER_HOST: unix:///var/run/docker.sock
           KINESIS_INITIALIZE_STREAMS: ${{ env.KINESIS_INITIALIZE_STREAMS }}
           LOCALSTACK_HOST: ${{ env.AWS_HOST }}  # Required so that resource urls are provided properly
           # e.g sqs url will get localhost if we don't set this env to map our service
@@ -115,6 +114,17 @@ jobs:
           --health-retries 5
           --health-start-period 30s
 
+      victorialogs:
+        image: victoriametrics/victoria-logs:v1.5.0-victorialogs
+        ports:
+          - "9428:9428"
+        options: >-
+          --name=victorialogs1
+          --health-cmd "wget -q -O - http://0.0.0.0:9428"
+          --health-interval 30s
+          --health-timeout 10s
+          --health-retries 5
+          --health-start-period 30s
     steps:
 
     - name: Check out CrowdSec repository
@@ -126,7 +136,7 @@ jobs:
     - name: "Set up Go"
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
+        go-version-file: go.mod
 
     - name: Run "go generate" and check for changes
       run: |
@@ -144,11 +154,11 @@ jobs:
         go generate ./...
         protoc --version
         if [[ $(git status --porcelain) ]]; then
-          echo "Error: Uncommitted changes found after running 'make generate'. Please commit all generated code."
+          echo "Error: Uncommitted changes found after running 'go generate'. Please commit all generated code."
           git diff
           exit 1
         else
-          echo "No changes detected after running 'make generate'."
+          echo "No changes detected after running 'go generate'."
         fi
 
     - name: Create localstack streams
@@ -174,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
@@ -190,6 +198,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.61
+        version: v1.64
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false

.github/workflows/publish-tarball-release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: "Set up Go"
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version-file: go.mod
 
       - name: Build the binaries
         run: |

.gitignore

@@ -21,6 +21,9 @@
 # Test dependencies
 test/tools/*
 
+# Saved test status
+test/bats/.bats/run-logs
+
 # VMs used for dev/test
 
 .vagrant