From 18e127db2a20392db42399226975f1988d6e7776 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Wed, 10 Oct 2018 23:04:14 +0200 Subject: [PATCH 1/3] pkg/tsdb/*: Fix do not pass a nil Context See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... pkg/tsdb/mssql/mssql_test.go:695:33:warning: do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck) pkg/tsdb/mysql/mysql_test.go:772:32:warning: do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck) pkg/tsdb/postgres/postgres_test.go:704:33:warning: do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck) --- pkg/tsdb/mssql/mssql_test.go | 2 +- pkg/tsdb/mysql/mysql_test.go | 2 +- pkg/tsdb/postgres/postgres_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go index 8e48994c7ea..c3d4470603d 100644 --- a/pkg/tsdb/mssql/mssql_test.go +++ b/pkg/tsdb/mssql/mssql_test.go @@ -692,7 +692,7 @@ func TestMSSQL(t *testing.T) { }, } - resp, err := endpoint.Query(nil, nil, query) + resp, err := endpoint.Query(context.Background(), nil, query) So(err, ShouldBeNil) queryResult := resp.Results["A"] So(queryResult.Error, ShouldBeNil) diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go index 7f12b8636bb..476e3ba6586 100644 --- a/pkg/tsdb/mysql/mysql_test.go +++ b/pkg/tsdb/mysql/mysql_test.go @@ -769,7 +769,7 @@ func TestMySQL(t *testing.T) { }, } - resp, err := endpoint.Query(nil, nil, query) + resp, err := endpoint.Query(context.Background(), nil, query) So(err, ShouldBeNil) queryResult := resp.Results["A"] So(queryResult.Error, ShouldBeNil) diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go index c0c04522dba..c381938aead 100644 --- a/pkg/tsdb/postgres/postgres_test.go +++ b/pkg/tsdb/postgres/postgres_test.go @@ -701,7 +701,7 @@ func TestPostgres(t *testing.T) { }, } - resp, err := endpoint.Query(nil, nil, query) + resp, err := endpoint.Query(context.Background(), nil, query) So(err, ShouldBeNil) queryResult := resp.Results["A"] So(queryResult.Error, ShouldBeNil) From 9c44c7593626780b5f62a2c194884dd4b1aa3cbb Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Thu, 11 Oct 2018 19:51:54 +0200 Subject: [PATCH 2/3] pkg/services/alerting/notifiers/telegram.go: check error before close. See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... pkg/services/alerting/notifiers/telegram.go:130:2:warning: should check returned error before deferring imageFile.Close() (SA5001) (megacheck) --- pkg/services/alerting/notifiers/telegram.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go index 5492de45d39..6c47c92972c 100644 --- a/pkg/services/alerting/notifiers/telegram.go +++ b/pkg/services/alerting/notifiers/telegram.go @@ -127,7 +127,13 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval var err error imageFile, err = os.Open(evalContext.ImageOnDiskPath) - defer imageFile.Close() + defer func() { + err := imageFile.Close() + if err != nil { + log.Error2("Could not close Telegram inline image.", "err", err) + } + }() + if err != nil { return nil, err } From 74533a7a1921a4ec4de3d7b98773c1017f101739 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Thu, 11 Oct 2018 20:47:15 +0200 Subject: [PATCH 3/3] pkg/services/sqlstore/user_auth_test.go: comment unused users slice See, $ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./... pkg/services/sqlstore/user_auth_test.go:28:18:warning: this result of append is never used, except maybe in other appends (SA4010) (megacheck) --- pkg/services/sqlstore/user_auth_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/services/sqlstore/user_auth_test.go b/pkg/services/sqlstore/user_auth_test.go index 5ad93dc7a3b..a0dd714fe6f 100644 --- a/pkg/services/sqlstore/user_auth_test.go +++ b/pkg/services/sqlstore/user_auth_test.go @@ -16,7 +16,6 @@ func TestUserAuth(t *testing.T) { Convey("Given 5 users", t, func() { var err error var cmd *m.CreateUserCommand - users := []m.User{} for i := 0; i < 5; i++ { cmd = &m.CreateUserCommand{ Email: fmt.Sprint("user", i, "@test.com"), @@ -25,7 +24,6 @@ func TestUserAuth(t *testing.T) { } err = CreateUser(context.Background(), cmd) So(err, ShouldBeNil) - users = append(users, cmd.Result) } Reset(func() {