From 001e1a5da05647ada5e9edd49287e07fd0de980d Mon Sep 17 00:00:00 2001 From: James Shubin Date: Sun, 18 Aug 2024 19:07:27 -0400 Subject: [PATCH] lang: Remove some error wrapping Makes errors cleaner to read. The extra context wasn't very helpful. --- lang/funcs/wrapped/wrapped.go | 3 +-- lang/types/value.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lang/funcs/wrapped/wrapped.go b/lang/funcs/wrapped/wrapped.go index 31486c6e..5eea744e 100644 --- a/lang/funcs/wrapped/wrapped.go +++ b/lang/funcs/wrapped/wrapped.go @@ -35,7 +35,6 @@ import ( "github.com/purpleidea/mgmt/lang/interfaces" "github.com/purpleidea/mgmt/lang/types" - "github.com/purpleidea/mgmt/util/errwrap" ) var _ interfaces.Func = &Func{} // ensure it meets this expectation @@ -154,7 +153,7 @@ func (obj *Func) Stream(ctx context.Context) error { if obj.init.Debug { obj.init.Logf("Function returned error: %+v", err) } - return errwrap.Wrapf(err, "wrapped function errored") + return err } if obj.init.Debug { obj.init.Logf("Function returned with: %+v", result) diff --git a/lang/types/value.go b/lang/types/value.go index 1dcb5a49..ea1091c2 100644 --- a/lang/types/value.go +++ b/lang/types/value.go @@ -1320,7 +1320,7 @@ func (obj *FuncValue) Call(ctx context.Context, args []Value) (Value, error) { if err == nil { return nil, fmt.Errorf("function returned nil result") } - return nil, errwrap.Wrapf(err, "function returned nil result during error") + return nil, err } if err := result.Type().Cmp(obj.T.Out); err != nil { return nil, errwrap.Wrapf(err, "cannot cmp return types")