chore: update golangci-lint to v1.62.0

99designs · Nov 24, 2024 · e9987e9 · e9987e9
1 parent de7923e
commit e9987e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   golangci-lint:
     env:
-      GOLANGCI_LINT_VERSION: v1.60.2
+      GOLANGCI_LINT_VERSION: v1.62.0
     strategy:
       matrix:
         go: ["1.22", "1.23"]

diff --git a/codegen/testserver/followschema/directive_test.go b/codegen/testserver/followschema/directive_test.go
@@ -112,6 +112,7 @@ func TestDirectives(t *testing.T) {
 	srv := handler.NewDefaultServer(NewExecutableSchema(Config{
 		Resolvers: resolvers,
 		Directives: DirectiveRoot{
+			//nolint:revive // can't rename min, max because it's generated code
 			Length: func(ctx context.Context, obj any, next graphql.Resolver, min int, max *int, message *string) (any, error) {
 				e := func(msg string) error {
 					if message == nil {
@@ -133,6 +134,7 @@ func TestDirectives(t *testing.T) {
 				}
 				return res, nil
 			},
+			//nolint:revive // can't rename min, max because it's generated code
 			Range: func(ctx context.Context, obj any, next graphql.Resolver, min *int, max *int) (any, error) {
 				res, err := next(ctx)
 				if err != nil {

diff --git a/codegen/testserver/singlefile/directive_test.go b/codegen/testserver/singlefile/directive_test.go
@@ -112,6 +112,7 @@ func TestDirectives(t *testing.T) {
 	srv := handler.NewDefaultServer(NewExecutableSchema(Config{
 		Resolvers: resolvers,
 		Directives: DirectiveRoot{
+			//nolint:revive // can't fix min, max because it's generated code
 			Length: func(ctx context.Context, obj any, next graphql.Resolver, min int, max *int, message *string) (any, error) {
 				e := func(msg string) error {
 					if message == nil {
@@ -133,6 +134,7 @@ func TestDirectives(t *testing.T) {
 				}
 				return res, nil
 			},
+			//nolint:revive // can't rename min, max because it's generated code
 			Range: func(ctx context.Context, obj any, next graphql.Resolver, min *int, max *int) (any, error) {
 				res, err := next(ctx)
 				if err != nil {

diff --git a/handler/handler.go b/handler/handler.go
@@ -104,9 +104,9 @@ func WebsocketUpgrader(upgrader websocket.Upgrader) Option {
 }
 
 // Deprecated: switch to graphql/handler.New
-func RecoverFunc(recover graphql.RecoverFunc) Option {
+func RecoverFunc(recoverFn graphql.RecoverFunc) Option {
 	return func(cfg *Config) {
-		cfg.recover = recover
+		cfg.recover = recoverFn
 	}
 }