lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Remove some error wrapping

Browse Source 
Makes errors cleaner to read. The extra context wasn't very helpful.
This commit is contained in:
James Shubin
2024-08-18 19:07:27 -04:00
parent 6f3c3c318b
commit 001e1a5da0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lang/funcs/wrapped/wrapped.go
View File

@@ -35,7 +35,6 @@ import (
"github.com/purpleidea/mgmt/lang/interfaces" "github.com/purpleidea/mgmt/lang/interfaces"
"github.com/purpleidea/mgmt/lang/types" "github.com/purpleidea/mgmt/lang/types"
"github.com/purpleidea/mgmt/util/errwrap"
) )
var _ interfaces.Func = &Func{} // ensure it meets this expectation 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 { if obj.init.Debug {
obj.init.Logf("Function returned error: %+v", err) obj.init.Logf("Function returned error: %+v", err)
} }
return errwrap.Wrapf(err, "wrapped function errored") return err
} }
if obj.init.Debug { if obj.init.Debug {
obj.init.Logf("Function returned with: %+v", result) obj.init.Logf("Function returned with: %+v", result)

2
lang/types/value.go
View File

@@ -1320,7 +1320,7 @@ func (obj *FuncValue) Call(ctx context.Context, args []Value) (Value, error) {
if err == nil { if err == nil {
return nil, fmt.Errorf("function returned nil result") 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 { if err := result.Type().Cmp(obj.T.Out); err != nil {
return nil, errwrap.Wrapf(err, "cannot cmp return types") return nil, errwrap.Wrapf(err, "cannot cmp return types")