From a3f58fc52e247a1d251349c99f44e019044afea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 26 May 2017 21:59:54 +0100 Subject: [PATCH 1/5] 0 is the default value --- filters/filter_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filters/filter_test.go b/filters/filter_test.go index 73437c586..9374ba5ed 100644 --- a/filters/filter_test.go +++ b/filters/filter_test.go @@ -533,7 +533,7 @@ func TestLimitFilter(t *testing.T) { } if f.GetIsValid() { alert := models.Alert{} - var index int = 0 + var index int for _, isMatch := range ft.IsMatch { m := f.Match(&alert, index) if m != isMatch { From 8ae3f02f8b093150bdd8fb03dbe72e5a6c2c66ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 26 May 2017 22:00:21 +0100 Subject: [PATCH 2/5] struct field silenceId should be silenceID --- store/store_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/store/store_test.go b/store/store_test.go index dada9a1a6..f9a87c82d 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -9,7 +9,7 @@ import ( type silenceTest struct { silences map[string]models.Silence - silenceId string + silenceID string found bool } @@ -18,7 +18,7 @@ var silenceTests = []silenceTest{ silences: map[string]models.Silence{ "1": models.Silence{}, }, - silenceId: "1", + silenceID: "1", found: true, }, silenceTest{ @@ -27,12 +27,12 @@ var silenceTests = []silenceTest{ "2": models.Silence{}, "3": models.Silence{}, }, - silenceId: "2", + silenceID: "2", found: true, }, silenceTest{ silences: map[string]models.Silence{}, - silenceId: "1", + silenceID: "1", found: false, }, silenceTest{ @@ -40,7 +40,7 @@ var silenceTests = []silenceTest{ "2": models.Silence{}, "3": models.Silence{}, }, - silenceId: "1", + silenceID: "1", found: false, }, } @@ -48,10 +48,10 @@ var silenceTests = []silenceTest{ func TestSilences(t *testing.T) { for _, testCase := range silenceTests { store.Store.SetSilences(testCase.silences) - silence := store.Store.GetSilence(testCase.silenceId) + silence := store.Store.GetSilence(testCase.silenceID) found := silence != nil if found != testCase.found { - t.Errorf("GetSilence('%s') returned %v, %v was expected", testCase.silenceId, found, testCase.found) + t.Errorf("GetSilence('%s') returned %v, %v was expected", testCase.silenceID, found, testCase.found) } } } From a2bcb9b04d3d6b0e31c4260d5b9c00fc73ae6f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 26 May 2017 22:01:22 +0100 Subject: [PATCH 3/5] should omit 2nd value from range; this loop is equivalent to 'for value := range ...' --- transform/color_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transform/color_test.go b/transform/color_test.go index 49065c038..5a11c909e 100644 --- a/transform/color_test.go +++ b/transform/color_test.go @@ -74,7 +74,7 @@ func TestColorLabel(t *testing.T) { } for key, valueMap := range colorStore { if _, found := testCase.colors[key]; found { - for value, _ := range valueMap { + for value := range valueMap { if value != testCase.colors[key] { t.Errorf("Unexpected value '%s' for label '%s' found in color map", value, key) } From a15f6eb914bee202edbede52241cc80a7c8f64b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 26 May 2017 22:05:34 +0100 Subject: [PATCH 4/5] Use COPY instead of ADD for files and folders --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ea10d12ab..ef1313c43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.8.1-alpine -ADD . /go/src/github.com/cloudflare/unsee +COPY . /go/src/github.com/cloudflare/unsee ARG VERSION From fa28d43059e58b65c9cb72eff417c53495c6e9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 26 May 2017 22:11:00 +0100 Subject: [PATCH 5/5] Remove unused imports --- mock/livemock.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mock/livemock.py b/mock/livemock.py index d468ec4bc..fd95e790b 100644 --- a/mock/livemock.py +++ b/mock/livemock.py @@ -1,8 +1,6 @@ #!/usr/bin/env python -import os import time -import json import requests requests.post('http://localhost:9093/api/v1/silences',