more linter fixes (grafana#2024)

* more linter woes Signed-off-by: Ed Welch <[email protected]> * feedback Signed-off-by: Ed Welch <[email protected]>
vpistis · Apr 30, 2020 · 272a89c · 272a89c
1 parent 4f9a2fe
commit 272a89c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/pkg/distributor/validator.go b/pkg/distributor/validator.go
@@ -2,12 +2,13 @@ package distributor
 
 import (
 	"errors"
-	cortex_client "github.com/cortexproject/cortex/pkg/ingester/client"
-	"github.com/weaveworks/common/httpgrpc"
 	"net/http"
 	"strings"
 	"time"
 
+	cortex_client "github.com/cortexproject/cortex/pkg/ingester/client"
+	"github.com/weaveworks/common/httpgrpc"
+
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/util"
 	"github.com/grafana/loki/pkg/util/validation"

diff --git a/pkg/distributor/validator_test.go b/pkg/distributor/validator_test.go
@@ -1,14 +1,16 @@
 package distributor
 
 import (
-	"github.com/cortexproject/cortex/pkg/util/flagext"
-	"github.com/grafana/loki/pkg/logproto"
-	"github.com/grafana/loki/pkg/util/validation"
-	"github.com/stretchr/testify/assert"
-	"github.com/weaveworks/common/httpgrpc"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/cortexproject/cortex/pkg/util/flagext"
+	"github.com/stretchr/testify/assert"
+	"github.com/weaveworks/common/httpgrpc"
+
+	"github.com/grafana/loki/pkg/logproto"
+	"github.com/grafana/loki/pkg/util/validation"
 )
 
 var testStreamLabels = "FIXME"

diff --git a/pkg/ingester/instance.go b/pkg/ingester/instance.go
@@ -2,12 +2,11 @@ package ingester
 
 import (
 	"context"
-	"github.com/go-kit/kit/log/level"
-	"github.com/grafana/loki/pkg/util/validation"
 	"net/http"
 	"sync"
 	"time"
 
+	"github.com/go-kit/kit/log/level"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
@@ -27,6 +26,7 @@ import (
 	"github.com/grafana/loki/pkg/logql"
 	"github.com/grafana/loki/pkg/logql/stats"
 	"github.com/grafana/loki/pkg/util"
+	"github.com/grafana/loki/pkg/util/validation"
 )
 
 const queryBatchSize = 128

diff --git a/pkg/util/validation/validate.go b/pkg/util/validation/validate.go
@@ -2,8 +2,9 @@ package validation
 
 import (
 	"fmt"
-	"github.com/prometheus/client_golang/prometheus"
 	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,9 @@ package validation @@
     import (
     	"fmt"
-    	"github.com/prometheus/client_golang/prometheus"
     	"time"
+    	"github.com/prometheus/client_golang/prometheus"
     )
     const (
@@ Expand Down @@