From a7f0dba4c3d0c523f686c1d985537fa86787a58d Mon Sep 17 00:00:00 2001
From: "gcp-cherry-pick-bot[bot]"
 <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:43:57 +0500
Subject: [PATCH] fix(cli): handle nil unwrap errors when formatting
 (cherry-pick #18099) (#18821)

Co-authored-by: Ethan <39577870+ethanndickson@users.noreply.github.com>
---
 cli/root.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cli/root.go b/cli/root.go
index 8fec1a945b0b3..22a1c0f3ac329 100644
--- 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