From 72097e58f86a457212a7d311a9a07e35324956cb Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Wed, 8 Jan 2025 11:48:15 -0300
Subject: [PATCH] [v16] chore: Bump golangci-lint to v1.63.4 (#50867)

* chore: Bump golangci-lint to v1.63.4 (#50846)

* chore: Bump golangci-lint to v1.63.4

* Change output.uniq-by-line to issues.uniq-by-line

* fix: Use require.NoError when appropriate
---
 .golangci.yml                                        | 4 +---
 build.assets/versions.mk                             | 2 +-
 lib/integrations/awsoidc/eks_enroll_clusters_test.go | 6 +++---
 lib/services/local/access_list_test.go               | 2 +-
 lib/services/role_test.go                            | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 459c21ea657d2..4c74c7b881247 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -61,6 +61,7 @@ issues:
   exclude-use-default: true
   max-same-issues: 0
   max-issues-per-linter: 0
+  uniq-by-line: false
 
 linters:
   disable-all: true
@@ -195,9 +196,6 @@ linters-settings:
       - suite-extra-assert-call
       - suite-thelper
 
-output:
-  uniq-by-line: false
-
 run:
   go: '1.22'
   build-tags: []
diff --git a/build.assets/versions.mk b/build.assets/versions.mk
index e14043dbe2328..344a9fd53c4f1 100644
--- a/build.assets/versions.mk
+++ b/build.assets/versions.mk
@@ -4,7 +4,7 @@
 
 # Sync with devbox.json.
 GOLANG_VERSION ?= go1.22.10
-GOLANGCI_LINT_VERSION ?= v1.61.0
+GOLANGCI_LINT_VERSION ?= v1.63.4
 
 NODE_VERSION ?= 20.18.0
 
diff --git a/lib/integrations/awsoidc/eks_enroll_clusters_test.go b/lib/integrations/awsoidc/eks_enroll_clusters_test.go
index f123cc07b7615..feb5210a42ee5 100644
--- a/lib/integrations/awsoidc/eks_enroll_clusters_test.go
+++ b/lib/integrations/awsoidc/eks_enroll_clusters_test.go
@@ -171,7 +171,7 @@ func TestEnrollEKSClusters(t *testing.T) {
 			responseCheck: func(t *testing.T, response *EnrollEKSClusterResponse) {
 				require.Len(t, response.Results, 1)
 				require.Equal(t, "EKS1", response.Results[0].ClusterName)
-				require.Empty(t, response.Results[0].Error)
+				require.NoError(t, response.Results[0].Error)
 				require.NotEmpty(t, response.Results[0].ResourceId)
 			},
 		},
@@ -187,10 +187,10 @@ func TestEnrollEKSClusters(t *testing.T) {
 					return strings.Compare(a.ClusterName, b.ClusterName)
 				})
 				require.Equal(t, "EKS1", response.Results[0].ClusterName)
-				require.Empty(t, response.Results[0].Error)
+				require.NoError(t, response.Results[0].Error)
 				require.NotEmpty(t, response.Results[0].ResourceId)
 				require.Equal(t, "EKS2", response.Results[1].ClusterName)
-				require.Empty(t, response.Results[1].Error)
+				require.NoError(t, response.Results[1].Error)
 				require.NotEmpty(t, response.Results[1].ResourceId)
 			},
 		},
diff --git a/lib/services/local/access_list_test.go b/lib/services/local/access_list_test.go
index c0a41478fbb61..97bcdd5eb44ae 100644
--- a/lib/services/local/access_list_test.go
+++ b/lib/services/local/access_list_test.go
@@ -842,7 +842,7 @@ func TestAccessListReviewCRUD(t *testing.T) {
 
 	// Verify that access lists reviews are gone.
 	_, _, err = service.ListAccessListReviews(ctx, accessList1.GetName(), 0, "")
-	require.Empty(t, err)
+	require.NoError(t, err)
 }
 
 func TestAccessListRequiresEqual(t *testing.T) {
diff --git a/lib/services/role_test.go b/lib/services/role_test.go
index 9360d601bd5d9..1426139be9149 100644
--- a/lib/services/role_test.go
+++ b/lib/services/role_test.go
@@ -1090,7 +1090,7 @@ func TestValidateRole(t *testing.T) {
 			require.NoError(t, err, trace.DebugReport(err))
 
 			if len(tc.expectWarnings) == 0 {
-				require.Empty(t, warning)
+				require.NoError(t, warning)
 			}
 			for _, msg := range tc.expectWarnings {
 				require.ErrorContains(t, warning, msg)