Clean up lint warnings

Signed-off-by: Andrew Bloomgarden <[email protected]>

Author: aughr

integration/alertmanager_test.go

@@ -7,12 +7,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/thanos-io/thanos/pkg/objstore/s3"
 	"net/http"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/thanos-io/thanos/pkg/objstore/s3"
+
 	amlabels "github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/alertmanager/types"
 	"github.com/prometheus/common/model"

integration/e2ecortex/services.go

@@ -187,13 +187,13 @@ func NewIngesterWithConfigFile(name string, store RingStore, address, configFile
 		name,
 		image,
 		e2e.NewCommandWithoutEntrypoint("cortex", e2e.BuildArgs(e2e.MergeFlags(map[string]string{
-			"-target":                        "ingester",
-			"-log.level":                     "warn",
-			"-ingester.final-sleep":          "0s",
-			"-ingester.join-after":           "0s",
-			"-ingester.min-ready-duration":   "0s",
-			"-ingester.concurrent-flushes":   "10",
-			"-ingester.num-tokens":           "512",
+			"-target":                      "ingester",
+			"-log.level":                   "warn",
+			"-ingester.final-sleep":        "0s",
+			"-ingester.join-after":         "0s",
+			"-ingester.min-ready-duration": "0s",
+			"-ingester.concurrent-flushes": "10",
+			"-ingester.num-tokens":         "512",
 		}, flags))...),
 		e2e.NewHTTPReadinessProbe(httpPort, "/ready", 200, 299),
 		httpPort,
@@ -334,11 +334,11 @@ func NewSingleBinary(name string, flags map[string]string, image string, otherPo
 			// Distributor.
 			"-distributor.replication-factor": "1",
 			// Ingester.
-			"-ingester.final-sleep":          "0s",
-			"-ingester.join-after":           "0s",
-			"-ingester.min-ready-duration":   "0s",
-			"-ingester.concurrent-flushes":   "10",
-			"-ingester.num-tokens":           "512",
+			"-ingester.final-sleep":        "0s",
+			"-ingester.join-after":         "0s",
+			"-ingester.min-ready-duration": "0s",
+			"-ingester.concurrent-flushes": "10",
+			"-ingester.num-tokens":         "512",
 			// Startup quickly.
 			"-store-gateway.sharding-ring.wait-stability-min-duration": "0",
 			"-store-gateway.sharding-ring.wait-stability-max-duration": "0",

pkg/alertmanager/alertstore/store.go

@@ -2,6 +2,7 @@ package alertstore
 
 import (
 	"context"
+
 	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 

pkg/cortex/cortex_test.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"context"
 	"flag"
-	"github.com/cortexproject/cortex/pkg/ruler/rulestore"
-	"github.com/cortexproject/cortex/pkg/ruler/rulestore/local"
 	"io"
 	"net"
 	"os"
@@ -14,6 +12,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/ruler/rulestore"
+	"github.com/cortexproject/cortex/pkg/ruler/rulestore/local"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/flusher/flusher.go

@@ -18,7 +18,7 @@ import (
 
 // Config for an Ingester.
 type Config struct {
-	ExitAfterFlush    bool          `yaml:"exit_after_flush"`
+	ExitAfterFlush bool `yaml:"exit_after_flush"`
 }
 
 // RegisterFlags adds the flags required to config this to the given FlagSet