cscli refact: package clibouncer, climachine

cmd/crowdsec-cli/bouncers.go → cmd/crowdsec-cli/clibouncer/bouncers.go

@@ -1,4 +1,4 @@
-package main
+package clibouncer
 
 import (
 	"encoding/csv"
@@ -21,19 +21,22 @@ import (
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/cstable"
 	"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/database/ent"
 	"github.com/crowdsecurity/crowdsec/pkg/database/ent/bouncer"
 	"github.com/crowdsecurity/crowdsec/pkg/emoji"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
 )
 
+type configGetter = func() *csconfig.Config
+
 type cliBouncers struct {
 	db  *database.Client
 	cfg configGetter
 }
 
-func NewCLIBouncers(cfg configGetter) *cliBouncers {
+func New(cfg configGetter) *cliBouncers {
 	return &cliBouncers{
 		cfg: cfg,
 	}
@@ -156,8 +159,11 @@ func (cli *cliBouncers) listCSV(out io.Writer, bouncers ent.Bouncers) error {
 	return nil
 }
 
-func (cli *cliBouncers) list(out io.Writer) error {
-	bouncers, err := cli.db.ListBouncers()
+func (cli *cliBouncers) List(out io.Writer, db *database.Client) error {
+	// XXX: must use the provided db object, the one in the struct might be nil
+	// (calling List directly skips the PersistentPreRunE)
+
+	bouncers, err := db.ListBouncers()
 	if err != nil {
 		return fmt.Errorf("unable to list bouncers: %w", err)
 	}
@@ -194,7 +200,7 @@ func (cli *cliBouncers) newListCmd() *cobra.Command {
 		Args:              cobra.ExactArgs(0),
 		DisableAutoGenTag: true,
 		RunE: func(_ *cobra.Command, _ []string) error {
-			return cli.list(color.Output)
+			return cli.List(color.Output, cli.db)
 		},
 	}
 

cmd/crowdsec-cli/flag.go → cmd/crowdsec-cli/climachine/flag.go

@@ -1,4 +1,4 @@
-package main
+package climachine
 
 // Custom types for flag validation and conversion.
 

cmd/crowdsec-cli/machines.go → cmd/crowdsec-cli/climachine/machines.go

@@ -1,4 +1,4 @@
-package main
+package climachine
 
 import (
 	"encoding/csv"
@@ -49,12 +49,14 @@ func getLastHeartbeat(m *ent.Machine) (string, bool) {
 	return hb, true
 }
 
+type configGetter = func() *csconfig.Config
+
 type cliMachines struct {
 	db  *database.Client
 	cfg configGetter
 }
 
-func NewCLIMachines(cfg configGetter) *cliMachines {
+func New(cfg configGetter) *cliMachines {
 	return &cliMachines{
 		cfg: cfg,
 	}
@@ -208,8 +210,11 @@ func (cli *cliMachines) listCSV(out io.Writer, machines ent.Machines) error {
 	return nil
 }
 
-func (cli *cliMachines) list(out io.Writer) error {
-	machines, err := cli.db.ListMachines()
+func (cli *cliMachines) List(out io.Writer, db *database.Client) error {
+	// XXX: must use the provided db object, the one in the struct might be nil
+	// (calling List directly skips the PersistentPreRunE)
+
+	machines, err := db.ListMachines()
 	if err != nil {
 		return fmt.Errorf("unable to list machines: %w", err)
 	}
@@ -247,7 +252,7 @@ func (cli *cliMachines) newListCmd() *cobra.Command {
 		Args:              cobra.NoArgs,
 		DisableAutoGenTag: true,
 		RunE: func(_ *cobra.Command, _ []string) error {
-			return cli.list(color.Output)
+			return cli.List(color.Output, cli.db)
 		},
 	}
 

cmd/crowdsec-cli/main.go

@@ -14,12 +14,14 @@ import (
 
 	"github.com/crowdsecurity/go-cs-lib/trace"
 
+	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clibouncer"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clicapi"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/cliconsole"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/cliexplain"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clihub"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clihubtest"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clilapi"
+	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climachine"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climetrics"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clinotifications"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clipapi"
@@ -256,8 +258,8 @@ It is meant to allow you to manage bans, parsers/scenarios/etc, api and generall
 	cmd.AddCommand(NewCLIDecisions(cli.cfg).NewCommand())
 	cmd.AddCommand(NewCLIAlerts(cli.cfg).NewCommand())
 	cmd.AddCommand(clisimulation.New(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIBouncers(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIMachines(cli.cfg).NewCommand())
+	cmd.AddCommand(clibouncer.New(cli.cfg).NewCommand())
+	cmd.AddCommand(climachine.New(cli.cfg).NewCommand())
 	cmd.AddCommand(clicapi.New(cli.cfg).NewCommand())
 	cmd.AddCommand(clilapi.New(cli.cfg).NewCommand())
 	cmd.AddCommand(NewCompletionCmd())

cmd/crowdsec-cli/support.go

@@ -22,9 +22,11 @@ import (
 
 	"github.com/crowdsecurity/go-cs-lib/trace"
 
+	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clibouncer"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clicapi"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clihub"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clilapi"
+	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climachine"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climetrics"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/require"
 	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
@@ -193,9 +195,9 @@ func (cli *cliSupport) dumpBouncers(zw *zip.Writer, db *database.Client) error {
 	}
 
 	out := new(bytes.Buffer)
-	cm := cliBouncers{db: db, cfg: cli.cfg}
+	cm := clibouncer.New(cli.cfg)
 
-	if err := cm.list(out); err != nil {
+	if err := cm.List(out, db); err != nil {
 		return err
 	}
 
@@ -214,9 +216,9 @@ func (cli *cliSupport) dumpAgents(zw *zip.Writer, db *database.Client) error {
 	}
 
 	out := new(bytes.Buffer)
-	cm := cliMachines{db: db, cfg: cli.cfg}
+	cm := climachine.New(cli.cfg)
 
-	if err := cm.list(out); err != nil {
+	if err := cm.List(out, db); err != nil {
 		return err
 	}