Unwrap kpt errors to prevent printing stacktrace (#1880)

* Unwrap kpt errors to prevent printing stacktrace

* Fix failing test

Author: mortent

e2e/testdata/fn-render/missing-fnconfig/.expected/config.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 exitCode: 1
-stdErr: 'fn gcr.io/kpt-fn/set-label:unstable: missing function config "labelconfig1.yaml"'
+stdErr: 'Error: missing function config "labelconfig1.yaml"'
 stdOut: |
   [RUNNING] "gcr.io/kpt-fn/set-label:unstable"
   [PASS] "gcr.io/kpt-fn/set-label:unstable"

internal/errors/errors.go

@@ -248,3 +248,20 @@ func UnwrapKioError(err error) error {
 	}
 	return kioErr.Err
 }
+
+// UnwrapErrors unwraps any *Error errors in the chain and returns
+// the first error it finds that is of a different type. If no such error
+// can be found, the last return value will be false.
+//nolint
+func UnwrapErrors(err error) (error, bool) {
+	for {
+		if err == nil {
+			return nil, false
+		}
+		e, ok := err.(*Error)
+		if !ok {
+			return err, true
+		}
+		err = e.Err
+	}
+}

internal/util/cmdutil/cmdutil.go

@@ -23,7 +23,6 @@ import (
 	"strings"
 
 	"github.com/GoogleContainerTools/kpt/internal/errors"
-	goerrors "github.com/go-errors/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -40,13 +39,12 @@ func FixDocs(old, new string, c *cobra.Command) {
 	c.Example = strings.ReplaceAll(c.Example, old, new)
 }
 
-func PrintErrorStacktrace(err error) {
+func PrintErrorStacktrace() bool {
 	e := os.Getenv(StackTraceOnErrors)
 	if StackOnError || e == trueString || e == "1" {
-		if err, ok := err.(*goerrors.Error); ok {
-			fmt.Fprintf(os.Stderr, "%s", err.Stack())
-		}
+		return true
 	}
+	return false
 }
 
 // StackOnError if true, will print a stack trace on failure.

internal/util/parse/parse.go

@@ -162,7 +162,7 @@ func getDest(v, repo, subdir string) (string, error) {
 		parent := filepath.Dir(v)
 		if _, err := os.Stat(parent); os.IsNotExist(err) {
 			// error -- fetch to directory where parent does not exist
-			return "", errors.Errorf("parent directory %s does not exist", parent)
+			return "", errors.Errorf("parent directory %q does not exist", parent)
 		}
 		// fetch to a specific directory -- don't default the name
 		return v, nil
@@ -180,7 +180,7 @@ func getDest(v, repo, subdir string) (string, error) {
 
 	// make sure the destination directory does not yet exist yet
 	if _, err := os.Stat(v); !os.IsNotExist(err) {
-		return "", errors.Errorf("destination directory %s already exists", v)
+		return "", errors.Errorf("destination directory %q already exists", v)
 	}
 	return v, nil
 }

main.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/GoogleContainerTools/kpt/internal/errors"
 	"github.com/GoogleContainerTools/kpt/internal/errors/resolver"
+	"github.com/GoogleContainerTools/kpt/internal/util/cmdutil"
 	"github.com/GoogleContainerTools/kpt/run"
 	"github.com/spf13/cobra"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
@@ -75,15 +76,19 @@ func runMain() int {
 func handleErr(cmd *cobra.Command, err error) int {
 	// First attempt to see if we can resolve the error into a specific
 	// error message.
-	re, resolved := resolver.ResolveError(err)
-	if resolved {
+	if re, resolved := resolver.ResolveError(err); resolved {
 		fmt.Fprintf(cmd.ErrOrStderr(), "%s \n", re.Message)
 		return re.ExitCode
 	}
 
 	// Then try to see if it is of type *errors.Error
 	var kptErr *errors.Error
 	if errors.As(err, &kptErr) {
+		unwrapped, ok := errors.UnwrapErrors(kptErr)
+		if ok && !cmdutil.PrintErrorStacktrace() {
+			fmt.Fprintf(cmd.ErrOrStderr(), "Error: %s \n", unwrapped.Error())
+			return 1
+		}
 		fmt.Fprintf(cmd.ErrOrStderr(), "%s \n", kptErr.Error())
 		return 1
 	}