Bump golangci/golangci-lint-action from 6.3.2 to 6.5.0 (#83)

dependabot[bot] · SVilgelm · web-flow · commit 7fdcf4a7fee9 · 2025-03-03T19:45:11.000-08:00
* Bump golangci/golangci-lint-action from 6.3.2 to 6.5.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.3.2 to 6.5.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v6.3.2...v6.5.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix CI and use Go v1.24 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sergey Vilgelm <sergey@vilgelm.com>
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -10,61 +10,49 @@ on:
   schedule:
     - cron: "0 0 * * 0"
 
-env:
-  GO: 1.23
-
-jobs:
-  CodeQL:
-    runs-on: ubuntu-latest
-
-    permissions:
-      security-events: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+concurrency:
+  group: ${{ format('{0}-{1}', github.workflow, github.head_ref) }}
+  cancel-in-progress: true
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: go
+env:
+  GO: "1.24"
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+permissions: read-all
 
+jobs:
   UnitTests:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2 # immutable action, safe to use a version instead of hashtag
 
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v5.3.0 # immutable action, safe to use a version instead of hashtag
         with:
           go-version: ${{ env.GO }}
 
       - name: Run Unit Tests
         run: go test -race -cover -coverprofile=coverage.out -covermode=atomic
 
       - name: Codecov
-        uses: codecov/codecov-action@v5.3.1
-        with:
-          file: ./coverage.out
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   GolangCI-Lint:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2 # immutable action, safe to use a version instead of hashtag
 
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v5.3.0 # immutable action, safe to use a version instead of hashtag
         with:
           go-version: ${{ env.GO }}
 
       - name: Run GolangCi-Lint
-        uses: golangci/golangci-lint-action@v6.3.2
+        uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
           version: latest
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,49 +1,77 @@
-run:
-  skip-dirs-use-default: true
-
 linters:
   enable: # keep in ascending order
+    - asasalint
     - asciicheck
     - bodyclose
+    - contextcheck
+    - copyloopvar
     - dupl
     - durationcheck
+    - err113
+    - errcheck
+    - errorlint
     - exhaustive
-    - exportloopref
+    - exptostd
+    - fatcontext
     - gci
+    - gocheckcompilerdirectives
+    - gochecksumtype
     - gocognit
     - goconst
     - gocritic
     - gocyclo
-    - goerr113
     - gofumpt
     - goprintffuncname
     - gosec
+    - gosimple
+    - govet
+    - iface
+    - inamedparam
+    - ineffassign
+    - intrange
     - lll
+    - mirror
     - misspell
+    - musttag
     - nestif
+    - nilerr
     - noctx
     - nolintlint
+    - perfsprint
     - prealloc
     - predeclared
+    - reassign
+    - recvcheck
+    - sloglint
+    - staticcheck
+    - tagliatelle
+    - testableexamples
+    - testifylint
+    - testpackage
     - thelper
+    - tparallel
     - unconvert
     - unparam
     - unused
+    - usestdlibvars
+    - usetesting
+    - wastedassign
     - whitespace
 
 linters-settings:
   dupl:
     threshold: 100
   misspell:
     locale: US
-  golint:
-    min-confidence: 0
   govet:
     enable-all: true
     disable:
       - shadow
   gci:
-    local-prefixes: github.com/sv-tools/conf-reader-env
+    sections:
+      - standard
+      - default
+      - prefix(github.com/sv-tools/conf-reader-env)
   gocognit:
     min-complexity: 15
   gocyclo:
@@ -56,8 +84,6 @@ linters-settings:
   goconst:
     min-len: 3
     min-occurrences: 3
-  maligned:
-    suggest-new: true
   prealloc:
     for-loops: true
   gocritic:
diff --git a/go.mod b/go.mod
@@ -1,17 +1,15 @@
 module github.com/sv-tools/conf-reader-env
 
-go 1.23
-
-toolchain go1.23.0
+go 1.24.0
 
 require (
 	github.com/stretchr/testify v1.10.0
-	github.com/sv-tools/conf v1.3.0
+	github.com/sv-tools/conf v1.4.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -14,10 +14,14 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
 github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 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/sv-tools/conf v1.3.0 h1:efYrEHeHQu5uaeqL7gVu5oP19M9ksckUnbZON4RrGYI=
 github.com/sv-tools/conf v1.3.0/go.mod h1:fogkBBqNOnCyvQeU6kZuDw/dMtw4qyOQBJXgh+P47Zo=
+github.com/sv-tools/conf v1.4.0 h1:IT/6x899dsSe9mv/oBAKqKpPVpL/0Q1gkSk0iPr2mvY=
+github.com/sv-tools/conf v1.4.0/go.mod h1:l4wXlwHUJtPjsgT2KIZVC0LrgleMRiQFD0eMoMb5o9I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/reader.go b/reader.go
@@ -16,7 +16,7 @@ func (r *envReader) Prefix() string {
 	return r.prefix
 }
 
-func (r *envReader) Read(ctx context.Context) (interface{}, error) {
+func (r *envReader) Read(ctx context.Context) (any, error) {
 	res := map[string]string{}
 	for env, key := range r.mapEnvKey {
 		if value, ok := os.LookupEnv(env); ok {
diff --git a/reader_test.go b/reader_test.go
@@ -15,13 +15,10 @@ import (
 const envName = "TEST_FOO"
 
 func TestNew(t *testing.T) {
-	t.Cleanup(func() {
-		require.NoError(t, os.Unsetenv(envName))
-	})
-	require.NoError(t, os.Setenv(envName, "42"))
+	t.Setenv(envName, "42")
 
 	c := conf.New().WithReaders(confenv.New(map[string]string{envName: "foo"}, ""))
-	require.NoError(t, c.Load(context.Background()))
+	require.NoError(t, c.Load(t.Context()))
 
 	require.Equal(t, 42, c.GetInt("foo"))
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func (r *envReader) Prefix() string {`
`16`	`16`	`return r.prefix`
`17`	`17`	`}`
`18`	`18`
`19`		`-func (r *envReader) Read(ctx context.Context) (interface{}, error) {`
	`19`	`+func (r *envReader) Read(ctx context.Context) (any, error) {`
`20`	`20`	`res := map[string]string{}`
`21`	`21`	`for env, key := range r.mapEnvKey {`
`22`	`22`	`if value, ok := os.LookupEnv(env); ok {`