Update toolchain (#99)

kgaughan · web-flow · commit 154048d60914 · 2025-04-05T19:01:38.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -24,6 +24,6 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.59.1
+        version: v1.64.8
         args: --issues-exit-code=0
         only-new-issues: true
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -24,10 +24,10 @@ linters:
     - nonamedreturns
     - revive
     - staticcheck
-    - tenv
     - typecheck
     - unconvert
     - unused
+    - usetesting
     - wrapcheck
 
     # Undecided
diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/kgaughan/gcredstash
 
-go 1.18
+go 1.22
+
+toolchain go1.23.2
 
 require (
 	github.com/aws/aws-sdk-go v1.55.6
diff --git a/go.sum b/go.sum
@@ -3,6 +3,7 @@ github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQ
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
diff --git a/internal/testutils/cobra.go b/internal/testutils/cobra.go
@@ -9,6 +9,6 @@ import (
 func NewDummyCommand() (*cobra.Command, *strings.Builder) {
 	out := &strings.Builder{}
 	cmd := &cobra.Command{}
-	cmd.SetOutput(out)
+	cmd.SetOut(out)
 	return cmd, out
 }
diff --git a/internal/utils.go b/internal/utils.go
@@ -64,17 +64,17 @@ func JSONMarshal(t interface{}) ([]byte, error) {
 }
 
 func MaxKeyLen(items map[*string]*string) int {
-	max := 0
+	maxlen := 0
 
 	for key := range items {
 		keyLen := len(*key)
 
-		if keyLen > max {
-			max = keyLen
+		if keyLen > maxlen {
+			maxlen = keyLen
 		}
 	}
 
-	return max
+	return maxlen
 }
 
 func LookupEnvDefault(defaultVal string, envVars ...string) string {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ import (`
`9`	`9`	`func NewDummyCommand() (cobra.Command, strings.Builder) {`
`10`	`10`	`out := &strings.Builder{}`
`11`	`11`	`cmd := &cobra.Command{}`
`12`		`- cmd.SetOutput(out)`
	`12`	`+ cmd.SetOut(out)`
`13`	`13`	`return cmd, out`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,17 +64,17 @@ func JSONMarshal(t interface{}) ([]byte, error) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func MaxKeyLen(items map[string]string) int {`
`67`		`- max := 0`
	`67`	`+ maxlen := 0`
`68`	`68`
`69`	`69`	`for key := range items {`
`70`	`70`	`keyLen := len(*key)`
`71`	`71`
`72`		`- if keyLen > max {`
`73`		`- max = keyLen`
	`72`	`+ if keyLen > maxlen {`
	`73`	`+ maxlen = keyLen`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- return max`
	`77`	`+ return maxlen`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`func LookupEnvDefault(defaultVal string, envVars ...string) string {`