Skip to content

Commit 019d0ee

Browse files
torkelotorkelo
authored
Merge pull request grafana#13506 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2 parents 30eda62 + afab908 commit 019d0ee

File tree

5 files changed

+112
-104
lines changed

5 files changed

+112
-104
lines changed

‎pkg/services/alerting/notifiers/telegram_test.go

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package notifiers
22

33
import (
4+
"context"
45
"testing"
56

67
"github.com/grafana/grafana/pkg/components/simplejson"
@@ -52,11 +53,12 @@ func TestTelegramNotifier(t *testing.T) {
5253
})
5354

5455
Convey("generateCaption should generate a message with all pertinent details", func() {
55-
evalContext := alerting.NewEvalContext(nil, &alerting.Rule{
56-
Name: "This is an alarm",
57-
Message: "Some kind of message.",
58-
State: m.AlertStateOK,
59-
})
56+
evalContext := alerting.NewEvalContext(context.Background(),
57+
&alerting.Rule{
58+
Name: "This is an alarm",
59+
Message: "Some kind of message.",
60+
State: m.AlertStateOK,
61+
})
6062

6163
caption := generateImageCaption(evalContext, "http://grafa.url/abcdef", "")
6264
So(len(caption), ShouldBeLessThanOrEqualTo, 200)
@@ -68,11 +70,12 @@ func TestTelegramNotifier(t *testing.T) {
6870
Convey("When generating a message", func() {
6971

7072
Convey("URL should be skipped if it's too long", func() {
71-
evalContext := alerting.NewEvalContext(nil, &alerting.Rule{
72-
Name: "This is an alarm",
73-
Message: "Some kind of message.",
74-
State: m.AlertStateOK,
75-
})
73+
evalContext := alerting.NewEvalContext(context.Background(),
74+
&alerting.Rule{
75+
Name: "This is an alarm",
76+
Message: "Some kind of message.",
77+
State: m.AlertStateOK,
78+
})
7679

7780
caption := generateImageCaption(evalContext,
7881
"http://grafa.url/abcdefaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -85,11 +88,12 @@ func TestTelegramNotifier(t *testing.T) {
8588
})
8689

8790
Convey("Message should be trimmed if it's too long", func() {
88-
evalContext := alerting.NewEvalContext(nil, &alerting.Rule{
89-
Name: "This is an alarm",
90-
Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it.",
91-
State: m.AlertStateOK,
92-
})
91+
evalContext := alerting.NewEvalContext(context.Background(),
92+
&alerting.Rule{
93+
Name: "This is an alarm",
94+
Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it.",
95+
State: m.AlertStateOK,
96+
})
9397

9498
caption := generateImageCaption(evalContext,
9599
"http://grafa.url/foo",
@@ -101,11 +105,12 @@ func TestTelegramNotifier(t *testing.T) {
101105
})
102106

103107
Convey("Metrics should be skipped if they don't fit", func() {
104-
evalContext := alerting.NewEvalContext(nil, &alerting.Rule{
105-
Name: "This is an alarm",
106-
Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I ",
107-
State: m.AlertStateOK,
108-
})
108+
evalContext := alerting.NewEvalContext(context.Background(),
109+
&alerting.Rule{
110+
Name: "This is an alarm",
111+
Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I ",
112+
State: m.AlertStateOK,
113+
})
109114

110115
caption := generateImageCaption(evalContext,
111116
"http://grafa.url/foo",

‎pkg/tsdb/elasticsearch/client/client_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestClient(t *testing.T) {
2525
JsonData: simplejson.NewFromAny(make(map[string]interface{})),
2626
}
2727

28-
_, err := NewClient(nil, ds, nil)
28+
_, err := NewClient(context.Background(), ds, nil)
2929
So(err, ShouldNotBeNil)
3030
})
3131

@@ -36,7 +36,7 @@ func TestClient(t *testing.T) {
3636
}),
3737
}
3838

39-
_, err := NewClient(nil, ds, nil)
39+
_, err := NewClient(context.Background(), ds, nil)
4040
So(err, ShouldNotBeNil)
4141
})
4242

@@ -48,7 +48,7 @@ func TestClient(t *testing.T) {
4848
}),
4949
}
5050

51-
_, err := NewClient(nil, ds, nil)
51+
_, err := NewClient(context.Background(), ds, nil)
5252
So(err, ShouldNotBeNil)
5353
})
5454

@@ -60,7 +60,7 @@ func TestClient(t *testing.T) {
6060
}),
6161
}
6262

63-
c, err := NewClient(nil, ds, nil)
63+
c, err := NewClient(context.Background(), ds, nil)
6464
So(err, ShouldBeNil)
6565
So(c.GetVersion(), ShouldEqual, 2)
6666
})
@@ -73,7 +73,7 @@ func TestClient(t *testing.T) {
7373
}),
7474
}
7575

76-
c, err := NewClient(nil, ds, nil)
76+
c, err := NewClient(context.Background(), ds, nil)
7777
So(err, ShouldBeNil)
7878
So(c.GetVersion(), ShouldEqual, 5)
7979
})
@@ -86,7 +86,7 @@ func TestClient(t *testing.T) {
8686
}),
8787
}
8888

89-
c, err := NewClient(nil, ds, nil)
89+
c, err := NewClient(context.Background(), ds, nil)
9090
So(err, ShouldBeNil)
9191
So(c.GetVersion(), ShouldEqual, 56)
9292
})

‎pkg/tsdb/mssql/mssql_test.go

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mssql
22

33
import (
4+
"context"
45
"fmt"
56
"math/rand"
67
"strings"
@@ -128,7 +129,7 @@ func TestMSSQL(t *testing.T) {
128129
},
129130
}
130131

131-
resp, err := endpoint.Query(nil, nil, query)
132+
resp, err := endpoint.Query(context.Background(), nil, query)
132133
queryResult := resp.Results["A"]
133134
So(err, ShouldBeNil)
134135

@@ -218,7 +219,7 @@ func TestMSSQL(t *testing.T) {
218219
},
219220
}
220221

221-
resp, err := endpoint.Query(nil, nil, query)
222+
resp, err := endpoint.Query(context.Background(), nil, query)
222223
So(err, ShouldBeNil)
223224
queryResult := resp.Results["A"]
224225
So(queryResult.Error, ShouldBeNil)
@@ -265,7 +266,7 @@ func TestMSSQL(t *testing.T) {
265266
},
266267
}
267268

268-
resp, err := endpoint.Query(nil, nil, query)
269+
resp, err := endpoint.Query(context.Background(), nil, query)
269270
So(err, ShouldBeNil)
270271
queryResult := resp.Results["A"]
271272
So(queryResult.Error, ShouldBeNil)
@@ -327,7 +328,7 @@ func TestMSSQL(t *testing.T) {
327328
},
328329
}
329330

330-
resp, err := endpoint.Query(nil, nil, query)
331+
resp, err := endpoint.Query(context.Background(), nil, query)
331332
So(err, ShouldBeNil)
332333
queryResult := resp.Results["A"]
333334
So(queryResult.Error, ShouldBeNil)
@@ -352,7 +353,7 @@ func TestMSSQL(t *testing.T) {
352353
},
353354
}
354355

355-
resp, err := endpoint.Query(nil, nil, query)
356+
resp, err := endpoint.Query(context.Background(), nil, query)
356357
So(err, ShouldBeNil)
357358
queryResult := resp.Results["A"]
358359
So(queryResult.Error, ShouldBeNil)
@@ -441,7 +442,7 @@ func TestMSSQL(t *testing.T) {
441442
},
442443
}
443444

444-
resp, err := endpoint.Query(nil, nil, query)
445+
resp, err := endpoint.Query(context.Background(), nil, query)
445446
So(err, ShouldBeNil)
446447
queryResult := resp.Results["A"]
447448
So(queryResult.Error, ShouldBeNil)
@@ -463,7 +464,7 @@ func TestMSSQL(t *testing.T) {
463464
},
464465
}
465466

466-
resp, err := endpoint.Query(nil, nil, query)
467+
resp, err := endpoint.Query(context.Background(), nil, query)
467468
So(err, ShouldBeNil)
468469
queryResult := resp.Results["A"]
469470
So(queryResult.Error, ShouldBeNil)
@@ -485,7 +486,7 @@ func TestMSSQL(t *testing.T) {
485486
},
486487
}
487488

488-
resp, err := endpoint.Query(nil, nil, query)
489+
resp, err := endpoint.Query(context.Background(), nil, query)
489490
So(err, ShouldBeNil)
490491
queryResult := resp.Results["A"]
491492
So(queryResult.Error, ShouldBeNil)
@@ -507,7 +508,7 @@ func TestMSSQL(t *testing.T) {
507508
},
508509
}
509510

510-
resp, err := endpoint.Query(nil, nil, query)
511+
resp, err := endpoint.Query(context.Background(), nil, query)
511512
So(err, ShouldBeNil)
512513
queryResult := resp.Results["A"]
513514
So(queryResult.Error, ShouldBeNil)
@@ -529,7 +530,7 @@ func TestMSSQL(t *testing.T) {
529530
},
530531
}
531532

532-
resp, err := endpoint.Query(nil, nil, query)
533+
resp, err := endpoint.Query(context.Background(), nil, query)
533534
So(err, ShouldBeNil)
534535
queryResult := resp.Results["A"]
535536
So(queryResult.Error, ShouldBeNil)
@@ -551,7 +552,7 @@ func TestMSSQL(t *testing.T) {
551552
},
552553
}
553554

554-
resp, err := endpoint.Query(nil, nil, query)
555+
resp, err := endpoint.Query(context.Background(), nil, query)
555556
So(err, ShouldBeNil)
556557
queryResult := resp.Results["A"]
557558
So(queryResult.Error, ShouldBeNil)
@@ -573,7 +574,7 @@ func TestMSSQL(t *testing.T) {
573574
},
574575
}
575576

576-
resp, err := endpoint.Query(nil, nil, query)
577+
resp, err := endpoint.Query(context.Background(), nil, query)
577578
So(err, ShouldBeNil)
578579
queryResult := resp.Results["A"]
579580
So(queryResult.Error, ShouldBeNil)
@@ -595,7 +596,7 @@ func TestMSSQL(t *testing.T) {
595596
},
596597
}
597598

598-
resp, err := endpoint.Query(nil, nil, query)
599+
resp, err := endpoint.Query(context.Background(), nil, query)
599600
So(err, ShouldBeNil)
600601
queryResult := resp.Results["A"]
601602
So(queryResult.Error, ShouldBeNil)
@@ -617,7 +618,7 @@ func TestMSSQL(t *testing.T) {
617618
},
618619
}
619620

620-
resp, err := endpoint.Query(nil, nil, query)
621+
resp, err := endpoint.Query(context.Background(), nil, query)
621622
So(err, ShouldBeNil)
622623
queryResult := resp.Results["A"]
623624
So(queryResult.Error, ShouldBeNil)
@@ -640,7 +641,7 @@ func TestMSSQL(t *testing.T) {
640641
},
641642
}
642643

643-
resp, err := endpoint.Query(nil, nil, query)
644+
resp, err := endpoint.Query(context.Background(), nil, query)
644645
So(err, ShouldBeNil)
645646
queryResult := resp.Results["A"]
646647
So(queryResult.Error, ShouldBeNil)
@@ -663,7 +664,7 @@ func TestMSSQL(t *testing.T) {
663664
},
664665
}
665666

666-
resp, err := endpoint.Query(nil, nil, query)
667+
resp, err := endpoint.Query(context.Background(), nil, query)
667668
So(err, ShouldBeNil)
668669
queryResult := resp.Results["A"]
669670
So(queryResult.Error, ShouldBeNil)
@@ -739,7 +740,7 @@ func TestMSSQL(t *testing.T) {
739740
},
740741
}
741742

742-
resp, err := endpoint.Query(nil, nil, query)
743+
resp, err := endpoint.Query(context.Background(), nil, query)
743744
queryResult := resp.Results["A"]
744745
So(err, ShouldBeNil)
745746
So(queryResult.Error, ShouldBeNil)
@@ -816,7 +817,7 @@ func TestMSSQL(t *testing.T) {
816817
},
817818
}
818819

819-
resp, err := endpoint.Query(nil, nil, query)
820+
resp, err := endpoint.Query(context.Background(), nil, query)
820821
queryResult := resp.Results["A"]
821822
So(err, ShouldBeNil)
822823
So(queryResult.Error, ShouldBeNil)
@@ -892,7 +893,7 @@ func TestMSSQL(t *testing.T) {
892893
},
893894
}
894895

895-
resp, err := endpoint.Query(nil, nil, query)
896+
resp, err := endpoint.Query(context.Background(), nil, query)
896897
queryResult := resp.Results["Deploys"]
897898
So(err, ShouldBeNil)
898899
So(len(queryResult.Tables[0].Rows), ShouldEqual, 3)
@@ -915,7 +916,7 @@ func TestMSSQL(t *testing.T) {
915916
},
916917
}
917918

918-
resp, err := endpoint.Query(nil, nil, query)
919+
resp, err := endpoint.Query(context.Background(), nil, query)
919920
queryResult := resp.Results["Tickets"]
920921
So(err, ShouldBeNil)
921922
So(len(queryResult.Tables[0].Rows), ShouldEqual, 3)
@@ -941,7 +942,7 @@ func TestMSSQL(t *testing.T) {
941942
},
942943
}
943944

944-
resp, err := endpoint.Query(nil, nil, query)
945+
resp, err := endpoint.Query(context.Background(), nil, query)
945946
So(err, ShouldBeNil)
946947
queryResult := resp.Results["A"]
947948
So(queryResult.Error, ShouldBeNil)
@@ -971,7 +972,7 @@ func TestMSSQL(t *testing.T) {
971972
},
972973
}
973974

974-
resp, err := endpoint.Query(nil, nil, query)
975+
resp, err := endpoint.Query(context.Background(), nil, query)
975976
So(err, ShouldBeNil)
976977
queryResult := resp.Results["A"]
977978
So(queryResult.Error, ShouldBeNil)
@@ -1001,7 +1002,7 @@ func TestMSSQL(t *testing.T) {
10011002
},
10021003
}
10031004

1004-
resp, err := endpoint.Query(nil, nil, query)
1005+
resp, err := endpoint.Query(context.Background(), nil, query)
10051006
So(err, ShouldBeNil)
10061007
queryResult := resp.Results["A"]
10071008
So(queryResult.Error, ShouldBeNil)
@@ -1031,7 +1032,7 @@ func TestMSSQL(t *testing.T) {
10311032
},
10321033
}
10331034

1034-
resp, err := endpoint.Query(nil, nil, query)
1035+
resp, err := endpoint.Query(context.Background(), nil, query)
10351036
So(err, ShouldBeNil)
10361037
queryResult := resp.Results["A"]
10371038
So(queryResult.Error, ShouldBeNil)
@@ -1059,7 +1060,7 @@ func TestMSSQL(t *testing.T) {
10591060
},
10601061
}
10611062

1062-
resp, err := endpoint.Query(nil, nil, query)
1063+
resp, err := endpoint.Query(context.Background(), nil, query)
10631064
So(err, ShouldBeNil)
10641065
queryResult := resp.Results["A"]
10651066
So(queryResult.Error, ShouldBeNil)
@@ -1087,7 +1088,7 @@ func TestMSSQL(t *testing.T) {
10871088
},
10881089
}
10891090

1090-
resp, err := endpoint.Query(nil, nil, query)
1091+
resp, err := endpoint.Query(context.Background(), nil, query)
10911092
So(err, ShouldBeNil)
10921093
queryResult := resp.Results["A"]
10931094
So(queryResult.Error, ShouldBeNil)

0 commit comments

Comments
 (0)