chore: update go and dependencies

Author: darkweaver87

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.60.3
+      GOLANGCI_LINT_VERSION: v2.4.0
       CGO_ENABLED: 0
 
     steps:

.golangci.yml

@@ -1,82 +1,92 @@
-run:
-  timeout: 2m
-
-linters-settings:
-  govet:
-    enable:
-      - shadow
-  gocyclo:
-    min-complexity: 23
-  goconst:
-    min-len: 3
-    min-occurrences: 3
-  misspell:
-    locale: US
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "github.com/instana/testify"
-            desc: not allowed
-          - pkg: "github.com/pkg/errors"
-            desc: Should be replaced by standard lib errors package
-  perfsprint:
-    err-error: true
-    errorf: true
-    sprintf1: true
-    strconcat: false
-
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
-    - exportloopref # Deprecated
-    - execinquery # not relevant (SQL)
-    - sqlclosecheck # not relevant (SQL)
-    - rowserrcheck # not relevant (SQL)
-    - cyclop # duplicate of gocyclo
-    - mnd
     - contextcheck
-    - lll
+    - cyclop
     - dupl
-    - prealloc
-    - gomnd
-    - wsl
-    - nlreturn
-    - gocognit
-    - nestif
-    - testpackage
-    - paralleltest
-    - tparallel
     - err113
-    - wrapcheck
     - exhaustive
     - exhaustruct
+    - gocognit
+    - lll
+    - mnd
+    - nestif
+    - nilnil
+    - nlreturn
     - noctx
+    - paralleltest
+    - prealloc
+    - rowserrcheck
+    - sqlclosecheck
+    - testpackage
+    - tparallel
     - varnamelen
-    - nilnil
-
+    - wrapcheck
+    - wsl
+    - wsl_v5
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/instana/testify
+              desc: not allowed
+            - pkg: github.com/pkg/errors
+              desc: Should be replaced by standard lib errors package
+    goconst:
+      min-len: 3
+      min-occurrences: 3
+    gocyclo:
+      min-complexity: 23
+    govet:
+      enable:
+        - shadow
+    misspell:
+      locale: US
+    perfsprint:
+      err-error: true
+      errorf: true
+      sprintf1: true
+      strconcat: false
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - funlen
+        path: (.+)_test.go
+      - path: cmd/version.go
+        text: (version|date|commit) is a global variable
+      - path: cmd/version.go
+        text: use of `fmt.Printf` forbidden by pattern
+      - path: pkg/repository/repository.go
+        text: Function 'process' has too many statements \(\d+ > 40\)
+      - path: pkg/repository/repository.go
+        text: cyclomatic complexity \d+ of func `\(Repository\)\.Process` is high \(> 16\)
+      - path: (.+)\.go$
+        text: 'ST1000: at least one file in a package should have a package comment'
+      - path: (.+)\.go$
+        text: 'package-comments: should have a package comment'
+      - path: (.+)\.go$
+        text: 'G304: Potential file inclusion via variable'
+      - path: (.+)\.go$
+        text: 'G114: Use of net/http serve function that has no support for setting timeouts'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude:
-    - 'ST1000: at least one file in a package should have a package comment'
-    - 'package-comments: should have a package comment'
-    - "G304: Potential file inclusion via variable"
-    - 'G114: Use of net/http serve function that has no support for setting timeouts'
-  exclude-rules:
-    - path: (.+)_test.go
-      linters:
-        - funlen
-    - path: cmd/version.go
-      text: (version|date|commit) is a global variable
-    - path: cmd/version.go
-      text: use of `fmt.Printf` forbidden by pattern
-    # FIXME must be changed
-    - path: pkg/repository/repository.go
-      text: Function 'Process' has too many statements \(\d+ > 40\)
-    # FIXME must be changed
-    - path: pkg/repository/repository.go
-      text: >-
-        cyclomatic complexity \d+ of func `\(Repository\)\.Process` is high \(>
-        16\)
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -16,16 +16,16 @@ default: clean check test build
 test: clean
 	go test -v -cover ./...
 
+lint:
+	golangci-lint run
+
 clean:
 	rm -rf dist/ cover.out
 
 build: clean
 	@echo Version: $(VERSION) $(BUILD_DATE)
 	CGO_ENABLED=0 go build -trimpath -ldflags '-s -w -X "main.version=${VERSION}" -X "main.commit=${SHA}" -X "main.date=${BUILD_DATE}"' -o ${BIN_OUTPUT} ./cmd/
 
-check:
-	golangci-lint run
-
 release-test:
 	goreleaser --skip=publish --snapshot --clean
 

cmd/main.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v74/github"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/traefik/lobicornis/v3/pkg/conf"

go.mod

@@ -1,21 +1,21 @@
 module github.com/traefik/lobicornis/v3
 
-go 1.23.0
+go 1.25.0
 
 require (
-	github.com/google/go-github/v58 v58.0.0
-	github.com/ldez/go-git-cmd-wrapper/v2 v2.7.0
-	github.com/rs/zerolog v1.33.0
-	github.com/stretchr/testify v1.9.0
-	golang.org/x/oauth2 v0.22.0
+	github.com/google/go-github/v74 v74.0.0
+	github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1
+	github.com/rs/zerolog v1.34.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/oauth2 v0.30.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 )

go.sum

@@ -3,35 +3,36 @@ 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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v58 v58.0.0 h1:Una7GGERlF/37XfkPwpzYJe0Vp4dt2k1kCjlxwjIvzw=
-github.com/google/go-github/v58 v58.0.0/go.mod h1:k4hxDKEfoWpSqFlc8LTpGd9fu2KrV1YAa6Hi6FmDNY4=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-github/v74 v74.0.0 h1:yZcddTUn8DPbj11GxnMrNiAnXH14gNs559AsUpNpPgM=
+github.com/google/go-github/v74 v74.0.0/go.mod h1:ubn/YdyftV80VPSI26nSJvaEsTOnsjrxG3o9kJhcyak=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-github.com/ldez/go-git-cmd-wrapper/v2 v2.7.0 h1:p+ddlPLvlBy15FCy8b9P5RkO81i+I2uIPWjaq6D1lO0=
-github.com/ldez/go-git-cmd-wrapper/v2 v2.7.0/go.mod h1:0eUeas7XtKDPKQbB0KijfaMPbuQ/cIprtoTRiwaUoFg=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1 h1:QJRB9Gs5i/h6TVJI6yl09Qm6rNooznRiKwIw+VIxd90=
+github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1/go.mod h1:0eUeas7XtKDPKQbB0KijfaMPbuQ/cIprtoTRiwaUoFg=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
-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=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=

pkg/repository/clone.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v74/github"
 	"github.com/ldez/go-git-cmd-wrapper/v2/checkout"
 	"github.com/ldez/go-git-cmd-wrapper/v2/clone"
 	"github.com/ldez/go-git-cmd-wrapper/v2/config"

pkg/repository/clone_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v74/github"
 	"github.com/ldez/go-git-cmd-wrapper/v2/git"
 	"github.com/ldez/go-git-cmd-wrapper/v2/remote"
 	"github.com/stretchr/testify/assert"
@@ -47,13 +47,8 @@ func TestClone_PullRequestForUpdate(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-			dir, err := os.MkdirTemp("", "myrmica-lobicornis")
-			require.NoError(t, err)
-
-			t.Cleanup(func() { _ = os.RemoveAll(dir) })
-
-			err = os.Chdir(dir)
-			require.NoError(t, err)
+			dir := t.TempDir()
+			t.Chdir(dir)
 
 			tempDir, err := os.Getwd()
 			require.NoError(t, err)
@@ -113,13 +108,8 @@ func TestClone_PullRequestForMerge(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-			dir, err := os.MkdirTemp("", "myrmica-lobicornis")
-			require.NoError(t, err)
-
-			t.Cleanup(func() { _ = os.RemoveAll(dir) })
-
-			err = os.Chdir(dir)
-			require.NoError(t, err)
+			dir := t.TempDir()
+			t.Chdir(dir)
 
 			tempDir, err := os.Getwd()
 			require.NoError(t, err)
@@ -194,28 +184,28 @@ func Test_makeRepositoryURL(t *testing.T) {
 
 func createFakePR(sameRepo bool) *github.PullRequest {
 	pr := &github.PullRequest{
-		Number: github.Int(666),
+		Number: github.Ptr(666),
 	}
 	pr.Base = &github.PullRequestBranch{
 		Repo: &github.Repository{
-			GitURL: github.String("git://github.com/traefik/traefik.git"),
+			GitURL: github.Ptr("git://github.com/traefik/traefik.git"),
 		},
-		Ref: github.String("master"),
+		Ref: github.Ptr("master"),
 	}
 
 	if sameRepo {
 		pr.Head = &github.PullRequestBranch{
 			Repo: &github.Repository{
-				GitURL: github.String("git://github.com/traefik/traefik.git"),
+				GitURL: github.Ptr("git://github.com/traefik/traefik.git"),
 			},
-			Ref: github.String("v1.3"),
+			Ref: github.Ptr("v1.3"),
 		}
 	} else {
 		pr.Head = &github.PullRequestBranch{
 			Repo: &github.Repository{
-				GitURL: github.String("git://github.com/ldez/traefik.git"),
+				GitURL: github.Ptr("git://github.com/ldez/traefik.git"),
 			},
-			Ref: github.String("v1.3"),
+			Ref: github.Ptr("v1.3"),
 		}
 	}
 

pkg/repository/mjolnir.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v74/github"
 	"github.com/rs/zerolog/log"
 )
 
@@ -85,7 +85,7 @@ func (m Mjolnir) closeIssue(ctx context.Context, pr *github.PullRequest, issueNu
 
 	issueRequest := &github.IssueRequest{
 		Milestone: milestone,
-		State:     github.String("closed"),
+		State:     github.Ptr("closed"),
 	}
 
 	_, _, err := m.client.Issues.Edit(ctx, m.owner, m.name, issueNumber, issueRequest)
@@ -94,7 +94,7 @@ func (m Mjolnir) closeIssue(ctx context.Context, pr *github.PullRequest, issueNu
 
 func (m Mjolnir) addComment(ctx context.Context, issueNumber int, message string) error {
 	issueComment := &github.IssueComment{
-		Body: github.String(message),
+		Body: github.Ptr(message),
 	}
 
 	_, _, err := m.client.Issues.CreateComment(ctx, m.owner, m.name, issueNumber, issueComment)