Merge pull request #186 from Yamashou/update-gqlgen

Update gqlgen

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.19
+        go-version: ^1.21
       id: go
 
     - name: Check out code into the Go module directory
@@ -31,7 +31,7 @@ jobs:
         fi
 
     - name: Install Lint
-      run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
+      run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
 
     - name: Lint
       run: make lint

.golangci.yml

@@ -46,6 +46,15 @@ linters:
     - structcheck
     - exhaustruct
     - nonamedreturns
+    - golint
+    - ifshort
+    - nosnakecase
+    - deadcode
+    - scopelint
+    - varcheck
+    - depguard
+    - musttag
+    - paralleltest
   fast: false
 
 issues:
@@ -85,10 +94,6 @@ issues:
       text: "append to slice `frontier` with non-zero initialized length" # used in config/config.go
       linters:
         - makezero
-    - path: clientv2/client_test.go
-      text: "should not use basic type string as key in context.WithValue"
-      linters:
-        - golint
     - path: clientv2/client_test.go
       text: "should not use built-in type string as key for value; define your own type to avoid collisions"
       linters:

Makefile

@@ -1,7 +1,7 @@
 MAKEFLAGS=--no-builtin-rules --no-builtin-variables --always-make
 
 fmt:
-	gofumports -local github.com/Yamashou/gqlgenc -w .
+	goimports -local github.com/Yamashou/gqlgenc -w . && gofumpt -extra -w . && gci write -s Standard -s Default .
 
 lint:
 	golangci-lint cache clean && golangci-lint run

clientgenv2/client.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/plugin"
-
 	gqlgencConfig "github.com/Yamashou/gqlgenc/config"
 )
 

clientgenv2/template.go

@@ -1,8 +1,6 @@
 package clientgenv2
 
 import (
-
-	// nolint:golint, nolintlint
 	"bytes"
 	_ "embed" // used to load template file
 	"fmt"

clientv2/client_test.go

@@ -291,7 +291,7 @@ func TestChainInterceptor(t *testing.T) {
 		require.Equal(t, someValue, val, msg...)
 	}
 
-	req, err := http.NewRequestWithContext(parentContext, http.MethodPost, "https://hogehoge/graphql", bytes.NewBuffer([]byte(requestMessage)))
+	req, err := http.NewRequestWithContext(parentContext, http.MethodPost, "https://hogehoge/graphql", bytes.NewBufferString(requestMessage))
 	require.Nil(t, err)
 
 	first := func(ctx context.Context, req *http.Request, gqlInfo *GQLRequestInfo, res interface{}, next RequestInterceptorFunc) error {