IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade golangci-lint to v1.51.2 (#63630)

Browse Source 
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
This commit is contained in:
Emil Tullstedt 2023-02-23 15:10:03 +01:00 committed by GitHub
parent c769a6281e
commit 3abaf32cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 225 additions and 776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.bingo/Variables.mk
View File

@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.7. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
GOPATH ?= $(shell go env GOPATH)
@ -35,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
@echo "(re)installing $(GOBIN)/drone-v1.5.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.50.1
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/golangci-lint-v1.50.1"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.50.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
@echo "(re)installing $(GOBIN)/golangci-lint-v1.51.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.51.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
JB := $(GOBIN)/jb-v0.5.1
$(JB): $(BINGO_DIR)/jb.mod

4
.bingo/golangci-lint.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.19
go 1.20
require github.com/golangci/golangci-lint v1.50.1 // cmd/golangci-lint
require github.com/golangci/golangci-lint v1.51.2 // cmd/golangci-lint

858
.bingo/golangci-lint.sum
View File

File diff suppressed because it is too large Load Diff

4
.bingo/variables.env
View File

@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.7. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
# Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
GOBIN=${GOBIN:=$(go env GOBIN)}
@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0-beta.2"
DRONE="${GOBIN}/drone-v1.5.0"
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.50.1"
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.51.2"
JB="${GOBIN}/jb-v0.5.1"

1
.golangci.toml
View File

@ -57,7 +57,6 @@ enable = [
"typecheck",
"asciicheck",
"errorlint",
"sqlclosecheck",
"revive",
]

8
pkg/api/quota_test.go
View File

@ -25,14 +25,6 @@ var (
testUpdateOrgQuotaCmd = `{ "limit": 20 }`
)
var testOrgQuota = setting.OrgQuota{
User: 10,
DataSource: 10,
Dashboard: 10,
ApiKey: 10,
AlertRule: 10,
}
func TestAPIEndpoint_GetCurrentOrgQuotas_LegacyAccessControl(t *testing.T) {
cfg := setting.NewCfg()
cfg.Quota.Enabled = true

5
pkg/build/cmd/flags.go
View File

@ -41,11 +41,6 @@ var (
Name: "dry-run",
Usage: "Only simulate actions",
}
gcpKeyFlag = cli.StringFlag{
Name: "gcp-key",
Usage: "Google Cloud Platform key file",
Required: true,
}
gitHubTokenFlag = cli.StringFlag{
Name: "github-token",
Value: "",

4
pkg/services/ngalert/provisioning/notification_policies.go
View File

@ -74,6 +74,10 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
}
receivers, err := nps.receiversToMap(revision.cfg.AlertmanagerConfig.Receivers)
if err != nil {
return err
}
err = tree.ValidateReceivers(receivers)
if err != nil {
return fmt.Errorf("%w: %s", ErrValidation, err.Error())

4
pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
View File

@ -150,9 +150,7 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashes []dashboard, acl
return fmt.Errorf("failed to bulk-create roles: %w", err)
}
for i := range createdRoles {
allRoles = append(allRoles, createdRoles[i])
}
allRoles = append(allRoles, createdRoles...)
if err := m.bulkAssignRoles(createdRoles); err != nil {
return fmt.Errorf("failed to bulk-assign roles: %w", err)

4
pkg/services/sqlstore/session_test.go
View File

@ -66,6 +66,10 @@ func TestRetryingOnFailures(t *testing.T) {
// Check SQL query
sess := store.GetSqlxSession()
rows, err := sess.Query(context.Background(), `SELECT "hello",2.3,4`)
t.Cleanup(func() {
err := rows.Close()
require.NoError(t, err)
})
require.NoError(t, err)
require.True(t, rows.Next()) // first row

10
pkg/services/store/entity/sqlstash/folder_support.go
View File

@ -50,14 +50,20 @@ func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenant int64)
}
err = rows.Scan(&folder.UID, &folder.parentUID, &folder.Name, &folder.originalSlug)
if err != nil {
return err
break
}
all = append(all, &folder)
}
err = rows.Close()
errClose := rows.Close()
// TODO: Use some kind of multi-error.
// Until then, we want to prioritize errors coming from the .Scan
// over those coming from .Close.
if err != nil {
return err
}
if errClose != nil {
return errClose
}
root, lost, err := buildFolderTree(all)
if err != nil {

29
pkg/services/store/entity/sqlstash/sql_storage_server.go
View File

@ -474,15 +474,19 @@ func (s *sqlEntityServer) fillCreationInfo(ctx context.Context, tx *session.Sess
}
rows, err := tx.Query(ctx, "SELECT created_at,created_by FROM entity WHERE grn=?", grn)
if err == nil {
if rows.Next() {
err = rows.Scan(&createdAt, &createdBy)
}
if err == nil {
err = rows.Close()
}
if err != nil {
return err
}
return err
if rows.Next() {
err = rows.Scan(&createdAt, &createdBy)
}
errClose := rows.Close()
if err != nil {
return err
}
return errClose
}
func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.SessionTx, grn string) (*entity.EntityVersionInfo, error) {
@ -498,10 +502,13 @@ func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.Sessi
if rows.Next() {
err = rows.Scan(&current.ETag, &current.Version, &current.UpdatedAt, &current.Size)
}
if err == nil {
err = rows.Close()
errClose := rows.Close()
if err != nil {
return nil, err
}
return current, err
return current, errClose
}
func (s *sqlEntityServer) writeSearchInfo(

7
pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
View File

@ -178,6 +178,13 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
return dataResponseErrorWithExecuted(err)
}
defer func() {
err := res.Body.Close()
if err != nil {
logger.Warn("failed to close response body", "error", err)
}
}()
logResponse, err := e.unmarshalResponse(logger, res)
if err != nil {
return dataResponseErrorWithExecuted(err)

7
pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
View File

@ -183,6 +183,13 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, logger
return dataResponseErrorWithExecuted(err)
}
defer func() {
err := res.Body.Close()
if err != nil {
logger.Warn("failed to close response body", "error", err)
}
}()
argResponse, err := e.unmarshalResponse(logger, res)
if err != nil {
return dataResponseErrorWithExecuted(err)

8
pkg/tsdb/cloudmonitoring/utils.go
View File

@ -15,10 +15,11 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"go.opentelemetry.io/otel/attribute"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/tsdb/intervalv2"
"go.opentelemetry.io/otel/attribute"
)
func addInterval(period string, field *data.Field) error {
@ -86,6 +87,11 @@ func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsIn
return cloudMonitoringResponse{}, err
}
defer func() {
err := res.Body.Close()
logger.Warn("failed to close response body", "error", err)
}()
dnext, err := unmarshalResponse(logger, res)
if err != nil {
return cloudMonitoringResponse{}, err

7
pkg/tsdb/graphite/graphite.go
View File

@ -161,6 +161,13 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
return &result, err
}
defer func() {
err := res.Body.Close()
if err != nil {
logger.Warn("failed to close response body", "error", err)
}
}()
frames, err := s.toDataFrames(logger, res, origRefIds)
if err != nil {
span.RecordError(err)

7
pkg/tsdb/opentsdb/opentsdb.go
View File

@ -98,6 +98,13 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
return &backend.QueryDataResponse{}, err
}
defer func() {
err := res.Body.Close()
if err != nil {
logger.Warn("failed to close response body", "error", err)
}
}()
result, err := s.parseResponse(logger, res)
if err != nil {
return &backend.QueryDataResponse{}, err

21
pkg/tsdb/prometheus/querydata/request.go
View File

@ -153,6 +153,13 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
res, err := c.QueryRange(ctx, q)
defer func() {
err := res.Body.Close()
if err != nil {
s.log.Warn("failed to close query range response body", "error", err)
}
}()
if err != nil {
return backend.DataResponse{
Error: err,
@ -163,6 +170,13 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.
func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
res, err := c.QueryInstant(ctx, q)
defer func() {
err := res.Body.Close()
if err != nil {
s.log.Warn("failed to close response body", "error", err)
}
}()
if err != nil {
return backend.DataResponse{
Error: err,
@ -173,6 +187,13 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
res, err := c.QueryExemplars(ctx, q)
defer func() {
err := res.Body.Close()
if err != nil {
s.log.Warn("failed to close response body", "error", err)
}
}()
if err != nil {
return backend.DataResponse{
Error: err,

5
pkg/tsdb/prometheus/querydata/request_test.go
View File

@ -357,12 +357,17 @@ func executeWithHeaders(tctx *testContext, query backend.DataQuery, qr interface
if err != nil {
return nil, err
}
tctx.httpProvider.setResponse(promRes)
res, err := tctx.queryData.Execute(context.Background(), &req)
errClose := promRes.Body.Close()
if err != nil {
return nil, err
}
if errClose != nil {
return nil, errClose
}
return res.Responses[req.Queries[0].RefID].Frames, nil
}