mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 21:04:37 +03:00
45f700d6ea
* Upgrade gqlgen to v0.17.2 This enables builds on Go 1.18. github.com/vektah/gqlparser is upgraded to the newest version too. Getting this to work is a bit of a hazzle. I had to first remove vendoring from the repository, perform the upgrade and then re-introduce the vendor directory. I think gqlgens analysis went wrong for some reason on the upgrade. It would seem a clean-room installation fixed it. * Bump project to 1.18 * Update all packages, address gqlgenc breaking changes * Let `go mod tidy` handle the go.mod file * Upgrade linter to 1.45.2 * Introduce v1.45.2 of the linter The linter now correctly warns on `strings.Title` because it isn't unicode-aware. Fix this by using the suggested fix from x/text/cases to produce unicode-aware strings. The mapping isn't entirely 1-1 as this new approach has a larger iface: it spans all of unicode rather than just ASCII. It coincides for ASCII however, so things should be largely the same. * Ready ourselves for errchkjson and contextcheck. * Revert dockerfile golang version changes for now Co-authored-by: Kermie <kermie@isinthe.house> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
33 lines
648 B
Go
33 lines
648 B
Go
package graphql
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"github.com/vektah/gqlparser/v2/gqlerror"
|
|
)
|
|
|
|
type ErrorPresenterFunc func(ctx context.Context, err error) *gqlerror.Error
|
|
|
|
func DefaultErrorPresenter(ctx context.Context, err error) *gqlerror.Error {
|
|
var gqlErr *gqlerror.Error
|
|
if errors.As(err, &gqlErr) {
|
|
return gqlErr
|
|
}
|
|
return gqlerror.WrapPath(GetPath(ctx), err)
|
|
}
|
|
|
|
func ErrorOnPath(ctx context.Context, err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
var gqlErr *gqlerror.Error
|
|
if errors.As(err, &gqlErr) {
|
|
if gqlErr.Path == nil {
|
|
gqlErr.Path = GetPath(ctx)
|
|
}
|
|
return gqlErr
|
|
}
|
|
return gqlerror.WrapPath(GetPath(ctx), err)
|
|
}
|