Fix up error and help language

cdb · cdb · commit e6b09b45deb1 · 2022-03-14T12:29:49.000-07:00
diff --git a/pkg/cmd/run/rerun/rerun.go b/pkg/cmd/run/rerun/rerun.go
@@ -41,7 +41,7 @@ func NewCmdRerun(f *cmdutil.Factory, runF func(*RerunOptions) error) *cobra.Comm
 
 			if len(args) == 0 && opts.JobID == "" {
 				if !opts.IO.CanPrompt() {
-					return cmdutil.FlagErrorf("run or job ID required when not running interactively")
+					return cmdutil.FlagErrorf("`<run-id>` or `--job` required when not running interactively")
 				} else {
 					opts.Prompt = true
 				}
@@ -50,7 +50,7 @@ func NewCmdRerun(f *cmdutil.Factory, runF func(*RerunOptions) error) *cobra.Comm
 			}
 
 			if opts.RunID != "" && opts.JobID != "" {
-				return cmdutil.FlagErrorf("specify only one of <run-id> or <job-id>")
+				return cmdutil.FlagErrorf("specify only one of `<run-id>` or `--job`")
 			}
 
 			if runF != nil {
@@ -60,7 +60,7 @@ func NewCmdRerun(f *cmdutil.Factory, runF func(*RerunOptions) error) *cobra.Comm
 		},
 	}
 
-	cmd.Flags().BoolVar(&opts.OnlyFailed, "failed", false, "Rerun only failed jobs")
+	cmd.Flags().BoolVar(&opts.OnlyFailed, "failed", false, "Rerun only failed jobs, including dependencies")
 	cmd.Flags().StringVarP(&opts.JobID, "job", "j", "", "Rerun a specific job from a run, including dependencies")
 
 	return cmd
@@ -107,7 +107,7 @@ func runRerun(opts *RerunOptions) error {
 			return fmt.Errorf("failed to get runs: %w", err)
 		}
 		if len(runs) == 0 {
-			return errors.New("no recent runs have failed; please specify a specific run ID")
+			return errors.New("no recent runs have failed; please specify a specific `<run-id>`")
 		}
 		runID, err = shared.PromptForRun(cs, runs)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func NewCmdRerun(f cmdutil.Factory, runF func(RerunOptions) error) *cobra.Comm`
`41`	`41`
`42`	`42`	`if len(args) == 0 && opts.JobID == "" {`
`43`	`43`	`if !opts.IO.CanPrompt() {`
`44`		`- return cmdutil.FlagErrorf("run or job ID required when not running interactively")`
	`44`	+ return cmdutil.FlagErrorf("`<run-id>` or `--job` required when not running interactively")
`45`	`45`	`} else {`
`46`	`46`	`opts.Prompt = true`
`47`	`47`	`}`
`@@ -50,7 +50,7 @@ func NewCmdRerun(f cmdutil.Factory, runF func(RerunOptions) error) *cobra.Comm`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if opts.RunID != "" && opts.JobID != "" {`
`53`		`- return cmdutil.FlagErrorf("specify only one of <run-id> or <job-id>")`
	`53`	+ return cmdutil.FlagErrorf("specify only one of `<run-id>` or `--job`")
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if runF != nil {`
`@@ -60,7 +60,7 @@ func NewCmdRerun(f cmdutil.Factory, runF func(RerunOptions) error) *cobra.Comm`
`60`	`60`	`},`
`61`	`61`	`}`
`62`	`62`
`63`		`- cmd.Flags().BoolVar(&opts.OnlyFailed, "failed", false, "Rerun only failed jobs")`
	`63`	`+ cmd.Flags().BoolVar(&opts.OnlyFailed, "failed", false, "Rerun only failed jobs, including dependencies")`
`64`	`64`	`cmd.Flags().StringVarP(&opts.JobID, "job", "j", "", "Rerun a specific job from a run, including dependencies")`
`65`	`65`
`66`	`66`	`return cmd`
`@@ -107,7 +107,7 @@ func runRerun(opts *RerunOptions) error {`
`107`	`107`	`return fmt.Errorf("failed to get runs: %w", err)`
`108`	`108`	`}`
`109`	`109`	`if len(runs) == 0 {`
`110`		`- return errors.New("no recent runs have failed; please specify a specific run ID")`
	`110`	+ return errors.New("no recent runs have failed; please specify a specific `<run-id>`")
`111`	`111`	`}`
`112`	`112`	`runID, err = shared.PromptForRun(cs, runs)`
`113`	`113`	`if err != nil {`