mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 12:54:38 +03:00
Support Go 1.18: Upgrade gqlgen to v0.17.2 (#2443)
* 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>
This commit is contained in:
20
vendor/github.com/99designs/gqlgen/graphql/context_operation.go
generated
vendored
20
vendor/github.com/99designs/gqlgen/graphql/context_operation.go
generated
vendored
@@ -16,10 +16,11 @@ type OperationContext struct {
|
||||
OperationName string
|
||||
Doc *ast.QueryDocument
|
||||
|
||||
Operation *ast.OperationDefinition
|
||||
DisableIntrospection bool
|
||||
Recover RecoverFunc
|
||||
ResolverMiddleware FieldMiddleware
|
||||
Operation *ast.OperationDefinition
|
||||
DisableIntrospection bool
|
||||
RecoverFunc RecoverFunc
|
||||
ResolverMiddleware FieldMiddleware
|
||||
RootResolverMiddleware RootFieldMiddleware
|
||||
|
||||
Stats Stats
|
||||
}
|
||||
@@ -37,8 +38,11 @@ func (c *OperationContext) Validate(ctx context.Context) error {
|
||||
if c.ResolverMiddleware == nil {
|
||||
return errors.New("field 'ResolverMiddleware' is required")
|
||||
}
|
||||
if c.Recover == nil {
|
||||
c.Recover = DefaultRecover
|
||||
if c.RootResolverMiddleware == nil {
|
||||
return errors.New("field 'RootResolverMiddleware' is required")
|
||||
}
|
||||
if c.RecoverFunc == nil {
|
||||
c.RecoverFunc = DefaultRecover
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -105,3 +109,7 @@ func (c *OperationContext) Errorf(ctx context.Context, format string, args ...in
|
||||
func (c *OperationContext) Error(ctx context.Context, err error) {
|
||||
AddError(ctx, err)
|
||||
}
|
||||
|
||||
func (c *OperationContext) Recover(ctx context.Context, err interface{}) error {
|
||||
return ErrorOnPath(ctx, c.RecoverFunc(ctx, err))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user