github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

return error when both flags are used

Browse Source
This commit is contained in:
Matias Manavella
2020-10-22 14:35:08 -03:00
parent d2f6594c0c
commit 3cbdb41c8f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/preflight/cli/run.go
View File

@@ -181,12 +181,12 @@ func parseTimeFlags(v *viper.Viper, progressChan chan interface{}, collectors []
}
sinceTime, err = time.Parse(time.RFC3339, v.GetString("since-time"))
if err != nil {
return errors.Errorf("unable to parse date and time %s as YYYY-MM-DDTHH:MM:SSZHH:MM, e.g.:\"2006-01-02T15:04:05Z07:00\"", v.GetString("since-time"))
return errors.Wrap(err, fmt.Sprintf("unable to parse date and time %s as YYYY-MM-DDTHH:MM:SSZHH:MM, e.g.:\"2006-01-02T15:04:05Z07:00\"", v.GetString("since-time")))
}
} else {
parsedDuration, err := time.ParseDuration(v.GetString("since"))
if err != nil {
return errors.Errorf("unable to parse time duration %s", v.GetString("since"))
return errors.Wrap(err, fmt.Sprintf("unable to parse time duration %s", v.GetString("since")))
}
now := time.Now()
sinceTime = now.Add(0 - parsedDuration)

4
cmd/troubleshoot/cli/run.go
View File

@@ -698,12 +698,12 @@ func parseTimeFlags(v *viper.Viper, progressChan chan interface{}, collectors *c
}
sinceTime, err = time.Parse(time.RFC3339, v.GetString("since-time"))
if err != nil {
return errors.Errorf("unable to parse date and time %s as YYYY-MM-DDTHH:MM:SSZHH:MM, e.g.:\"2006-01-02T15:04:05Z07:00\"", v.GetString("since-time"))
return errors.Wrap(err, fmt.Sprintf("unable to parse date and time %s as YYYY-MM-DDTHH:MM:SSZHH:MM, e.g.:\"2006-01-02T15:04:05Z07:00\"", v.GetString("since-time")))
}
} else {
parsedDuration, err := time.ParseDuration(v.GetString("since"))
if err != nil {
return errors.Errorf("unable to parse time duration %s", v.GetString("since"))
return errors.Wrap(err, fmt.Sprintf("unable to parse time duration %s", v.GetString("since")))
}
now := time.Now()
sinceTime = now.Add(0 - parsedDuration)