From d2f6594c0c939296f06d3ef36539e7bd22caeee6 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Thu, 22 Oct 2020 14:31:34 -0300 Subject: [PATCH] return error when both flags are used --- cmd/preflight/cli/run.go | 2 +- cmd/troubleshoot/cli/run.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/preflight/cli/run.go b/cmd/preflight/cli/run.go index 0b4ed7ec..f6fc06bb 100644 --- a/cmd/preflight/cli/run.go +++ b/cmd/preflight/cli/run.go @@ -177,7 +177,7 @@ func parseTimeFlags(v *viper.Viper, progressChan chan interface{}, collectors [] ) if v.GetString("since-time") != "" { if v.GetString("since") != "" { - return errors.Errorf("at most one of `sinceTime` or `sinceSeconds` may be specified") + return errors.Errorf("at most one of `sinceTime` or `since` may be specified") } sinceTime, err = time.Parse(time.RFC3339, v.GetString("since-time")) if err != nil { diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go index 98b124e1..9efc6ea6 100644 --- a/cmd/troubleshoot/cli/run.go +++ b/cmd/troubleshoot/cli/run.go @@ -694,7 +694,7 @@ func parseTimeFlags(v *viper.Viper, progressChan chan interface{}, collectors *c ) if v.GetString("since-time") != "" { if v.GetString("since") != "" { - return errors.Errorf("Only one of since-time / since may be used. The flag since-time will be used.") + return errors.Errorf("at most one of `sinceTime` or `since` may be specified") } sinceTime, err = time.Parse(time.RFC3339, v.GetString("since-time")) if err != nil {