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

gcp-cherry-pick-bot[bot] · ethanndickson · web-flow · commit a7f0dba4c3d0 · 2025-07-10T10:43:57.000+05:00
Co-authored-by: Ethan &lt;39577870+ethanndickson@users.noreply.github.com&gt;
diff --git a/cli/root.go b/cli/root.go
@@ -1060,11 +1060,12 @@ func cliHumanFormatError(from string, err error, opts *formatOpts) (string, bool
 		return formatRunCommandError(cmdErr, opts), true
 	}
 
-	uw, ok := err.(interface{ Unwrap() error })
-	if ok {
-		msg, special := cliHumanFormatError(from+traceError(err), uw.Unwrap(), opts)
-		if special {
-			return msg, special
+	if uw, ok := err.(interface{ Unwrap() error }); ok {
+		if unwrapped := uw.Unwrap(); unwrapped != nil {
+			msg, special := cliHumanFormatError(from+traceError(err), unwrapped, opts)
+			if special {
+				return msg, special
+			}
 		}
 	}
 	// If we got here, that means that the wrapped error chain does not have

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`	`return formatRunCommandError(cmdErr, opts), true`
`1061`	`1061`	`}`
`1062`	`1062`
`1063`		`- uw, ok := err.(interface{ Unwrap() error })`
`1064`		`- if ok {`
`1065`		`- msg, special := cliHumanFormatError(from+traceError(err), uw.Unwrap(), opts)`
`1066`		`- if special {`
`1067`		`- return msg, special`
	`1063`	`+ if uw, ok := err.(interface{ Unwrap() error }); ok {`
	`1064`	`+ if unwrapped := uw.Unwrap(); unwrapped != nil {`
	`1065`	`+ msg, special := cliHumanFormatError(from+traceError(err), unwrapped, opts)`
	`1066`	`+ if special {`
	`1067`	`+ return msg, special`
	`1068`	`+ }`
`1068`	`1069`	`}`
`1069`	`1070`	`}`
`1070`	`1071`	`// If we got here, that means that the wrapped error chain does not have`