From 960651e51085b6e3b1887e9e4c54c88ee2a4d09e Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 9 Nov 2018 19:36:14 +0100 Subject: [PATCH 1/3] scripts/build/release_publisher/publisher_test.go: Fix trivial megacheck warning. See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... scripts/build/release_publisher/publisher_test.go:14:2:warning: should merge variable declaration with assignment on next line (S1021) (megacheck) --- .../build/release_publisher/publisher_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go index ee491ce0b98..22b2bc3a5ba 100644 --- a/scripts/build/release_publisher/publisher_test.go +++ b/scripts/build/release_publisher/publisher_test.go @@ -3,19 +3,20 @@ package main import "testing" func TestPreparingReleaseFromRemote(t *testing.T) { + + var builder releaseBuilder + versionIn := "v5.2.0-beta1" expectedVersion := "5.2.0-beta1" whatsNewUrl := "https://whatsnews.foo/" relNotesUrl := "https://relnotes.foo/" expectedArch := "amd64" expectedOs := "linux" - buildArtifacts := []buildArtifact{{expectedOs,expectedArch, ".linux-amd64.tar.gz"}} - - var builder releaseBuilder + buildArtifacts := []buildArtifact{{expectedOs, expectedArch, ".linux-amd64.tar.gz"}} builder = releaseFromExternalContent{ - getter: mockHttpGetter{}, - rawVersion: versionIn, + getter: mockHttpGetter{}, + rawVersion: versionIn, artifactConfigurations: buildArtifactConfigurations, } @@ -50,7 +51,6 @@ func (mockHttpGetter) getContents(url string) (string, error) { return url, nil } - func TestPreparingReleaseFromLocal(t *testing.T) { whatsNewUrl := "https://whatsnews.foo/" relNotesUrl := "https://relnotes.foo/" @@ -60,7 +60,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) { var builder releaseBuilder testDataPath := "testdata" builder = releaseLocalSources{ - path: testDataPath, + path: testDataPath, artifactConfigurations: buildArtifactConfigurations, } @@ -93,7 +93,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) { expectedOs := "win" builder = releaseLocalSources{ - path: testDataPath, + path: testDataPath, artifactConfigurations: []buildArtifact{{ os: expectedOs, arch: expectedArch, From e351e6e211bd2bd4ea44cab8aa0da7eba13dcf8f Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 9 Nov 2018 19:40:07 +0100 Subject: [PATCH 2/3] pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated. See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... pkg/tsdb/influxdb/influxdb.go:106:3:warning: the surrounding loop is unconditionally terminated (SA4004) (megacheck) --- pkg/tsdb/influxdb/influxdb.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go index 6100d3b401e..ec1e9ff01bd 100644 --- a/pkg/tsdb/influxdb/influxdb.go +++ b/pkg/tsdb/influxdb/influxdb.go @@ -96,16 +96,15 @@ func (e *InfluxDBExecutor) Query(ctx context.Context, dsInfo *models.DataSource, } func (e *InfluxDBExecutor) getQuery(dsInfo *models.DataSource, queries []*tsdb.Query, context *tsdb.TsdbQuery) (*Query, error) { - for _, v := range queries { - - query, err := e.QueryParser.Parse(v.Model, dsInfo) + // The model supports multiple queries, but right now this is only used from + // alerting so we only needed to support batch executing 1 query at a time. + if len(queries) > 0 { + query, err := e.QueryParser.Parse(queries[0].Model, dsInfo) if err != nil { return nil, err } - return query, nil } - return nil, fmt.Errorf("query request contains no queries") } From a2275e8a1ceac9588e28b3a5a297bc6890e9c86d Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 9 Nov 2018 19:46:40 +0100 Subject: [PATCH 3/3] Add megacheck to gometalinter CircleCI target See, https://github.com/dominikh/go-tools/tree/master/cmd/megacheck --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b173dbff481..7783a595212 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,12 +85,13 @@ jobs: - run: 'go get -u github.com/tsenart/deadcode' - run: 'go get -u github.com/jgautheron/goconst/cmd/goconst' - run: 'go get -u github.com/gordonklaus/ineffassign' + - run: 'go get -u honnef.co/go/tools/cmd/megacheck' - run: 'go get -u github.com/opennota/check/cmd/structcheck' - run: 'go get -u github.com/mdempsky/unconvert' - run: 'go get -u github.com/opennota/check/cmd/varcheck' - run: name: run linters - command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...' + command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=ineffassign --enable=megacheck --enable=structcheck --enable=unconvert --enable=varcheck ./...' - run: name: run go vet command: 'go vet ./pkg/...'