From 29b6c7baae2b19e88a8cc8feb8a6d78dc6d73c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 18 Aug 2019 10:58:26 +0100 Subject: [PATCH] fix(backend): fix problems found by new linters --- internal/alertmanager/dedup.go | 2 ++ internal/alertmanager/models.go | 1 + internal/filters/filter_test.go | 2 +- internal/models/alertgroup_test.go | 3 +++ internal/uri/uri_test.go | 2 +- proxy_test.go | 1 + views.go | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/alertmanager/dedup.go b/internal/alertmanager/dedup.go index ae0ec049f..42d306332 100644 --- a/internal/alertmanager/dedup.go +++ b/internal/alertmanager/dedup.go @@ -31,6 +31,7 @@ func DedupAlerts() []models.AlertGroup { alerts := map[string]models.Alert{} for _, ag := range agList { for _, alert := range ag.Alerts { + alert := alert // scopelint pin // remove all alerts for receiver(s) that the user doesn't // want to see in the UI if transform.StripReceivers(config.Config.Receivers.Keep, config.Config.Receivers.Strip, alert.Receiver) { @@ -66,6 +67,7 @@ func DedupAlerts() []models.AlertGroup { ag := models.AlertGroup(agList[0]) ag.Alerts = models.AlertList{} for _, alert := range alerts { + alert := alert // scopelint pin // strip labels and annotations user doesn't want to see in the UI alert.Labels = transform.StripLables(config.Config.Labels.Keep, config.Config.Labels.Strip, alert.Labels) alert.Annotations = transform.StripAnnotations(config.Config.Annotations.Keep, config.Config.Annotations.Strip, alert.Annotations) diff --git a/internal/alertmanager/models.go b/internal/alertmanager/models.go index 6d3f48d80..d4306f883 100644 --- a/internal/alertmanager/models.go +++ b/internal/alertmanager/models.go @@ -182,6 +182,7 @@ func (am *Alertmanager) pullSilences(version string) error { log.Infof("[%s] Detecting JIRA links in silences (%d)", am.Name, len(silences)) silenceMap := map[string]models.Silence{} for _, silence := range silences { + silence := silence // scopelint pin silence.JiraID, silence.JiraURL = transform.DetectJIRAs(&silence) silenceMap[silence.ID] = silence } diff --git a/internal/filters/filter_test.go b/internal/filters/filter_test.go index 629d996d4..53fb816e6 100644 --- a/internal/filters/filter_test.go +++ b/internal/filters/filter_test.go @@ -15,9 +15,9 @@ import ( type filterTest struct { Expression string IsValid bool + IsMatch bool Alert models.Alert Silence models.Silence - IsMatch bool } var tests = []filterTest{ diff --git a/internal/models/alertgroup_test.go b/internal/models/alertgroup_test.go index ea4ec8896..9922c1856 100644 --- a/internal/models/alertgroup_test.go +++ b/internal/models/alertgroup_test.go @@ -153,9 +153,12 @@ var agFPTests = []agFPTest{ func TestAlertGroupContentFingerprint(t *testing.T) { fps := []string{} for i, testCase := range agFPTests { + i := i // scopelint pin + testCase := testCase // scopelint pin t.Run(testCase.name, func(t *testing.T) { alerts := models.AlertList{} for _, alert := range testCase.ag.Alerts { + alert := alert // scopelint pin alert.UpdateFingerprints() alerts = append(alerts, alert) } diff --git a/internal/uri/uri_test.go b/internal/uri/uri_test.go index b98b934b9..25ef4adf2 100644 --- a/internal/uri/uri_test.go +++ b/internal/uri/uri_test.go @@ -31,8 +31,8 @@ func getFileSize(path string) int64 { type httpTransportTest struct { timeout time.Duration - useTLS bool tlsConfig *tls.Config + useTLS bool failed bool headers map[string]string } diff --git a/proxy_test.go b/proxy_test.go index d6086405a..d0757a8df 100644 --- a/proxy_test.go +++ b/proxy_test.go @@ -178,6 +178,7 @@ func TestProxyHeaders(t *testing.T) { defer httpmock.DeactivateAndReset() for _, testCase := range proxyHeaderTests { + testCase := testCase //scopelint pin r := ginTestEngine() am, err := alertmanager.NewAlertmanager( "dummy", diff --git a/views.go b/views.go index 794d5e717..d0b22d56c 100644 --- a/views.go +++ b/views.go @@ -230,6 +230,7 @@ func alerts(c *gin.Context) { } for _, alert := range ag.Alerts { + alert := alert // scopelint pin results := []bool{} if validFilters { for _, filter := range matchFilters {