Return error if both jobID and runID are specified

cdb · cdb · commit 24ec53365bdf · 2022-03-14T10:01:19.000-07:00
diff --git a/pkg/cmd/run/rerun/rerun.go b/pkg/cmd/run/rerun/rerun.go
@@ -50,11 +50,7 @@ func NewCmdRerun(f *cmdutil.Factory, runF func(*RerunOptions) error) *cobra.Comm
 			}
 
 			if opts.RunID != "" && opts.JobID != "" {
-				opts.RunID = ""
-				if opts.IO.CanPrompt() {
-					cs := opts.IO.ColorScheme()
-					fmt.Fprintf(opts.IO.ErrOut, "%s both run and job IDs specified; ignoring run ID\n", cs.WarningIcon())
-				}
+				return cmdutil.FlagErrorf("specify only one of <run-id> or <job-id>")
 			}
 
 			if runF != nil {
diff --git a/pkg/cmd/run/rerun/rerun_test.go b/pkg/cmd/run/rerun/rerun_test.go
@@ -76,12 +76,10 @@ func TestNewCmdRerun(t *testing.T) {
 			},
 		},
 		{
-			name: "with args job and runID ignores runID",
-			tty:  true,
-			cli:  "1234 --job 5678",
-			wants: RerunOptions{
-				JobID: "5678",
-			},
+			name:     "with args jobID and runID fails",
+			tty:      true,
+			cli:      "1234 --job 5678",
+			wantsErr: true,
 		},
 		{
 			name:     "with arg job with no ID fails",

Original file line number	Diff line number	Diff line change
`@@ -50,11 +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`		`- opts.RunID = ""`
`54`		`- if opts.IO.CanPrompt() {`
`55`		`- cs := opts.IO.ColorScheme()`
`56`		`- fmt.Fprintf(opts.IO.ErrOut, "%s both run and job IDs specified; ignoring run ID\n", cs.WarningIcon())`
`57`		`- }`
	`53`	`+ return cmdutil.FlagErrorf("specify only one of <run-id> or <job-id>")`
`58`	`54`	`}`
`59`	`55`
`60`	`56`	`if runF != nil {`