support crowdsec-firewall-bouncer.yaml.local (crowdsecurity#196)

.golangci.yml

@@ -43,6 +43,11 @@ linters:
     - structcheck       # The owner seems to have abandoned the linter.  Replaced by unused.
     - varcheck          # The owner seems to have abandoned the linter.  Replaced by unused.
 
+    #
+    # Disabled
+    #
+    - gci               # Gci control golang package import order and make it always deterministic.
+
     #
     # Enabled
     #
@@ -66,7 +71,6 @@ linters:
     # - exportloopref       # checks for pointers to enclosing loop variables
     # - forcetypeassert     # finds forced type assertions
     # - funlen              # Tool for detection of long functions
-    # - gci                 # Gci control golang package import order and make it always deterministic.
     # - gochecknoinits      # Checks that no init functions are present in Go code
     # - godot               # Check if comments end in a period
     # - gofmt               # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification

backend.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/crowdsecurity/crowdsec/pkg/models"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/crowdsecurity/crowdsec/pkg/models"
 )
 
 type backend interface {

config.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	"os"
 
-	"github.com/crowdsecurity/crowdsec/pkg/types"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/natefinch/lumberjack.v2"
 	"gopkg.in/yaml.v2"
+
+	"github.com/crowdsecurity/crowdsec/pkg/types"
+	"github.com/crowdsecurity/crowdsec/pkg/yamlpatch"
 )
 
 type PrometheusConfig struct {
@@ -68,12 +69,12 @@ type bouncerConfig struct {
 func newConfig(configPath string) (*bouncerConfig, error) {
 	config := &bouncerConfig{}
 
-	configBuff, err := os.ReadFile(configPath)
+	patcher := yamlpatch.NewPatcher(configPath, ".local")
+	fcontent, err := patcher.MergedPatchContent()
 	if err != nil {
-		return &bouncerConfig{}, errors.Wrapf(err, "failed to read %s", configPath)
+		return &bouncerConfig{}, err
 	}
-
-	err = yaml.Unmarshal(configBuff, &config)
+	err = yaml.Unmarshal(fcontent, &config)
 	if err != nil {
 		return &bouncerConfig{}, errors.Wrapf(err, "failed to unmarshal %s", configPath)
 	}

main.go

@@ -11,13 +11,15 @@ import (
 	"syscall"
 
 	"github.com/coreos/go-systemd/daemon"
-	"github.com/crowdsecurity/cs-firewall-bouncer/pkg/version"
-	csbouncer "github.com/crowdsecurity/go-cs-bouncer"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/writer"
 	"gopkg.in/tomb.v2"
+
+	csbouncer "github.com/crowdsecurity/go-cs-bouncer"
+
+	"github.com/crowdsecurity/cs-firewall-bouncer/pkg/version"
 )
 
 const (