add --origin to cscli decisions delete (#2109)
This commit is contained in:
parent
5b0fe4b7f1
commit
9d5aaf5ea2
|
@ -382,6 +382,7 @@ func NewDecisionsDeleteCmd() *cobra.Command {
|
||||||
IPEquals: new(string),
|
IPEquals: new(string),
|
||||||
RangeEquals: new(string),
|
RangeEquals: new(string),
|
||||||
ScenarioEquals: new(string),
|
ScenarioEquals: new(string),
|
||||||
|
OriginEquals: new(string),
|
||||||
}
|
}
|
||||||
var delDecisionId string
|
var delDecisionId string
|
||||||
var delDecisionAll bool
|
var delDecisionAll bool
|
||||||
|
@ -404,7 +405,8 @@ cscli decisions delete --type captcha
|
||||||
}
|
}
|
||||||
if *delFilter.ScopeEquals == "" && *delFilter.ValueEquals == "" &&
|
if *delFilter.ScopeEquals == "" && *delFilter.ValueEquals == "" &&
|
||||||
*delFilter.TypeEquals == "" && *delFilter.IPEquals == "" &&
|
*delFilter.TypeEquals == "" && *delFilter.IPEquals == "" &&
|
||||||
*delFilter.RangeEquals == "" && *delFilter.ScenarioEquals == "" && delDecisionId == "" {
|
*delFilter.RangeEquals == "" && *delFilter.ScenarioEquals == "" &&
|
||||||
|
*delFilter.OriginEquals == "" && delDecisionId == "" {
|
||||||
cmd.Usage()
|
cmd.Usage()
|
||||||
log.Fatalln("At least one filter or --all must be specified")
|
log.Fatalln("At least one filter or --all must be specified")
|
||||||
}
|
}
|
||||||
|
@ -420,21 +422,21 @@ cscli decisions delete --type captcha
|
||||||
if *delFilter.ScopeEquals == "" {
|
if *delFilter.ScopeEquals == "" {
|
||||||
delFilter.ScopeEquals = nil
|
delFilter.ScopeEquals = nil
|
||||||
}
|
}
|
||||||
|
if *delFilter.OriginEquals == "" {
|
||||||
|
delFilter.OriginEquals = nil
|
||||||
|
}
|
||||||
if *delFilter.ValueEquals == "" {
|
if *delFilter.ValueEquals == "" {
|
||||||
delFilter.ValueEquals = nil
|
delFilter.ValueEquals = nil
|
||||||
}
|
}
|
||||||
if *delFilter.ScenarioEquals == "" {
|
if *delFilter.ScenarioEquals == "" {
|
||||||
delFilter.ScenarioEquals = nil
|
delFilter.ScenarioEquals = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if *delFilter.TypeEquals == "" {
|
if *delFilter.TypeEquals == "" {
|
||||||
delFilter.TypeEquals = nil
|
delFilter.TypeEquals = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if *delFilter.IPEquals == "" {
|
if *delFilter.IPEquals == "" {
|
||||||
delFilter.IPEquals = nil
|
delFilter.IPEquals = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if *delFilter.RangeEquals == "" {
|
if *delFilter.RangeEquals == "" {
|
||||||
delFilter.RangeEquals = nil
|
delFilter.RangeEquals = nil
|
||||||
}
|
}
|
||||||
|
@ -466,6 +468,8 @@ cscli decisions delete --type captcha
|
||||||
cmdDecisionsDelete.Flags().StringVarP(delFilter.TypeEquals, "type", "t", "", "the decision type (ie. ban,captcha)")
|
cmdDecisionsDelete.Flags().StringVarP(delFilter.TypeEquals, "type", "t", "", "the decision type (ie. ban,captcha)")
|
||||||
cmdDecisionsDelete.Flags().StringVarP(delFilter.ValueEquals, "value", "v", "", "the value to match for in the specified scope")
|
cmdDecisionsDelete.Flags().StringVarP(delFilter.ValueEquals, "value", "v", "", "the value to match for in the specified scope")
|
||||||
cmdDecisionsDelete.Flags().StringVarP(delFilter.ScenarioEquals, "scenario", "s", "", "the scenario name (ie. crowdsecurity/ssh-bf)")
|
cmdDecisionsDelete.Flags().StringVarP(delFilter.ScenarioEquals, "scenario", "s", "", "the scenario name (ie. crowdsecurity/ssh-bf)")
|
||||||
|
cmdDecisionsDelete.Flags().StringVar(delFilter.OriginEquals, "origin", "", fmt.Sprintf("the value to match for the specified origin (%s ...)", strings.Join(types.GetOrigins(), ",")))
|
||||||
|
|
||||||
cmdDecisionsDelete.Flags().StringVar(&delDecisionId, "id", "", "decision id")
|
cmdDecisionsDelete.Flags().StringVar(&delDecisionId, "id", "", "decision id")
|
||||||
cmdDecisionsDelete.Flags().BoolVar(&delDecisionAll, "all", false, "delete all decisions")
|
cmdDecisionsDelete.Flags().BoolVar(&delDecisionAll, "all", false, "delete all decisions")
|
||||||
cmdDecisionsDelete.Flags().BoolVar(contained, "contained", false, "query decisions contained by range")
|
cmdDecisionsDelete.Flags().BoolVar(contained, "contained", false, "query decisions contained by range")
|
||||||
|
|
|
@ -49,6 +49,7 @@ type DecisionsDeleteOpts struct {
|
||||||
IPEquals *string `url:"ip,omitempty"`
|
IPEquals *string `url:"ip,omitempty"`
|
||||||
RangeEquals *string `url:"range,omitempty"`
|
RangeEquals *string `url:"range,omitempty"`
|
||||||
Contains *bool `url:"contains,omitempty"`
|
Contains *bool `url:"contains,omitempty"`
|
||||||
|
OriginEquals *string `url:"origin,omitempty"`
|
||||||
//
|
//
|
||||||
ScenarioEquals *string `url:"scenario,omitempty"`
|
ScenarioEquals *string `url:"scenario,omitempty"`
|
||||||
ListOpts
|
ListOpts
|
||||||
|
|
Loading…
Reference in a new issue