Group imports and satisfy go-lint

Signed-off-by: Michael Okoko <[email protected]>
thanos-io · Jul 3, 2021 · 8809e2c · 8809e2c
1 parent 72fb04f
commit 8809e2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go
@@ -15,9 +15,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/prometheus/prometheus/storage"
-	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
@@ -33,6 +30,7 @@ import (
 	"github.com/prometheus/prometheus/pkg/relabel"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/rules"
+	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb"
 	"github.com/prometheus/prometheus/util/strutil"
 	"github.com/thanos-io/thanos/pkg/errutil"
@@ -53,6 +51,7 @@ import (
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/query"
 	thanosrules "github.com/thanos-io/thanos/pkg/rules"
+	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
 	"github.com/thanos-io/thanos/pkg/runutil"
 	grpcserver "github.com/thanos-io/thanos/pkg/server/grpc"
 	httpserver "github.com/thanos-io/thanos/pkg/server/http"

diff --git a/pkg/rules/remotewrite/wal_test.go b/pkg/rules/remotewrite/wal_test.go
@@ -348,7 +348,7 @@ func (s seriesList) SeriesNames() []string {
 	return names
 }
 
-// ExpectedSamples returns the list of expected samples, sorted by ref ID and timestamp
+// ExpectedSamples returns the list of expected samples, sorted by ref ID and timestamp.
 func (s seriesList) ExpectedSamples() []record.RefSample {
 	expect := []record.RefSample{}
 	for _, series := range s {

diff --git a/test/e2e/e2ethanos/services.go b/test/e2e/e2ethanos/services.go
@@ -13,8 +13,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
-
 	"github.com/cortexproject/cortex/integration/e2e"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/pkg/errors"
@@ -28,6 +26,7 @@ import (
 	"github.com/thanos-io/thanos/pkg/query"
 	"github.com/thanos-io/thanos/pkg/queryfrontend"
 	"github.com/thanos-io/thanos/pkg/receive"
+	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
 )
 
 const infoLogLevel = "info"

diff --git a/test/e2e/rule_test.go b/test/e2e/rule_test.go
@@ -15,19 +15,18 @@ import (
 	"testing"
 	"time"
 
-	common_cfg "github.com/prometheus/common/config"
-	"github.com/prometheus/prometheus/config"
-	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
-
 	"github.com/cortexproject/cortex/integration/e2e"
+	common_cfg "github.com/prometheus/common/config"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 	"gopkg.in/yaml.v2"
 
 	"github.com/thanos-io/thanos/pkg/alert"
 	http_util "github.com/thanos-io/thanos/pkg/http"
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/query"
+	"github.com/thanos-io/thanos/pkg/rules/remotewrite"
 	"github.com/thanos-io/thanos/pkg/rules/rulespb"
 	"github.com/thanos-io/thanos/pkg/testutil"
 	"github.com/thanos-io/thanos/test/e2e/e2ethanos"