go vet

Author: cpanato

server/alertmanager/alerts.go

@@ -17,8 +17,8 @@ func ListAlerts(alertmanagerURL string) ([]*types.Alert, error) {
 	var alertResponse []*types.Alert
 	dec := json.NewDecoder(resp.Body)
 	defer resp.Body.Close()
-	if err := dec.Decode(&alertResponse); err != nil {
-		return nil, err
+	if errDec := dec.Decode(&alertResponse); errDec != nil {
+		return nil, errDec
 	}
 
 	return alertResponse, err

server/alertmanager/retry.go

@@ -25,9 +25,9 @@ func httpRetry(method string, url string) (*http.Response, error) {
 	defer cancel()
 
 	fn := func() error {
-		req, err := http.NewRequest(method, url, nil)
-		if err != nil {
-			return err
+		req, errReq := http.NewRequest(method, url, nil)
+		if errReq != nil {
+			return errReq
 		}
 
 		req = req.WithContext(ctx)
@@ -51,8 +51,8 @@ func httpRetry(method string, url string) (*http.Response, error) {
 		return nil
 	}
 
-	if err := backoff.Retry(fn, httpBackoff()); err != nil {
-		return nil, err
+	if errRetry := backoff.Retry(fn, httpBackoff()); errRetry != nil {
+		return nil, errRetry
 	}
 	return resp, err
 }

server/alertmanager/silences.go

@@ -21,8 +21,8 @@ func ListSilences(alertmanagerURL string) ([]types.Silence, error) {
 	var silencesResponse []types.Silence
 	dec := json.NewDecoder(resp.Body)
 	defer resp.Body.Close()
-	if err := dec.Decode(&silencesResponse); err != nil {
-		return nil, err
+	if errDec := dec.Decode(&silencesResponse); errDec != nil {
+		return nil, errDec
 	}
 
 	silences := silencesResponse

server/alertmanager/silences_test.go

@@ -0,0 +1,20 @@
+package alertmanager
+
+import (
+	"testing"
+	"time"
+
+	"github.com/prometheus/alertmanager/types"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestResolved(t *testing.T) {
+	s := types.Silence{}
+	assert.False(t, Resolved(s))
+
+	s.EndsAt = time.Now().Add(time.Minute)
+	assert.False(t, Resolved(s))
+
+	s.EndsAt = time.Now().Add(-1 * time.Minute)
+	assert.True(t, Resolved(s))
+}