cscli refact: package cliitem

crowdsecurity · Aug 29, 2024 · b5d4adb · b5d4adb
1 parent 0fb6468
commit b5d4adb
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/cmd/crowdsec-cli/hubappsec.go → cmd/crowdsec-cli/cliitem/appsec.go b/cmd/crowdsec-cli/hubappsec.go → cmd/crowdsec-cli/cliitem/appsec.go
@@ -1,4 +1,4 @@
-package main
+package cliitem
 
 import (
 	"fmt"
@@ -13,7 +13,7 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLIAppsecConfig(cfg configGetter) *cliItem {
+func NewAppsecConfig(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.APPSEC_CONFIGS,
@@ -47,7 +47,7 @@ cscli appsec-configs list crowdsecurity/vpatch`,
 	}
 }
 
-func NewCLIAppsecRule(cfg configGetter) *cliItem {
+func NewAppsecRule(cfg configGetter) *cliItem {
 	inspectDetail := func(item *cwhub.Item) error {
 		// Only show the converted rules in human mode
 		if cfg().Cscli.Output != "human" {

diff --git a/cmd/crowdsec-cli/hubcollection.go → cmd/crowdsec-cli/cliitem/collection.go b/cmd/crowdsec-cli/hubcollection.go → cmd/crowdsec-cli/cliitem/collection.go
@@ -1,10 +1,10 @@
-package main
+package cliitem
 
 import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLICollection(cfg configGetter) *cliItem {
+func NewCollection(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.COLLECTIONS,

diff --git a/cmd/crowdsec-cli/hubcontext.go → cmd/crowdsec-cli/cliitem/context.go b/cmd/crowdsec-cli/hubcontext.go → cmd/crowdsec-cli/cliitem/context.go
@@ -1,10 +1,10 @@
-package main
+package cliitem
 
 import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLIContext(cfg configGetter) *cliItem {
+func NewContext(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.CONTEXTS,

diff --git a/cmd/crowdsec-cli/hubscenario.go → cmd/crowdsec-cli/cliitem/hubscenario.go b/cmd/crowdsec-cli/hubscenario.go → cmd/crowdsec-cli/cliitem/hubscenario.go
@@ -1,10 +1,10 @@
-package main
+package cliitem
 
 import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLIScenario(cfg configGetter) *cliItem {
+func NewScenario(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.SCENARIOS,

diff --git a/cmd/crowdsec-cli/itemcli.go → cmd/crowdsec-cli/cliitem/item.go b/cmd/crowdsec-cli/itemcli.go → cmd/crowdsec-cli/cliitem/item.go
@@ -1,4 +1,4 @@
-package main
+package cliitem
 
 import (
 	"cmp"
@@ -18,6 +18,7 @@ import (
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clihub"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/reload"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/require"
+	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
@@ -30,6 +31,8 @@ type cliHelp struct {
 	example string
 }
 
+type configGetter func() *csconfig.Config
+
 type cliItem struct {
 	cfg           configGetter
 	name          string // plural, as used in the hub index

diff --git a/cmd/crowdsec-cli/hubparser.go → cmd/crowdsec-cli/cliitem/parser.go b/cmd/crowdsec-cli/hubparser.go → cmd/crowdsec-cli/cliitem/parser.go
@@ -1,10 +1,10 @@
-package main
+package cliitem
 
 import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLIParser(cfg configGetter) *cliItem {
+func NewParser(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.PARSERS,

diff --git a/cmd/crowdsec-cli/hubpostoverflow.go → cmd/crowdsec-cli/cliitem/postoverflow.go b/cmd/crowdsec-cli/hubpostoverflow.go → cmd/crowdsec-cli/cliitem/postoverflow.go
@@ -1,10 +1,10 @@
-package main
+package cliitem
 
 import (
 	"github.com/crowdsecurity/crowdsec/pkg/cwhub"
 )
 
-func NewCLIPostOverflow(cfg configGetter) *cliItem {
+func NewPostOverflow(cfg configGetter) *cliItem {
 	return &cliItem{
 		cfg:       cfg,
 		name:      cwhub.POSTOVERFLOWS,

diff --git a/cmd/crowdsec-cli/item_suggest.go → cmd/crowdsec-cli/cliitem/suggest.go b/cmd/crowdsec-cli/item_suggest.go → cmd/crowdsec-cli/cliitem/suggest.go
@@ -1,4 +1,4 @@
-package main
+package cliitem
 
 import (
 	"fmt"

diff --git a/cmd/crowdsec-cli/main.go b/cmd/crowdsec-cli/main.go
@@ -20,6 +20,7 @@ import (
 	"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/cliitem"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/clilapi"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climachine"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/climetrics"
@@ -270,13 +271,13 @@ It is meant to allow you to manage bans, parsers/scenarios/etc, api and generall
 	cmd.AddCommand(clinotifications.New(cli.cfg).NewCommand())
 	cmd.AddCommand(clisupport.New(cli.cfg).NewCommand())
 	cmd.AddCommand(clipapi.New(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLICollection(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIParser(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIScenario(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIPostOverflow(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIContext(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIAppsecConfig(cli.cfg).NewCommand())
-	cmd.AddCommand(NewCLIAppsecRule(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewCollection(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewParser(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewScenario(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewPostOverflow(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewContext(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewAppsecConfig(cli.cfg).NewCommand())
+	cmd.AddCommand(cliitem.NewAppsecRule(cli.cfg).NewCommand())
 
 	if fflag.CscliSetup.IsEnabled() {
 		cmd.AddCommand(clisetup.New(cli.cfg).NewCommand())