Skip to content

Commit

Permalink
[v17] chore: Bump golangci-lint to v1.63.4 (#50865)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
codingllama authored Jan 8, 2025
1 parent 40ec85f commit 8e792e2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
4 changes: 1 addition & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -270,9 +271,6 @@ linters-settings:
- p: '^rsa\.GenerateKey$'
msg: 'generating RSA keys is slow, use lib/cryptosuites to generate an appropriate key type'

output:
uniq-by-line: false

run:
go: '1.23'
build-tags: []
Expand Down
2 changes: 1 addition & 1 deletion build.assets/versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Sync with devbox.json.
GOLANG_VERSION ?= go1.23.4
GOLANGCI_LINT_VERSION ?= v1.61.0
GOLANGCI_LINT_VERSION ?= v1.63.4

NODE_VERSION ?= 20.18.0

Expand Down
4 changes: 2 additions & 2 deletions lib/integrations/awsoidc/eks_enroll_clusters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,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.Empty(t, response.Results[0].IssueType)
require.NotEmpty(t, response.Results[0].ResourceId)
},
Expand All @@ -187,7 +187,7 @@ 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.Empty(t, response.Results[0].IssueType)
require.NotEmpty(t, response.Results[0].ResourceId)
require.Equal(t, "EKS2", response.Results[1].ClusterName)
Expand Down
2 changes: 1 addition & 1 deletion lib/services/local/access_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/services/role_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,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)
Expand Down

0 comments on commit 8e792e2

Please sign in to comment.