Fix lint CI, bump test plugin (#53)

.github/workflows/tests.yml

@@ -79,3 +79,7 @@ jobs:
         version: v1.51
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false
+        # the cache is already managed above, enabling it here
+        # gives errors when extracting
+        skip-pkg-cache: true
+        skip-build-cache: true

Pipfile

@@ -1,9 +1,6 @@
 [packages]
 pytest-dotenv = "*"
-flask = "*"
-pytimeparse = "*"
-psutil = "*"
-pytest-cs = {ref = "0.4.0", git = "https://github.com/crowdsecurity/pytest-cs.git"}
+pytest-cs = {ref = "0.5.0", git = "https://github.com/crowdsecurity/pytest-cs.git"}
 
 [dev-packages]
 gnureadline = "*"

config.go

@@ -120,7 +120,7 @@ func newConfig(reader io.Reader) (*bouncerConfig, error) {
 
 	if config.CacheRetentionDuration == 0 {
 		log.Infof("cache_retention_duration defaults to 10 seconds")
-		config.CacheRetentionDuration = time.Duration(10 * time.Second)
+		config.CacheRetentionDuration = 10 * time.Second
 	}
 
 	return config, nil

custom.go

@@ -124,7 +124,7 @@ func serializeDecision(decision *models.Decision, action string) (string, error)
 	d := DecisionWithAction{Decision: *decision, Action: action, ID: decision.ID}
 	serbyte, err := json.Marshal(d)
 	if err != nil {
-		return "", fmt.Errorf("serialize error : %s", err)
+		return "", fmt.Errorf("serialize error : %w", err)
 	}
 	return string(serbyte), nil
 }

main.go

@@ -21,8 +21,9 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/crowdsecurity/crowdsec/pkg/models"
-	"github.com/crowdsecurity/cs-custom-bouncer/pkg/version"
 	csbouncer "github.com/crowdsecurity/go-cs-bouncer"
+
+	"github.com/crowdsecurity/cs-custom-bouncer/pkg/version"
 )
 
 const (
@@ -76,7 +77,6 @@ func deleteDecisions(custom *customBouncer, decisions []*models.Decision) {
 	}
 }
 
-
 func addDecisions(custom *customBouncer, decisions []*models.Decision) {
 	if len(decisions) == 1 {
 		log.Infof("adding 1 decision")
@@ -92,7 +92,6 @@ func addDecisions(custom *customBouncer, decisions []*models.Decision) {
 	}
 }
 
-
 func main() {
 	var err error
 	var promServer *http.Server

test/conftest.py

@@ -1,12 +1,6 @@
-"""
-Full integration test with a real Crowdsec running in Docker
-"""
-
 import contextlib
 import os
 import pathlib
-import secrets
-import string
 
 import pytest
 
@@ -94,10 +88,3 @@ def closure(**kw):
         cfg |= cb_cfg_factory(**kw)
         return cfg
     yield closure
-
-
-@pytest.fixture(scope='session')
-def api_key_factory():
-    def closure(alphabet=string.ascii_letters + string.digits):
-        return ''.join(secrets.choice(alphabet) for i in range(32))
-    yield closure