Commita7f0dba

and

authored

fix(cli): handle nil unwrap errors when formatting (cherry-pick#18099) (#18821)

Co-authored-by: Ethan <39577870+ethanndickson@users.noreply.github.com>

1 parent049feec commita7f0dbaCopy full SHA for a7f0dba

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1060,11 +1060,12 @@ func cliHumanFormatError(from string, err error, opts *formatOpts) (string, bool`
`1060`	`1060`	`returnformatRunCommandError(cmdErr,opts),true`
`1061`	`1061`	`}`
`1062`	`1062`
`1063`		`-uw,ok:=err.(interface{Unwrap()error })`
`1064`		`-ifok {`
`1065`		`-msg,special:=cliHumanFormatError(from+traceError(err),uw.Unwrap(),opts)`
`1066`		`-ifspecial {`
`1067`		`-returnmsg,special`
	`1063`	`+ifuw,ok:=err.(interface{Unwrap()error });ok {`
	`1064`	`+ifunwrapped:=uw.Unwrap();unwrapped!=nil {`
	`1065`	`+msg,special:=cliHumanFormatError(from+traceError(err),unwrapped,opts)`
	`1066`	`+ifspecial {`
	`1067`	`+returnmsg,special`
	`1068`	`+}`
`1068`	`1069`	`}`
`1069`	`1070`	`}`
`1070`	`1071`	`// If we got here, that means that the wrapped error chain does not have`

Comments

(0)