From 648e994e3b3759e50f1b8727f984e639e606d488 Mon Sep 17 00:00:00 2001
From: Caleb Doxsey <cdoxsey@pomerium.com>
Date: Wed, 4 Sep 2024 10:27:43 -0600
Subject: [PATCH] sdk-go/ci: update lint

---
 .github/workflows/lint.yaml |  4 ++--
 .golangci.yml               | 21 +++++----------------
 .tool-versions              |  2 +-
 Makefile                    |  1 -
 jwks_test.go                |  2 +-
 sdk_test.go                 |  2 +-
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 379f3a8..d42e427 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -17,9 +17,9 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
         with:
-          go-version: 1.21.x
+          go-version: 1.23.x
           cache: false
 
       - uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
         with:
-          version: v1.55
+          version: v1.60.1
diff --git a/.golangci.yml b/.golangci.yml
index 1885fb8..27d1ec6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,3 @@
-run:
-  deadline: 20m
-
 linters-settings:
   dupl:
     threshold: 100
@@ -8,7 +5,11 @@ linters-settings:
     lines: 100
     statements: 50
   gci:
-    local-prefixes: github.com/pomerium/pomerium
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/pomerium)
   goconst:
     min-len: 2
     min-occurrences: 2
@@ -29,18 +30,11 @@ linters-settings:
     min-complexity: 15
   goimports:
     local-prefixes: github.com/pomerium/pomerium
-  golint:
-    min-confidence: 0
-  govet:
-    check-shadowing: false
   lll:
     line-length: 160
-  maligned:
-    suggest-new: true
   misspell:
     locale: US
   nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
@@ -149,8 +143,3 @@ issues:
       text: "Potential hardcoded credentials"
       linters:
         - gosec
-
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.34.x # use the fixed version to not introduce new linters unexpectedly
diff --git a/.tool-versions b/.tool-versions
index d70ca2f..1a59aeb 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.21.3
+golang 1.23.0
diff --git a/Makefile b/Makefile
index d02ee35..1e7ef77 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ PKG := github.com/pomerium/$(NAME)
 
 BUILDDIR := ${PREFIX}/dist
 BINDIR := ${PREFIX}/bin
-GOLANGCI_VERSION = v1.47.2
 
 
 .PHONY: all
diff --git a/jwks_test.go b/jwks_test.go
index 0d3714a..dcc8a14 100644
--- a/jwks_test.go
+++ b/jwks_test.go
@@ -23,7 +23,7 @@ func TestFetchJSONWebKeySet(t *testing.T) {
 	ctx, clearTimeout := context.WithTimeout(context.Background(), time.Second*10)
 	t.Cleanup(clearTimeout)
 
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		io.WriteString(w, `{
 			"keys": [
 			  {
diff --git a/sdk_test.go b/sdk_test.go
index 7c2cd6a..6ccd8a1 100644
--- a/sdk_test.go
+++ b/sdk_test.go
@@ -51,7 +51,7 @@ func TestVerifier_GetIdentity(t *testing.T) {
 		}
 		fmt.Fprint(w, a.Email)
 	})
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		b, err := json.Marshal(jwks)
 		assert.NoError(t, err)
 		fmt.Fprint(w, string(b))