From 75a50c0c9d5b31cc6200e55f13c7b94ae1d5a41c Mon Sep 17 00:00:00 2001 From: "Thibault \"bui\" Koechlin" Date: Wed, 20 Mar 2024 14:02:29 +0100 Subject: [PATCH] improve a bit cscli examples when it comes to list mgmt (#2911) --- cmd/crowdsec-cli/alerts.go | 12 +++++++----- cmd/crowdsec-cli/decisions.go | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/crowdsec-cli/alerts.go b/cmd/crowdsec-cli/alerts.go index ce304bcc7..908466f9e 100644 --- a/cmd/crowdsec-cli/alerts.go +++ b/cmd/crowdsec-cli/alerts.go @@ -177,9 +177,9 @@ func (cli *cliAlerts) displayOneAlert(alert *models.Alert, withDetail bool) erro return nil } -type cliAlerts struct{ +type cliAlerts struct { client *apiclient.ApiClient - cfg configGetter + cfg configGetter } func NewCLIAlerts(getconfig configGetter) *cliAlerts { @@ -253,8 +253,10 @@ func (cli *cliAlerts) NewListCmd() *cobra.Command { Example: `cscli alerts list cscli alerts list --ip 1.2.3.4 cscli alerts list --range 1.2.3.0/24 +cscli alerts list --origin lists cscli alerts list -s crowdsecurity/ssh-bf cscli alerts list --type ban`, + Long: `List alerts with optional filters`, DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, _ []string) error { if err := manageCliDecisionAlerts(alertListFilter.IPEquals, alertListFilter.RangeEquals, @@ -358,7 +360,7 @@ func (cli *cliAlerts) NewDeleteCmd() *cobra.Command { var ( ActiveDecision *bool AlertDeleteAll bool - delAlertByID string + delAlertByID string ) var alertDeleteFilter = apiclient.AlertsDeleteOpts{ @@ -449,7 +451,7 @@ cscli alerts delete -s crowdsecurity/ssh-bf"`, return nil }, } - + flags := cmd.Flags() flags.SortFlags = false flags.StringVar(alertDeleteFilter.ScopeEquals, "scope", "", "the scope (ie. ip,range)") @@ -520,7 +522,7 @@ func (cli *cliAlerts) NewInspectCmd() *cobra.Command { func (cli *cliAlerts) NewFlushCmd() *cobra.Command { var ( maxItems int - maxAge string + maxAge string ) cmd := &cobra.Command{ diff --git a/cmd/crowdsec-cli/decisions.go b/cmd/crowdsec-cli/decisions.go index d71653678..a97536ddc 100644 --- a/cmd/crowdsec-cli/decisions.go +++ b/cmd/crowdsec-cli/decisions.go @@ -195,7 +195,7 @@ func (cli *cliDecisions) newListCmd() *cobra.Command { Example: `cscli decisions list -i 1.2.3.4 cscli decisions list -r 1.2.3.0/24 cscli decisions list -s crowdsecurity/ssh-bf -cscli decisions list -t ban +cscli decisions list --origin lists --scenario list_name `, Args: cobra.ExactArgs(0), DisableAutoGenTag: true, @@ -436,6 +436,7 @@ func (cli *cliDecisions) newDeleteCmd() *cobra.Command { cscli decisions delete -i 1.2.3.4 cscli decisions delete --id 42 cscli decisions delete --type captcha +cscli decisions delete --origin lists --scenario list_name `, /*TBD : refaire le Long/Example*/ PreRunE: func(cmd *cobra.Command, _ []string) error {