|
@@ -189,31 +189,27 @@ cscli alerts list --type ban`,
|
|
|
|
|
|
if *alertListFilter.Until == "" {
|
|
|
alertListFilter.Until = nil
|
|
|
- } else {
|
|
|
+ } else if strings.HasSuffix(*alertListFilter.Until, "d") {
|
|
|
/*time.ParseDuration support hours 'h' as bigger unit, let's make the user's life easier*/
|
|
|
- if strings.HasSuffix(*alertListFilter.Until, "d") {
|
|
|
- realDuration := strings.TrimSuffix(*alertListFilter.Until, "d")
|
|
|
- days, err := strconv.Atoi(realDuration)
|
|
|
- if err != nil {
|
|
|
- printHelp(cmd)
|
|
|
- log.Fatalf("Can't parse duration %s, valid durations format: 1d, 4h, 4h15m", *alertListFilter.Until)
|
|
|
- }
|
|
|
- *alertListFilter.Until = fmt.Sprintf("%d%s", days*24, "h")
|
|
|
+ realDuration := strings.TrimSuffix(*alertListFilter.Until, "d")
|
|
|
+ days, err := strconv.Atoi(realDuration)
|
|
|
+ if err != nil {
|
|
|
+ printHelp(cmd)
|
|
|
+ log.Fatalf("Can't parse duration %s, valid durations format: 1d, 4h, 4h15m", *alertListFilter.Until)
|
|
|
}
|
|
|
+ *alertListFilter.Until = fmt.Sprintf("%d%s", days*24, "h")
|
|
|
}
|
|
|
if *alertListFilter.Since == "" {
|
|
|
alertListFilter.Since = nil
|
|
|
- } else {
|
|
|
+ } else if strings.HasSuffix(*alertListFilter.Since, "d") {
|
|
|
/*time.ParseDuration support hours 'h' as bigger unit, let's make the user's life easier*/
|
|
|
- if strings.HasSuffix(*alertListFilter.Since, "d") {
|
|
|
- realDuration := strings.TrimSuffix(*alertListFilter.Since, "d")
|
|
|
- days, err := strconv.Atoi(realDuration)
|
|
|
- if err != nil {
|
|
|
- printHelp(cmd)
|
|
|
- log.Fatalf("Can't parse duration %s, valid durations format: 1d, 4h, 4h15m", *alertListFilter.Since)
|
|
|
- }
|
|
|
- *alertListFilter.Since = fmt.Sprintf("%d%s", days*24, "h")
|
|
|
+ realDuration := strings.TrimSuffix(*alertListFilter.Since, "d")
|
|
|
+ days, err := strconv.Atoi(realDuration)
|
|
|
+ if err != nil {
|
|
|
+ printHelp(cmd)
|
|
|
+ log.Fatalf("Can't parse duration %s, valid durations format: 1d, 4h, 4h15m", *alertListFilter.Since)
|
|
|
}
|
|
|
+ *alertListFilter.Since = fmt.Sprintf("%d%s", days*24, "h")
|
|
|
}
|
|
|
|
|
|
if *alertListFilter.IncludeCAPI {
|