Skip to content

N
nexpie-grafana-theme
Commit 5070f7a7 by Arve Knudsen Committed by GitHub
Options

Chore: Start harmonizing linting with plugin SDK (#25854) 

* Chore: Harmonize linting with plugin SDK

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Fix linting issues

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent 942a14b4
Showing with 244 additions and 171 deletions
.circleci/config.yml
...@@ -825,10 +825,10 @@ jobs: ...@@ -825,10 +825,10 @@ jobs:
name: Lint Go name: Lint Go
command: | command: |
# To save memory, run in two batches # To save memory, run in two batches
golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E vet -E deadcode -E gofmt \ golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E deadcode -E depguard -E dogsled \
-E gosimple -E ineffassign -E structcheck -E typecheck ./pkg/... -E errcheck -E goconst -E golint -E gosec -E gosimple -E govet ./pkg/...
golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused \ golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E ineffassign \
-E varcheck -E goconst -E errcheck -E staticcheck ./pkg/... -E rowserrcheck -E staticcheck -E structcheck -E typecheck -E unconvert -E unused -E varcheck ./pkg/...
./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/... ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/...
./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml \ ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml \
-exclude ./pkg/plugins/backendplugin/pluginextensionv2/... \ -exclude ./pkg/plugins/backendplugin/pluginextensionv2/... \
......
Makefile
...@@ -99,7 +99,7 @@ scripts/go/bin/golangci-lint: scripts/go/go.mod ...@@ -99,7 +99,7 @@ scripts/go/bin/golangci-lint: scripts/go/go.mod
golangci-lint: scripts/go/bin/golangci-lint golangci-lint: scripts/go/bin/golangci-lint
@echo "lint via golangci-lint" @echo "lint via golangci-lint"
@scripts/go/bin/golangci-lint run \ @scripts/go/bin/golangci-lint run \
--config ./scripts/go/configs/.golangci.yml \ --config ./scripts/go/configs/.golangci.toml \
$(GO_FILES) $(GO_FILES)
lint-go: golangci-lint revive revive-strict # Run all code checks for backend. lint-go: golangci-lint revive revive-strict # Run all code checks for backend.
......
pkg/api/basic_auth.go
...@@ -2,6 +2,7 @@ package api ...@@ -2,6 +2,7 @@ package api
import ( import (
"crypto/subtle" "crypto/subtle"
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )
......
pkg/api/search.go
package api package api
import ( import (
"github.com/grafana/grafana/pkg/util"
"net/http" "net/http"
"strconv" "strconv"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
......
pkg/api/team_test.go
...@@ -9,11 +9,12 @@ import ( ...@@ -9,11 +9,12 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"net/http"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
"net/http"
) )
type testLogger struct { type testLogger struct {
......
pkg/cmd/grafana-cli/commands/commandstest/context.go
...@@ -2,6 +2,7 @@ package commandstest ...@@ -2,6 +2,7 @@ package commandstest
import ( import (
"flag" "flag"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils" "github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
......
pkg/cmd/grafana-cli/commands/install_command.go
...@@ -308,7 +308,7 @@ func extractFile(file *zip.File, filePath string) (err error) { ...@@ -308,7 +308,7 @@ func extractFile(file *zip.File, filePath string) (err error) {
}() }()
_, err = io.Copy(dst, src) _, err = io.Copy(dst, src)
return return err
} }
// isPathSafe checks if the filePath does not resolve outside of destination. This is used to prevent // isPathSafe checks if the filePath does not resolve outside of destination. This is used to prevent
......
pkg/cmd/grafana-cli/services/api_client_test.go
...@@ -8,43 +8,56 @@ import ( ...@@ -8,43 +8,56 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func TestHandleResponse(t *testing.T) { func TestHandleResponse(t *testing.T) {
t.Run("Returns body if status == 200", func(t *testing.T) { t.Run("Returns body if status == 200", func(t *testing.T) {
bodyReader, err := handleResponse(makeResponse(200, "test")) resp := makeResponse(200, "test")
assert.NoError(t, err) defer resp.Body.Close()
bodyReader, err := handleResponse(resp)
require.NoError(t, err)
body, err := ioutil.ReadAll(bodyReader) body, err := ioutil.ReadAll(bodyReader)
assert.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "test", string(body)) assert.Equal(t, "test", string(body))
}) })
t.Run("Returns ErrorNotFound if status == 404", func(t *testing.T) { t.Run("Returns ErrorNotFound if status == 404", func(t *testing.T) {
_, err := handleResponse(makeResponse(404, "")) resp := makeResponse(404, "")
defer resp.Body.Close()
_, err := handleResponse(resp)
assert.Equal(t, ErrNotFoundError, err) assert.Equal(t, ErrNotFoundError, err)
}) })
t.Run("Returns message from body if status == 400", func(t *testing.T) { t.Run("Returns message from body if status == 400", func(t *testing.T) {
_, err := handleResponse(makeResponse(400, "{ \"message\": \"error_message\" }")) resp := makeResponse(400, "{ \"message\": \"error_message\" }")
assert.Error(t, err) defer resp.Body.Close()
_, err := handleResponse(resp)
require.Error(t, err)
assert.Equal(t, "error_message", asBadRequestError(t, err).Message) assert.Equal(t, "error_message", asBadRequestError(t, err).Message)
}) })
t.Run("Returns body if status == 400 and no message key", func(t *testing.T) { t.Run("Returns body if status == 400 and no message key", func(t *testing.T) {
_, err := handleResponse(makeResponse(400, "{ \"test\": \"test_message\"}")) resp := makeResponse(400, "{ \"test\": \"test_message\"}")
assert.Error(t, err) defer resp.Body.Close()
_, err := handleResponse(resp)
require.Error(t, err)
assert.Equal(t, "{ \"test\": \"test_message\"}", asBadRequestError(t, err).Message) assert.Equal(t, "{ \"test\": \"test_message\"}", asBadRequestError(t, err).Message)
}) })
t.Run("Returns Bad request error if status == 400 and no body", func(t *testing.T) { t.Run("Returns Bad request error if status == 400 and no body", func(t *testing.T) {
_, err := handleResponse(makeResponse(400, "")) resp := makeResponse(400, "")
assert.Error(t, err) defer resp.Body.Close()
_, err := handleResponse(resp)
require.Error(t, err)
_ = asBadRequestError(t, err) _ = asBadRequestError(t, err)
}) })
t.Run("Returns error with invalid status if status == 500", func(t *testing.T) { t.Run("Returns error with invalid status if status == 500", func(t *testing.T) {
_, err := handleResponse(makeResponse(500, "")) resp := makeResponse(500, "")
assert.Error(t, err) defer resp.Body.Close()
_, err := handleResponse(resp)
require.Error(t, err)
assert.Contains(t, err.Error(), "invalid status") assert.Contains(t, err.Error(), "invalid status")
}) })
} }
......
pkg/cmd/grafana-server/server.go
...@@ -157,7 +157,7 @@ func (s *Server) Run() (err error) { ...@@ -157,7 +157,7 @@ func (s *Server) Run() (err error) {
s.notifySystemd("READY=1") s.notifySystemd("READY=1")
return return err
} }
func (s *Server) Shutdown(reason string) { func (s *Server) Shutdown(reason string) {
......
pkg/components/imguploader/gcsuploader.go
...@@ -89,6 +89,7 @@ func (u *GCSUploader) uploadFile(client *http.Client, imageDiskPath, key string) ...@@ -89,6 +89,7 @@ func (u *GCSUploader) uploadFile(client *http.Client, imageDiskPath, key string)
if err != nil { if err != nil {
return err return err
} }
resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
return fmt.Errorf("GCS response status code %d", resp.StatusCode) return fmt.Errorf("GCS response status code %d", resp.StatusCode)
......
pkg/components/imguploader/webdavuploader.go
...@@ -75,6 +75,7 @@ func (u *WebdavUploader) Upload(ctx context.Context, pa string) (string, error) ...@@ -75,6 +75,7 @@ func (u *WebdavUploader) Upload(ctx context.Context, pa string) (string, error)
if err != nil { if err != nil {
return "", err return "", err
} }
defer res.Body.Close()
if res.StatusCode != http.StatusCreated { if res.StatusCode != http.StatusCreated {
body, _ := ioutil.ReadAll(res.Body) body, _ := ioutil.ReadAll(res.Body)
......
pkg/infra/fs/exists_test.go
package fs package fs
import ( import (
"github.com/stretchr/testify/require"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"
"github.com/stretchr/testify/require"
) )
func TestExists_NonExistent(t *testing.T) { func TestExists_NonExistent(t *testing.T) {
......
pkg/infra/tracing/tracing_test.go
package tracing package tracing
import ( import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os" "os"
"testing" "testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func TestGroupSplit(t *testing.T) { func TestGroupSplit(t *testing.T) {
......
pkg/infra/usagestats/usage_stats.go
...@@ -181,9 +181,12 @@ func (uss *UsageStatsService) sendUsageStats(oauthProviders map[string]bool) { ...@@ -181,9 +181,12 @@ func (uss *UsageStatsService) sendUsageStats(oauthProviders map[string]bool) {
client := http.Client{Timeout: 5 * time.Second} client := http.Client{Timeout: 5 * time.Second}
go func() { go func() {
if _, err := client.Post(usageStatsURL, "application/json", data); err != nil { resp, err := client.Post(usageStatsURL, "application/json", data)
if err != nil {
metricsLogger.Error("Failed to send usage stats", "err", err) metricsLogger.Error("Failed to send usage stats", "err", err)
return
} }
resp.Body.Close()
}() }()
} }
......
pkg/middleware/dashboard_redirect_test.go
...@@ -34,7 +34,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) { ...@@ -34,7 +34,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) {
Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() { Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() {
So(sc.resp.Code, ShouldEqual, 301) So(sc.resp.Code, ShouldEqual, 301)
redirectURL, _ := sc.resp.Result().Location() resp := sc.resp.Result()
defer resp.Body.Close()
redirectURL, err := resp.Location()
So(err, ShouldBeNil)
So(redirectURL.Path, ShouldEqual, models.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug)) So(redirectURL.Path, ShouldEqual, models.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug))
So(len(redirectURL.Query()), ShouldEqual, 2) So(len(redirectURL.Query()), ShouldEqual, 2)
}) })
...@@ -47,7 +50,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) { ...@@ -47,7 +50,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) {
Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() { Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() {
So(sc.resp.Code, ShouldEqual, 301) So(sc.resp.Code, ShouldEqual, 301)
redirectURL, _ := sc.resp.Result().Location() resp := sc.resp.Result()
defer resp.Body.Close()
redirectURL, err := resp.Location()
So(err, ShouldBeNil)
expectedURL := models.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug) expectedURL := models.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug)
expectedURL = strings.Replace(expectedURL, "/d/", "/d-solo/", 1) expectedURL = strings.Replace(expectedURL, "/d/", "/d-solo/", 1)
So(redirectURL.Path, ShouldEqual, expectedURL) So(redirectURL.Path, ShouldEqual, expectedURL)
...@@ -66,7 +72,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) { ...@@ -66,7 +72,10 @@ func TestMiddlewareDashboardRedirect(t *testing.T) {
Convey("Should redirect to new dashboard edit url with a 301 Moved Permanently", func() { Convey("Should redirect to new dashboard edit url with a 301 Moved Permanently", func() {
So(sc.resp.Code, ShouldEqual, 301) So(sc.resp.Code, ShouldEqual, 301)
redirectURL, _ := sc.resp.Result().Location() resp := sc.resp.Result()
defer resp.Body.Close()
redirectURL, err := resp.Location()
So(err, ShouldBeNil)
So(redirectURL.String(), ShouldEqual, "/d/asd/d/asd/dash?editPanel=12&orgId=1") So(redirectURL.String(), ShouldEqual, "/d/asd/d/asd/dash?editPanel=12&orgId=1")
}) })
}) })
......
pkg/middleware/middleware_test.go
...@@ -623,7 +623,9 @@ func TestTokenRotationAtEndOfRequest(t *testing.T) { ...@@ -623,7 +623,9 @@ func TestTokenRotationAtEndOfRequest(t *testing.T) {
rotateEndOfRequestFunc(reqContext, uts, token)(reqContext.Resp) rotateEndOfRequestFunc(reqContext, uts, token)(reqContext.Resp)
foundLoginCookie := false foundLoginCookie := false
for _, c := range rr.Result().Cookies() { resp := rr.Result()
defer resp.Body.Close()
for _, c := range resp.Cookies() {
if c.Name == "login_token" { if c.Name == "login_token" {
foundLoginCookie = true foundLoginCookie = true
......
pkg/models/datasource_cache_test.go
...@@ -224,13 +224,10 @@ func TestDataSourceProxyCache(t *testing.T) { ...@@ -224,13 +224,10 @@ func TestDataSourceProxyCache(t *testing.T) {
// 3. Send test request which should have the Authorization header set // 3. Send test request which should have the Authorization header set
req := httptest.NewRequest("GET", backend.URL+"/test-headers", nil) req := httptest.NewRequest("GET", backend.URL+"/test-headers", nil)
res, err := transport.RoundTrip(req) res, err := transport.RoundTrip(req)
if err != nil { So(err, ShouldBeNil)
log.Fatal(err.Error()) defer res.Body.Close()
}
body, err := ioutil.ReadAll(res.Body) body, err := ioutil.ReadAll(res.Body)
if err != nil { So(err, ShouldBeNil)
log.Fatal(err.Error())
}
bodyStr := string(body) bodyStr := string(body)
So(bodyStr, ShouldEqual, "Ok") So(bodyStr, ShouldEqual, "Ok")
}) })
......
pkg/models/quotas.go
...@@ -2,8 +2,9 @@ package models ...@@ -2,8 +2,9 @@ package models
import ( import (
"errors" "errors"
"github.com/grafana/grafana/pkg/setting"
"time" "time"
"github.com/grafana/grafana/pkg/setting"
) )
var ErrInvalidQuotaTarget = errors.New("Invalid quota target") var ErrInvalidQuotaTarget = errors.New("Invalid quota target")
......
pkg/services/cleanup/cleanup_test.go
package cleanup package cleanup
import ( import (
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
"testing" "testing"
"time" "time"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
) )
func TestCleanUpTmpFiles(t *testing.T) { func TestCleanUpTmpFiles(t *testing.T) {
......
pkg/services/dashboards/acl_service.go
package dashboards package dashboards
import ( import (
"time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"time"
) )
func MakeUserAdmin(bus bus.Bus, orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error { func MakeUserAdmin(bus bus.Bus, orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
......
pkg/services/dashboards/dashboard_service_test.go
package dashboards package dashboards
import ( import (
"testing"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"testing"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
......
pkg/services/sqlstore/datasource.go
package sqlstore package sqlstore
import ( import (
"github.com/grafana/grafana/pkg/util/errutil"
"strings" "strings"
"time" "time"
"github.com/grafana/grafana/pkg/util/errutil"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
......
pkg/services/sqlstore/migrator/postgres_dialect.go
...@@ -2,10 +2,11 @@ package migrator ...@@ -2,10 +2,11 @@ package migrator
import ( import (
"fmt" "fmt"
"github.com/lib/pq"
"strconv" "strconv"
"strings" "strings"
"github.com/lib/pq"
"github.com/grafana/grafana/pkg/util/errutil" "github.com/grafana/grafana/pkg/util/errutil"
"xorm.io/xorm" "xorm.io/xorm"
) )
......
pkg/services/sqlstore/migrator/sqlite_dialect.go
...@@ -2,6 +2,7 @@ package migrator ...@@ -2,6 +2,7 @@ package migrator
import ( import (
"fmt" "fmt"
"github.com/mattn/go-sqlite3" "github.com/mattn/go-sqlite3"
"xorm.io/xorm" "xorm.io/xorm"
) )
......
pkg/services/sqlstore/permissions/dashboard.go
package permissions package permissions
import ( import (
"strings"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"strings"
) )
type DashboardPermissionFilter struct { type DashboardPermissionFilter struct {
......
pkg/services/sqlstore/searchstore/filters.go
...@@ -2,8 +2,9 @@ package searchstore ...@@ -2,8 +2,9 @@ package searchstore
import ( import (
"fmt" "fmt"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"strings" "strings"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
) )
// FilterWhere limits the set of dashboard IDs to the dashboards for // FilterWhere limits the set of dashboard IDs to the dashboards for
......
pkg/tsdb/cloudwatch/annotation_query.go
...@@ -159,14 +159,14 @@ func filterAlarms(alarms *cloudwatch.DescribeAlarmsOutput, namespace string, met ...@@ -159,14 +159,14 @@ func filterAlarms(alarms *cloudwatch.DescribeAlarmsOutput, namespace string, met
} }
match := true match := true
if len(dimensions) == 0 { if len(dimensions) != 0 {
// all match if len(alarm.Dimensions) != len(dimensions) {
} else if len(alarm.Dimensions) != len(dimensions) { match = false
match = false } else {
} else { for _, d := range alarm.Dimensions {
for _, d := range alarm.Dimensions { if _, ok := dimensions[*d.Name]; !ok {
if _, ok := dimensions[*d.Name]; !ok { match = false
match = false }
} }
} }
} }
......
pkg/tsdb/cloudwatch/cloudwatch.go
...@@ -81,15 +81,11 @@ func NewCloudWatchExecutor(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin ...@@ -81,15 +81,11 @@ func NewCloudWatchExecutor(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
}, nil }, nil
} }
var ( var plog = log.New("tsdb.cloudwatch")
plog log.Logger var aliasFormat = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
aliasFormat *regexp.Regexp
)
func init() { func init() {
plog = log.New("tsdb.cloudwatch")
tsdb.RegisterTsdbQueryEndpoint("cloudwatch", NewCloudWatchExecutor) tsdb.RegisterTsdbQueryEndpoint("cloudwatch", NewCloudWatchExecutor)
aliasFormat = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
} }
func (e *CloudWatchExecutor) alertQuery(ctx context.Context, logsClient *cloudwatchlogs.CloudWatchLogs, queryContext *tsdb.TsdbQuery) (*cloudwatchlogs.GetQueryResultsOutput, error) { func (e *CloudWatchExecutor) alertQuery(ctx context.Context, logsClient *cloudwatchlogs.CloudWatchLogs, queryContext *tsdb.TsdbQuery) (*cloudwatchlogs.GetQueryResultsOutput, error) {
...@@ -112,11 +108,14 @@ func (e *CloudWatchExecutor) alertQuery(ctx context.Context, logsClient *cloudwa ...@@ -112,11 +108,14 @@ func (e *CloudWatchExecutor) alertQuery(ctx context.Context, logsClient *cloudwa
attemptCount := 1 attemptCount := 1
for range ticker.C { for range ticker.C {
if res, err := e.executeGetQueryResults(ctx, logsClient, requestParams); err != nil { res, err := e.executeGetQueryResults(ctx, logsClient, requestParams)
if err != nil {
return nil, err return nil, err
} else if isTerminated(*res.Status) { }
if isTerminated(*res.Status) {
return res, err return res, err
} else if attemptCount >= maxAttempts { }
if attemptCount >= maxAttempts {
return res, fmt.Errorf("fetching of query results exceeded max number of attempts") return res, fmt.Errorf("fetching of query results exceeded max number of attempts")
} }
......
pkg/tsdb/cloudwatch/credentials.go
...@@ -35,7 +35,7 @@ func GetCredentials(dsInfo *DatasourceInfo) (*credentials.Credentials, error) { ...@@ -35,7 +35,7 @@ func GetCredentials(dsInfo *DatasourceInfo) (*credentials.Credentials, error) {
credentialCacheLock.RLock() credentialCacheLock.RLock()
if _, ok := awsCredentialCache[cacheKey]; ok { if _, ok := awsCredentialCache[cacheKey]; ok {
if awsCredentialCache[cacheKey].expiration != nil && if awsCredentialCache[cacheKey].expiration != nil &&
(*awsCredentialCache[cacheKey].expiration).After(time.Now().UTC()) { awsCredentialCache[cacheKey].expiration.After(time.Now().UTC()) {
result := awsCredentialCache[cacheKey].credential result := awsCredentialCache[cacheKey].credential
credentialCacheLock.RUnlock() credentialCacheLock.RUnlock()
return result, nil return result, nil
......
pkg/tsdb/cloudwatch/metric_find_query.go
...@@ -583,7 +583,7 @@ func (e *CloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context, ...@@ -583,7 +583,7 @@ func (e *CloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context,
if attr, ok := v.Interface().(*string); ok { if attr, ok := v.Interface().(*string); ok {
data = *attr data = *attr
} else if attr, ok := v.Interface().(*time.Time); ok { } else if attr, ok := v.Interface().(*time.Time); ok {
data = (*attr).String() data = attr.String()
} else { } else {
return nil, errors.New("invalid attribute path") return nil, errors.New("invalid attribute path")
} }
......
pkg/tsdb/cloudwatch/response_parser.go
...@@ -144,7 +144,8 @@ func parseGetMetricDataTimeSeries(metricDataResults map[string]*cloudwatch.Metri ...@@ -144,7 +144,8 @@ func parseGetMetricDataTimeSeries(metricDataResults map[string]*cloudwatch.Metri
series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), float64(expectedTimestamp.Unix()*1000))) series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), float64(expectedTimestamp.Unix()*1000)))
} }
} }
series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(*metricDataResult.Values[j]), float64((*t).Unix())*1000)) series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(*metricDataResult.Values[j]),
float64(t.Unix())*1000))
} }
result = append(result, &series) result = append(result, &series)
} }
......
pkg/tsdb/elasticsearch/client/client.go
...@@ -205,11 +205,15 @@ func (c *baseClientImpl) executeRequest(method, uriPath, uriQuery string, body [ ...@@ -205,11 +205,15 @@ func (c *baseClientImpl) executeRequest(method, uriPath, uriQuery string, body [
elapsed := time.Since(start) elapsed := time.Since(start)
clientLog.Debug("Executed request", "took", elapsed) clientLog.Debug("Executed request", "took", elapsed)
}() }()
res, err := ctxhttp.Do(c.ctx, httpClient, req) //nolint:bodyclose
resp, err := ctxhttp.Do(c.ctx, httpClient, req)
if err != nil {
return nil, err
}
return &response{ return &response{
httpResponse: res, httpResponse: resp,
reqInfo: reqInfo, reqInfo: reqInfo,
}, err }, nil
} }
func (c *baseClientImpl) ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearchResponse, error) { func (c *baseClientImpl) ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearchResponse, error) {
......
pkg/tsdb/elasticsearch/response_parser.go
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/elasticsearch/client" es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
) )
const ( const (
......
pkg/tsdb/elasticsearch/response_parser_test.go
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/tsdb/elasticsearch/client" es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
......
pkg/tsdb/elasticsearch/time_series_query.go
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/elasticsearch/client" es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
) )
type timeSeriesQuery struct { type timeSeriesQuery struct {
......
pkg/tsdb/elasticsearch/time_series_query_test.go
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/grafana/grafana/pkg/tsdb/elasticsearch/client" es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
......
pkg/tsdb/graphite/graphite_test.go
package graphite package graphite
import ( import (
. "github.com/smartystreets/goconvey/convey"
"testing" "testing"
. "github.com/smartystreets/goconvey/convey"
) )
func TestGraphiteFunctions(t *testing.T) { func TestGraphiteFunctions(t *testing.T) {
......
pkg/tsdb/interval.go
...@@ -119,7 +119,7 @@ func FormatDuration(inter time.Duration) string { ...@@ -119,7 +119,7 @@ func FormatDuration(inter time.Duration) string {
} }
func roundInterval(interval time.Duration) time.Duration { func roundInterval(interval time.Duration) time.Duration {
switch true { switch {
// 0.015s // 0.015s
case interval <= 15*time.Millisecond: case interval <= 15*time.Millisecond:
return time.Millisecond * 10 // 0.01s return time.Millisecond * 10 // 0.01s
......
pkg/util/encoding.go
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"encoding/base64" "encoding/base64"
"encoding/hex" "encoding/hex"
"errors" "errors"
"golang.org/x/crypto/pbkdf2"
"strings" "strings"
"golang.org/x/crypto/pbkdf2"
) )
// GetRandomString generate random string by specify chars. // GetRandomString generate random string by specify chars.
......
pkg/util/encryption.go
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"crypto/rand" "crypto/rand"
"crypto/sha256" "crypto/sha256"
"errors" "errors"
"golang.org/x/crypto/pbkdf2"
"io" "io"
"golang.org/x/crypto/pbkdf2"
) )
const saltLength = 8 const saltLength = 8
......
scripts/go/configs/.golangci.toml 0 → 100644
[run]
timeout = "10m"
[linters-settings.golint]
min-confidence = 3
[linters-settings.goconst]
min-len = 5
min-occurrences = 5
[linters]
disable-all = true
enable = [
"bodyclose",
"deadcode",
"depguard",
"dogsled",
"errcheck",
# "gochecknoinits",
"goconst",
# "gocritic",
"goimports",
"golint",
# "goprintffuncname",
"gosec",
"gosimple",
"govet",
"ineffassign",
# "interfacer",
# "misspell",
"rowserrcheck",
# "scopelint",
"staticcheck",
"structcheck",
# "stylecheck",
"typecheck",
"unconvert",
"unused",
"varcheck",
# "whitespace",
]
# Disabled linters (might want them later)
# "gocyclo",
# "unparam"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G108"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G110"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G201"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G202"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G306"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "401"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "402"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "501"
scripts/go/configs/.golangci.yml deleted 100644 → 0
run:
timeout: 10m
linters:
disable-all: true
enable:
- gosec
- vet
- deadcode
- gofmt
- gosimple
- ineffassign
- structcheck
- typecheck
- unconvert
- unused
- varcheck
- goconst
- staticcheck
- errcheck
linters-settings:
goconst:
# minimal length of string constant, 3 by default
min-len: 5
# minimal occurrences count to trigger, 3 by default
min-occurrences: 5
issues:
exclude-rules:
- linters:
- gosec
text: G108
- linters:
- gosec
text: G110
- linters:
- gosec
text: G201
- linters:
- gosec
text: G202
- linters:
- gosec
text: G306
- linters:
- gosec
text: G401
- linters:
- gosec
text: G402
- linters:
- gosec
text: G501
- linters:
- gosec
text: G501
scripts/go/configs/ci/.golangci.toml 0 → 100644
[run]
timeout = "10m"
[linters-settings.golint]
min-confidence = 3
[linters-settings.goconst]
min-len = 5
min-occurrences = 5
[linters]
disable-all = true
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G108"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G110"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G201"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G202"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "G306"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "401"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "402"
[[issues.exclude-rules]]
linters = ["gosec"]
text = "501"
scripts/go/configs/ci/.golangci.yml deleted 100644 → 0
run:
timeout: 10m
linters:
disable-all: true
linters-settings:
goconst:
# minimal length of string constant, 3 by default
min-len: 5
# minimal occurrences count to trigger, 3 by default
min-occurrences: 5
issues:
exclude-rules:
- linters:
- gosec
text: G108
- linters:
- gosec
text: G110
- linters:
- gosec
text: G201
- linters:
- gosec
text: G202
- linters:
- gosec
text: G306
- linters:
- gosec
text: G401
- linters:
- gosec
text: G402
- linters:
- gosec
text: G501
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment