patchy/jsrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose GetHTTPError()

Browse Source
This commit is contained in:
Ian Gulliver
2023-04-27 16:47:54 -07:00
parent 1d2f776907
commit bbc8de765b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
error.go
View File

@@ -99,7 +99,7 @@ func WriteError(w http.ResponseWriter, err error) {
func Errorf(he *HTTPError, format string, a ...any) error { func Errorf(he *HTTPError, format string, a ...any) error {
err := fmt.Errorf(format, a...) //nolint:goerr113 err := fmt.Errorf(format, a...) //nolint:goerr113
if hasHTTPError(err) { if GetHTTPError(err) != nil {
return err return err
} }
@@ -158,22 +158,23 @@ type multiUnwrap interface {
Unwrap() []error Unwrap() []error
} }
func hasHTTPError(err error) bool { func GetHTTPError(err error) *HTTPError {
if _, has := err.(*HTTPError); has { //nolint:errorlint if hErr, has := err.(*HTTPError); has { //nolint:errorlint
return true return hErr
} }
if unwrap, ok := err.(singleUnwrap); ok { //nolint:errorlint if unwrap, ok := err.(singleUnwrap); ok { //nolint:errorlint
return hasHTTPError(unwrap.Unwrap()) return GetHTTPError(unwrap.Unwrap())
} else if unwrap, ok := err.(multiUnwrap); ok { //nolint:errorlint } else if unwrap, ok := err.(multiUnwrap); ok { //nolint:errorlint
for _, sub := range unwrap.Unwrap() { for _, sub := range unwrap.Unwrap() {
if hasHTTPError(sub) { hErr := GetHTTPError(sub)
return true if hErr != nil {
return hErr
} }
} }
} }
return false return nil
} }
func (je *JSONError) importError(err error) { func (je *JSONError) importError(err error) {