Merge pull request #41 from strvcom/chore/update

chore: update dependencies

Author: TomasKocman

.github/actions/setup-go/action.yml

@@ -11,9 +11,13 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Get Go version
+      id: go-version
+      shell: bash
+      run: echo "go-version=$(sed -ne '/^toolchain /s/^toolchain go//p' go.mod)" >> $GITHUB_OUTPUT
     - id: go-setup
       uses: actions/setup-go@v5
       with:
-        go-version-file: go.mod
+        go-version: ${{ steps.go-version.outputs.go-version }}
         check-latest: true
         cache: ${{ inputs.cache }}

.github/workflows/lint.yaml

@@ -12,7 +12,6 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    continue-on-error: true
     permissions:
       contents: read
     steps:
@@ -21,6 +20,7 @@ jobs:
       - name: Install Go
         uses: ./.github/actions/setup-go
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.62.0
+          version: v2.4.0
+

.github/workflows/vuln-scan.yaml

@@ -19,15 +19,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Go
         uses: ./.github/actions/setup-go
-      - name: Install govulncheck
-        run: |
-          go install golang.org/x/vuln/cmd/govulncheck@latest
-      - name: Run govulncheck
-        run: |
-          govulncheck ./...
       - name: Install OSV Scanner
         run: |
-          go install github.com/google/osv-scanner/cmd/osv-scanner@v1
+          go install github.com/google/osv-scanner/v2/cmd/osv-scanner@latest
       - name: Run OSV Scanner
         run: |
           osv-scanner -r .

.golangci.yml

@@ -1,87 +1,153 @@
+version: "2"
+run:
+  timeout: 3m
 linters:
-  # Disable all linters.
-  # Default: false
-  disable-all: true
-  # Enable specific linter
-  # https://golangci-lint.run/usage/linters/#enabled-by-default-linters
   enable:
-    # default linters
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    # extra linters
+    - asasalint
+    - asciicheck
     - bidichk
     - bodyclose
+    - canonicalheader
+    - copyloopvar
+    - dogsled
+    - dupl
     - durationcheck
+    - errcheck
     - errname
     - errorlint
     - exhaustive
+    - exptostd
+    - fatcontext
+    - forbidigo
+    - funcorder
+    - funlen
+    - gocheckcompilerdirectives
+    - gochecksumtype
     - gocognit
     - goconst
     - gocritic
-    - gofmt
-    - mnd
+    - gocyclo
+    - gomoddirectives
+    - goprintffuncname
     - gosec
+    - gosmopolitan
+    - govet
+    - iface
+    - ineffassign
+    - importas
+    - inamedparam
+    - intrange
+    - loggercheck
+    - maintidx
+    - makezero
+    - mirror
     - misspell
+    - mnd
+    - musttag
+    - nakedret
+    - nestif
     - nilerr
-    - revive
+    - nilnesserr
+    - noctx
+    - nolintlint
+    - nosprintfhostport
+    - perfsprint
     - prealloc
-    - stylecheck
-    - tenv
+    - predeclared
+    - reassign
+    - revive
+    - rowserrcheck
+    - sloglint
+    - spancheck
+    - sqlclosecheck
+    - staticcheck
+    - testableexamples
+    - testifylint
     - thelper
     - tparallel
     - unconvert
     - unparam
+    - unused
     - usestdlibvars
+    - usetesting
     - wastedassign
     - whitespace
-
-linters-settings:
-  gomnd:
-    ignored-functions:
-      - 'strconv.Parse*'
-      - 'strconv.Format*'
-      - 'strings.SplitN'
-  goconst:
-    ignore-tests: true
-  gocognit:
-    min-complexity: 20
-  revive:
+    # disabled
+    #- containedctx
+    #- contextcheck
+    #- decorder
+    #- depguard
+    #- dupword
+    #- err113
+    #- errchkjson
+    #- exhaustruct
+    #- forcetypeassert
+    #- ginkgolinter
+    #- gochecknoglobals
+    #- gochecknoinits
+    #- godot
+    #- godox
+    #- goheader
+    #- gomodguard
+    #- grouper
+    #- interfacebloat
+    #- ireturn
+    #- lll
+    #- nilnil
+    #- nlreturn
+    #- nonamedreturns
+    #- paralleltest
+    #- promlinter
+    #- protogetter
+    #- recvcheck
+    #- tagalign
+    #- tagliatelle
+    #- testpackage
+    #- varnamelen
+    #- wrapcheck
+    #- wsl
+    #- zerologlint
+  settings:
+    gocognit:
+      min-complexity: 20
+    gocyclo:
+      min-complexity: 20
+    inamedparam:
+      skip-single-param: true
+    mnd:
+      ignored-functions:
+        - os.Chmod
+        - os.Mkdir.*
+        - os.OpenFile
+        - os.WriteFile
+        - strconv.Parse*
+        - strconv.Format*
+        - strings.SplitN
+    nakedret:
+      max-func-lines: 0
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: atomic
-        severity: warning
-        disabled: false
-      - name: context-keys-type
-        severity: warning
-        disabled: false
-      - name: defer
-        severity: warning
-        disabled: false
-      - name: early-return
-        severity: warning
-        disabled: false
-      - name: indent-error-flow
-        severity: warning
-        disabled: false
-      - name: range-val-in-closure
-        severity: warning
-        disabled: false
-      - name: range-val-address
-        severity: warning
-        disabled: false
-      - name: string-of-int
-        severity: warning
-        disabled: false
-      - name: superfluous-else
-        severity: warning
-        disabled: false
-      - name: time-equal
-        severity: warning
-        disabled: false
-      - name: unhandled-error
-        severity: warning
-        disabled: false
+      # Unit tests.
+      - path: (.+)_test\.go
+        linters:
+          - gosec
+          - funlen
+formatters:
+  enable:
+    - gci
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(go.strv.io)
+      custom-order: true
+  exclusions:
+    generated: lax

CODEOWNERS

@@ -1 +1 @@
-* @TomasKocman @bafko @Fazt01 @xburda4
+* @TomasKocman @bafko @xburda4

go.mod

@@ -1,18 +1,20 @@
 module go.strv.io/net
 
-go 1.23.3
+go 1.23.0
+
+toolchain go1.25.0
 
 require (
-	github.com/99designs/gqlgen v0.17.56
-	github.com/go-chi/chi/v5 v5.1.0
+	github.com/99designs/gqlgen v0.17.78
+	github.com/go-chi/chi/v5 v5.2.2
 	github.com/google/uuid v1.6.0
-	github.com/stretchr/testify v1.9.0
-	github.com/vektah/gqlparser/v2 v2.5.19
-	go.strv.io/time v0.2.1
+	github.com/stretchr/testify v1.10.0
+	github.com/vektah/gqlparser/v2 v2.5.30
+	go.strv.io/time v0.2.2
 )
 
 require (
-	github.com/agnivade/levenshtein v1.1.1 // indirect
+	github.com/agnivade/levenshtein v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -1,18 +1,18 @@
-github.com/99designs/gqlgen v0.17.56 h1:+J42ARAHvnysH6klO9Wq+tCsGF32cpAgU3SyF0VRJtI=
-github.com/99designs/gqlgen v0.17.56/go.mod h1:rmB6vLvtL8uf9F9w0/irJ5alBkD8DJvj35ET31BKbtY=
-github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
-github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
+github.com/99designs/gqlgen v0.17.78 h1:bhIi7ynrc3js2O8wu1sMQj1YHPENDt3jQGyifoBvoVI=
+github.com/99designs/gqlgen v0.17.78/go.mod h1:yI/o31IauG2kX0IsskM4R894OCCG1jXJORhtLQqB7Oc=
+github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
+github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
-github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
-github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7cNTs5R6Hk4V2lcmLz2NsG2VnInyNo=
+github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -32,12 +32,12 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sosodev/duration v1.3.1 h1:qtHBDMQ6lvMQsL15g4aopM4HEfOaYuhWBw3NPTtlqq4=
 github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/vektah/gqlparser/v2 v2.5.19 h1:bhCPCX1D4WWzCDvkPl4+TP1N8/kLrWnp43egplt7iSg=
-github.com/vektah/gqlparser/v2 v2.5.19/go.mod h1:y7kvl5bBlDeuWIvLtA9849ncyvx6/lj06RsMrEjVy3U=
-go.strv.io/time v0.2.1 h1:obREp9amvObE2dLpdXByMIz0TaZeBDODvSSV5u0szgo=
-go.strv.io/time v0.2.1/go.mod h1:+719M6ltN7ON7qC7Ieb1FLyrBcdEWu8Z/czdtB3kZ98=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=
+github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
+go.strv.io/time v0.2.2 h1:DjcKzVXSd3f+MNV309w7DwP7DL0o8teQyCwpCC11n44=
+go.strv.io/time v0.2.2/go.mod h1:jE1ulw4Y5a3m5+pQXKmM+WhfzXuebv189qZJhRMvQCA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

graphql/extension/extension.go

@@ -70,7 +70,7 @@ func checkRecursionLimitByTypeAndField(rCtx recursionContext, typeName string, s
 		if err != nil {
 			return err
 		}
-		rCtx.typeAndFieldCount[nesting] -= 1
+		rCtx.typeAndFieldCount[nesting]--
 	}
 
 	return nil

graphql/extension/extension_test.go

@@ -80,12 +80,12 @@ func (e executableSchema) Schema() *ast.Schema {
 	return parsedSchema
 }
 
-func (e executableSchema) Complexity(_, _ string, _ int, _ map[string]interface{}) (int, bool) {
+func (e executableSchema) Complexity(_ context.Context, _, _ string, _ int, _ map[string]any) (int, bool) {
 	return 0, false
 }
 
 func (e executableSchema) Exec(_ context.Context) graphql.ResponseHandler {
-	return func(ctx context.Context) *graphql.Response {
+	return func(_ context.Context) *graphql.Response {
 		return &graphql.Response{}
 	}
 }

http/middleware.go

@@ -119,9 +119,9 @@ func LoggingMiddleware(l *slog.Logger) func(http.Handler) http.Handler {
 			}
 
 			if statusCode >= http.StatusInternalServerError {
-				withRequestData(l, rw, ld).Error("request processed")
+				withRequestData(l, rw, ld).ErrorContext(r.Context(), "request processed")
 			} else {
-				withRequestData(l, rw, ld).Info("request processed")
+				withRequestData(l, rw, ld).InfoContext(r.Context(), "request processed")
 			}
 		})
 	}