larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use errors.As to extract odataError (#3690)

Browse Source 
casting only the top level error to an odataError
will slice out useful data when the odataError is
wrapped, stacked, or otherwise nested.

---

#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🐛 Bugfix

#### Test Plan

- [x] ⚡ Unit test
- [x] 💚 E2E
This commit is contained in:
Keepers 2023-06-27 17:56:27 -06:00 committed by GitHub
parent c7ce9f4c0e
commit df100b9b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal/m365/graph/errors.go
View File

@ -227,7 +227,7 @@ func hasErrorCode(err error, codes ...errorCode) bool {
return false
}
var oDataError *odataerrors.ODataError
var oDataError odataerrors.ODataErrorable
if !errors.As(err, &oDataError) {
return false
}
@ -252,12 +252,12 @@ func Wrap(ctx context.Context, e error, msg string) *clues.Err {
return nil
}
odErr, ok := e.(odataerrors.ODataErrorable)
if !ok {
var oDataError odataerrors.ODataErrorable
if !errors.As(e, &oDataError) {
return clues.Wrap(e, msg).WithClues(ctx)
}
mainMsg, data, innerMsg := errData(odErr)
mainMsg, data, innerMsg := errData(oDataError)
if len(mainMsg) > 0 {
e = clues.Stack(e, clues.New(mainMsg))
@ -273,12 +273,12 @@ func Stack(ctx context.Context, e error) *clues.Err {
return nil
}
odErr, ok := e.(odataerrors.ODataErrorable)
if !ok {
var oDataError *odataerrors.ODataError
if !errors.As(e, &oDataError) {
return clues.Stack(e).WithClues(ctx)
}
mainMsg, data, innerMsg := errData(odErr)
mainMsg, data, innerMsg := errData(oDataError)
if len(mainMsg) > 0 {
e = clues.Stack(e, clues.New(mainMsg))