move the LoadAcquisitionConfig to acquisition pkg

cmd/crowdsec/acquisition.go

@@ -1,34 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/crowdsecurity/crowdsec/pkg/acquisition"
-)
-
-func loadAcquisition() (*acquisition.FileAcquisCtx, error) {
-	var acquisitionCTX *acquisition.FileAcquisCtx
-	var err error
-	/*Init the acqusition : from cli or from acquis.yaml file*/
-	if cConfig.SingleFile != "" {
-		var input acquisition.FileCtx
-		input.Filename = cConfig.SingleFile
-		input.Mode = acquisition.CATMODE
-		input.Labels = make(map[string]string)
-		input.Labels["type"] = cConfig.SingleFileLabel
-		acquisitionCTX, err = acquisition.InitReaderFromFileCtx([]acquisition.FileCtx{input})
-	} else { /* Init file reader if we tail */
-		acquisitionCTX, err = acquisition.InitReader(cConfig.AcquisitionFile)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("unable to start file acquisition, bailout %v", err)
-	}
-	if acquisitionCTX == nil {
-		return nil, fmt.Errorf("no inputs to process")
-	}
-	if cConfig.Profiling {
-		acquisitionCTX.Profiling = true
-	}
-
-	return acquisitionCTX, nil
-}

cmd/crowdsec/main.go

@@ -294,7 +294,7 @@ func main() {
 	log.Warningf("Starting processing data")
 
 	//Init the acqusition : from cli or from acquis.yaml file
-	acquisitionCTX, err = loadAcquisition()
+	acquisitionCTX, err = acquisition.LoadAcquisitionConfig(cConfig)
 	if err != nil {
 		log.Fatalf("Failed to start acquisition : %s", err)
 	}

pkg/acquisition/file_reader.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	leaky "github.com/crowdsecurity/crowdsec/pkg/leakybucket"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
 
@@ -66,6 +67,33 @@ var ReaderHits = prometheus.NewCounterVec(
 	[]string{"source"},
 )
 
+func LoadAcquisitionConfig(cConfig *csconfig.CrowdSec) (*FileAcquisCtx, error) {
+	var acquisitionCTX *FileAcquisCtx
+	var err error
+	/*Init the acqusition : from cli or from acquis.yaml file*/
+	if cConfig.SingleFile != "" {
+		var input FileCtx
+		input.Filename = cConfig.SingleFile
+		input.Mode = CATMODE
+		input.Labels = make(map[string]string)
+		input.Labels["type"] = cConfig.SingleFileLabel
+		acquisitionCTX, err = InitReaderFromFileCtx([]FileCtx{input})
+	} else { /* Init file reader if we tail */
+		acquisitionCTX, err = InitReader(cConfig.AcquisitionFile)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("unable to start file acquisition, bailout %v", err)
+	}
+	if acquisitionCTX == nil {
+		return nil, fmt.Errorf("no inputs to process")
+	}
+	if cConfig.Profiling {
+		acquisitionCTX.Profiling = true
+	}
+
+	return acquisitionCTX, nil
+}
+
 func InitReader(cfg string) (*FileAcquisCtx, error) {
 	var files []FileCtx