cscli: type configGetter

crowdsecurity · Jan 31, 2024 · 42bcfc6 · 42bcfc6
1 parent a9f433b
commit 42bcfc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/crowdsec-cli/bouncers.go b/cmd/crowdsec-cli/bouncers.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/require"
 	middlewares "github.com/crowdsecurity/crowdsec/pkg/apiserver/middlewares/v1"
-	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	"github.com/crowdsecurity/crowdsec/pkg/database"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
 )
@@ -38,10 +37,10 @@ func askYesNo(message string, defaultAnswer bool) (bool, error) {
 
 type cliBouncers struct {
 	db *database.Client
-	cfg func() *csconfig.Config
+	cfg configGetter
 }
 
-func NewCLIBouncers(getconfig func() *csconfig.Config) *cliBouncers {
+func NewCLIBouncers(getconfig configGetter) *cliBouncers {
 	return &cliBouncers{
 		cfg: getconfig,
 	}

diff --git a/cmd/crowdsec-cli/hub.go b/cmd/crowdsec-cli/hub.go
@@ -10,15 +10,14 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/require"
-	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
 type cliHub struct{
-	cfg func() *csconfig.Config
+	cfg configGetter
 }
 
-func NewCLIHub(getconfig func() *csconfig.Config) *cliHub {
+func NewCLIHub(getconfig configGetter) *cliHub {
 	return &cliHub{
 		cfg: getconfig,
 	}

diff --git a/cmd/crowdsec-cli/main.go b/cmd/crowdsec-cli/main.go
@@ -29,6 +29,8 @@ var mergedConfig string
 // flagBranch overrides the value in csConfig.Cscli.HubBranch
 var flagBranch = ""
 
+type configGetter func() *csconfig.Config
+
 func initConfig() {
 	var err error