Skip to content

Commit 6137c4e

Browse files
itsmylifeitsmylife
authored
Chore: Bump golangci-lint v1.57.1 (#84998)
* bump golangci-lint v1.57.1 * update setting * remove goconst * fix linting issues * prettier * fix G601 * go mod tidy go work sync
1 parent e6fa367 commit 6137c4e

File tree

16 files changed

+186
-20
lines changed

16 files changed

+186
-20
lines changed

‎.bingo/Variables.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
3535
@echo "(re)installing $(GOBIN)/drone-v1.5.0"
3636
@cd $(BINGO_DIR) && GOWORK=off CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
3737

38-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3
38+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.57.1
3939
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
4040
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
41-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3"
42-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
41+
@echo "(re)installing $(GOBIN)/golangci-lint-v1.57.1"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.57.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
4343

4444
JB := $(GOBIN)/jb-v0.5.1
4545
$(JB): $(BINGO_DIR)/jb.mod

‎.bingo/golangci-lint.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.20
3+
go 1.21
44

5-
require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint
5+
toolchain go1.21.6
6+
7+
require github.com/golangci/golangci-lint v1.57.1 // cmd/golangci-lint

‎.bingo/golangci-lint.sum

+156
Large diffs are not rendered by default.

‎.bingo/variables.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0"
1414

1515
DRONE="${GOBIN}/drone-v1.5.0"
1616

17-
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.53.3"
17+
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.57.1"
1818

1919
JB="${GOBIN}/jb-v0.5.1"
2020

‎.golangci.toml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
[run]
22
timeout = "10m"
33

4-
[linters-settings.goconst]
5-
min-len = 5
6-
min-occurrences = 5
7-
84
[linters-settings.exhaustive]
95
default-signifies-exhaustive = true
106

@@ -87,7 +83,7 @@ enable = [
8783
"dogsled",
8884
"errcheck",
8985
# "gochecknoinits",
90-
"goconst",
86+
# "goconst",
9187
# "gocritic", # Temporarily disabled on 2022-09-09, running into weird bug "ruleguard: execution error: used Run() with an empty rule set; forgot to call Load() first?"
9288
"goimports",
9389
"goprintffuncname",
@@ -205,3 +201,10 @@ text = "ST1020"
205201
[[issues.exclude-rules]]
206202
linters = ["stylecheck"]
207203
text = "ST1021"
204+
205+
# Remove this when we have go v1.22 in place
206+
# https://stackoverflow.com/a/68247837/767660
207+
[[issues.exclude-rules]]
208+
linters = ["gosec"]
209+
path = '(.+)_test\.go'
210+
text = "G601"

‎devenv/docker/ha-test-unified-alerting/webhook-listener.go

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ func main() {
122122

123123
waitDuration := time.Duration(waitSeconds) * time.Second
124124
http.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
125-
126125
writer.WriteHeader(http.StatusOK)
127126
writer.Write([]byte(landingPage))
128127
})

‎pkg/apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21.0
55
require (
66
github.com/bwmarrin/snowflake v0.3.0
77
github.com/gorilla/mux v1.8.1
8-
github.com/grafana/grafana-plugin-sdk-go v0.216.0
8+
github.com/grafana/grafana-plugin-sdk-go v0.217.0
99
github.com/stretchr/testify v1.9.0
1010
golang.org/x/mod v0.14.0
1111
k8s.io/apimachinery v0.29.2

‎pkg/apiserver/go.sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1
7777
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
7878
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
7979
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
80-
github.com/grafana/grafana-plugin-sdk-go v0.216.0 h1:DftszjdGZM6hikBazyB7CdrhyYOwUct9s5lA/BwSl2c=
80+
github.com/grafana/grafana-plugin-sdk-go v0.217.0 h1:oQjq5KRrVrhweXHxFtEMgjv1KW7hujGiRPIYrsPZ9PE=
8181
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
8282
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=
8383
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=

‎pkg/build/frontend/config_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"os"
77
"testing"
88

9-
"github.com/grafana/grafana/pkg/build/config"
109
"github.com/stretchr/testify/require"
1110
"github.com/urfave/cli/v2"
11+
12+
"github.com/grafana/grafana/pkg/build/config"
1213
)
1314

1415
const (

‎pkg/promlib/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/grafana/grafana/pkg/promlib
33
go 1.21.0
44

55
require (
6-
github.com/grafana/grafana-plugin-sdk-go v0.216.0
6+
github.com/grafana/grafana-plugin-sdk-go v0.217.0
77
github.com/json-iterator/go v1.1.12
88
github.com/patrickmn/go-cache v2.1.0+incompatible
99
github.com/prometheus/client_golang v1.18.0

‎pkg/promlib/go.sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
3333
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
3434
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
3535
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
36-
github.com/grafana/grafana-plugin-sdk-go v0.216.0 h1:DftszjdGZM6hikBazyB7CdrhyYOwUct9s5lA/BwSl2c=
36+
github.com/grafana/grafana-plugin-sdk-go v0.217.0 h1:oQjq5KRrVrhweXHxFtEMgjv1KW7hujGiRPIYrsPZ9PE=
3737
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
3838
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
3939
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=

‎pkg/services/auth/jwt/rsa_keys_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import (
66
"encoding/pem"
77
"fmt"
88

9-
jose "github.com/go-jose/go-jose/v3"
9+
"github.com/go-jose/go-jose/v3"
1010
)
1111

1212
var rsaKeys [3]*rsa.PrivateKey
1313
var jwKeys [3]jose.JSONWebKey
1414
var jwksPublic jose.JSONWebKeySet
1515

16+
// #nosec G101
1617
const rsaKeysPEM = `
1718
-----BEGIN RSA PRIVATE KEY-----
1819
MIIEpAIBAAKCAQEA0vKKKQzRHxtnvgvScOvZW2lIBiZ0YBN8ZwAfQdpEQy2w7qAT

‎pkg/services/datasources/service/datasource_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,7 @@ AU6WWoaAIEhhbWQfth/Diz3mivl1ARB+YqiWca2mjRPLTPcKJEURDVddQ423el0Q
12981298
llG/Sw5+FquFuChaA6l5KWy7F3bQyA==
12991299
-----END CERTIFICATE-----`
13001300

1301+
// #nosec G101
13011302
const clientKey string = `-----BEGIN RSA PRIVATE KEY-----
13021303
MIIEpQIBAAKCAQEA4yWJpbI0RQkozfu9YKXlsa5veUyJzJECoZDJj+rEP3IoozYV
13031304
u5xVyZaaDm+9OpBWXmuVD5zsYjw4Pqm2YWXxrbpygSSLtsWvxuSlLIFIRzmnbttn

‎pkg/services/ngalert/schedule/registry.go

+1
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ func (r ruleWithFolder) Fingerprint() fingerprint {
217217
writeBytes(nil)
218218
return
219219
}
220+
// #nosec G103
220221
// avoid allocation when converting string to byte slice
221222
writeBytes(unsafe.Slice(unsafe.StringData(s), len(s)))
222223
}

‎pkg/services/ngalert/store/alert_rule.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ func (st DBstore) UpdateAlertRules(ctx context.Context, rules []ngmodels.UpdateR
198198
}
199199

200200
ruleVersions := make([]ngmodels.AlertRuleVersion, 0, len(rules))
201-
for _, r := range rules {
201+
for i := range rules {
202+
// We do indexed access way to avoid "G601: Implicit memory aliasing in for loop."
203+
// Doing this will be unnecessary with go 1.22 https://stackoverflow.com/a/68247837/767660
204+
r := rules[i]
202205
var parentVersion int64
203206
r.New.ID = r.Existing.ID
204207
r.New.Version = r.Existing.Version // xorm will take care of increasing it (see https://xorm.io/docs/chapter-06/1.lock/)

‎scripts/build/release_publisher/publisher_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
)
1010

1111
func TestPreparingReleaseFromRemote(t *testing.T) {
12-
1312
cases := []struct {
1413
version string
1514
expectedVersion string

0 commit comments

Comments
 (0)