Updated goimports; did make format; go mod tidy.

bwplotka · bwplotka · commit dec4d0a7fc6a · 2019-05-15T11:52:02.000+01:00
Main change is the import alias: golang/go#28428 Quite annoying but nothing much we can do. Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 PREFIX            ?= $(shell pwd)
-DIRECTORIES       ?= $(shell find . -path './*' -prune -type d -not -path "./vendor")
+FILES_TO_FMT      ?= $(shell find . -path ./vendor -prune -o -name '*.go' -print)
+
 DOCKER_IMAGE_NAME ?= thanos
 DOCKER_IMAGE_TAG  ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))-$(shell date +%Y-%m-%d)-$(shell git rev-parse --short HEAD)
 
@@ -18,7 +19,7 @@ ERRCHECK_VERSION  ?= e14f8d59a22d460d56c5ee92507cd94c78fbf274
 LICHE             ?= $(GOBIN)/liche-$(LICHE_VERSION)
 LICHE_VERSION     ?= 2a2e6e56f6c615c17b2e116669c4cdb31b5453f3
 GOIMPORTS         ?= $(GOBIN)/goimports-$(GOIMPORTS_VERSION)
-GOIMPORTS_VERSION ?= 1c3d964395ce8f04f3b03b30aaed0b096c08c3c6
+GOIMPORTS_VERSION ?= 9d4d845e86f14303813298ede731a971dd65b593
 PROMU             ?= $(GOBIN)/promu-$(PROMU_VERSION)
 # v0.2.0
 PROMU_VERSION     ?= 264dc36af9ea3103255063497636bd5713e3e9c1
@@ -113,6 +114,11 @@ crossbuild: $(PROMU)
 	@echo ">> crossbuilding all binaries"
 	$(PROMU) crossbuild -v
 
+# deps ensures fresh go.mod and go.sum.
+.PHONY: deps
+deps:
+	@go mod tidy
+
 # docker builds docker with no tag.
 .PHONY: docker
 docker: build
@@ -156,7 +162,7 @@ errcheck: $(ERRCHECK)
 .PHONY: format
 format: $(GOIMPORTS)
 	@echo ">> formatting code"
-	@$(GOIMPORTS) -w $(DIRECTORIES)
+	@$(GOIMPORTS) -w $(FILES_TO_FMT)
 
 # proto generates golang files from Thanos proto files.
 .PHONY: proto
diff --git a/benchmark/cmd/thanosbench/main.go b/benchmark/cmd/thanosbench/main.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/prometheus/common/version"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
diff --git a/benchmark/cmd/thanosbench/resources.go b/benchmark/cmd/thanosbench/resources.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	prom "github.com/prometheus/prometheus/config"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
diff --git a/cmd/thanos/bucket.go b/cmd/thanos/bucket.go
@@ -20,13 +20,13 @@ import (
 	"github.com/oklog/run"
 	"github.com/oklog/ulid"
 	"github.com/olekukonko/tablewriter"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/tsdb/labels"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (
diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go
@@ -21,11 +21,11 @@ import (
 	"github.com/improbable-eng/thanos/pkg/objstore/client"
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/oklog/run"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/tsdb"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (
diff --git a/cmd/thanos/downsample.go b/cmd/thanos/downsample.go
@@ -19,12 +19,12 @@ import (
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/oklog/run"
 	"github.com/oklog/ulid"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/tsdb"
 	"github.com/prometheus/tsdb/chunkenc"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func registerDownsample(m map[string]setupFunc, app *kingpin.Application, name string) {
diff --git a/cmd/thanos/flags.go b/cmd/thanos/flags.go
@@ -14,7 +14,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func regGRPCFlags(cmd *kingpin.CmdClause) (
diff --git a/cmd/thanos/main.go b/cmd/thanos/main.go
@@ -28,7 +28,7 @@ import (
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/improbable-eng/thanos/pkg/tracing"
 	"github.com/oklog/run"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go
@@ -18,14 +18,14 @@ import (
 	"github.com/improbable-eng/thanos/pkg/store"
 	"github.com/improbable-eng/thanos/pkg/store/storepb"
 	"github.com/oklog/run"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/storage/tsdb"
 	"github.com/prometheus/tsdb/labels"
 	"google.golang.org/grpc"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func registerReceive(m map[string]setupFunc, app *kingpin.Application, name string) {
diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go
@@ -39,7 +39,7 @@ import (
 	"github.com/improbable-eng/thanos/pkg/tracing"
 	"github.com/improbable-eng/thanos/pkg/ui"
 	"github.com/oklog/run"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
@@ -53,7 +53,7 @@ import (
 	"github.com/prometheus/prometheus/util/strutil"
 	"github.com/prometheus/tsdb/labels"
 	"google.golang.org/grpc"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 // registerRule registers a rule command.
diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/hashicorp/go-version"
+	version "github.com/hashicorp/go-version"
 	"github.com/improbable-eng/thanos/pkg/block/metadata"
 	"github.com/improbable-eng/thanos/pkg/cluster"
 	"github.com/improbable-eng/thanos/pkg/component"
diff --git a/pkg/cluster/advertise.go b/pkg/cluster/advertise.go
@@ -2,10 +2,9 @@ package cluster
 
 import (
 	"net"
-
 	"strconv"
 
-	"github.com/hashicorp/go-sockaddr"
+	sockaddr "github.com/hashicorp/go-sockaddr"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/fortytw2/leaktest"
 	"github.com/go-kit/kit/log"
-	"github.com/hashicorp/go-sockaddr"
+	sockaddr "github.com/hashicorp/go-sockaddr"
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/improbable-eng/thanos/pkg/store/storepb"
 	"github.com/improbable-eng/thanos/pkg/testutil"
diff --git a/pkg/compact/compact_test.go b/pkg/compact/compact_test.go
@@ -3,13 +3,13 @@ package compact
 import (
 	"bytes"
 	"context"
-	"github.com/improbable-eng/thanos/pkg/objstore/inmem"
-	"github.com/oklog/ulid"
 	"path"
 	"testing"
 	"time"
 
+	"github.com/improbable-eng/thanos/pkg/objstore/inmem"
 	"github.com/improbable-eng/thanos/pkg/testutil"
+	"github.com/oklog/ulid"
 	"github.com/pkg/errors"
 )
 
@@ -57,7 +57,7 @@ func TestSyncer_SyncMetas_HandlesMalformedBlocks(t *testing.T) {
 	testutil.Ok(t, err)
 
 	var fakeChunk bytes.Buffer
-	fakeChunk.Write([]byte{0,1,2,3})
+	fakeChunk.Write([]byte{0, 1, 2, 3})
 	testutil.Ok(t, bkt.Upload(ctx, path.Join(shouldDeleteId.String(), "chunks", "000001"), &fakeChunk))
 
 	// Generate 1 block which is older than consistencyDelay but younger than MinimumAgeForRemoval, and which has chunk
diff --git a/pkg/objstore/azure/helpers.go b/pkg/objstore/azure/helpers.go
@@ -27,7 +27,7 @@ func getContainerURL(ctx context.Context, conf Config) (blob.ContainerURL, error
 	}
 
 	p := blob.NewPipeline(c, blob.PipelineOptions{
-		Retry: retryOptions,
+		Retry:     retryOptions,
 		Telemetry: blob.TelemetryOptions{Value: "Thanos"},
 	})
 	u, err := url.Parse(fmt.Sprintf("https://%s.%s", conf.StorageAccountName, conf.Endpoint))
diff --git a/pkg/objstore/client/factory.go b/pkg/objstore/client/factory.go
@@ -15,7 +15,7 @@ import (
 	"github.com/improbable-eng/thanos/pkg/objstore/swift"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 type ObjProvider string
diff --git a/pkg/objstore/cos/cos.go b/pkg/objstore/cos/cos.go
@@ -14,7 +14,7 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/improbable-eng/thanos/pkg/objstore"
 	"github.com/improbable-eng/thanos/pkg/runutil"
-	"github.com/mozillazg/go-cos"
+	cos "github.com/mozillazg/go-cos"
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 )
diff --git a/pkg/objstore/s3/s3.go b/pkg/objstore/s3/s3.go
@@ -16,12 +16,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
-
 	"github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/log/level"
 	"github.com/improbable-eng/thanos/pkg/objstore"
 	"github.com/improbable-eng/thanos/pkg/runutil"
-	"github.com/minio/minio-go"
+	minio "github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"
 	"github.com/minio/minio-go/pkg/encrypt"
 	"github.com/pkg/errors"
@@ -37,7 +36,7 @@ const DirDelim = "/"
 type Config struct {
 	Bucket          string            `yaml:"bucket"`
 	Endpoint        string            `yaml:"endpoint"`
-	Region        	string            `yaml:"region"`
+	Region          string            `yaml:"region"`
 	AccessKey       string            `yaml:"access_key"`
 	Insecure        bool              `yaml:"insecure"`
 	SignatureV2     bool              `yaml:"signature_version2"`
diff --git a/pkg/objstore/swift/swift.go b/pkg/objstore/swift/swift.go
@@ -20,7 +20,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"
 	"github.com/gophercloud/gophercloud/pagination"
 	"github.com/pkg/errors"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // DirDelim is the delimiter used to model a directory structure in an object store bucket.
diff --git a/pkg/promclient/promclient.go b/pkg/promclient/promclient.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/hashicorp/go-version"
+	version "github.com/hashicorp/go-version"
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/improbable-eng/thanos/pkg/store/storepb"
 	"github.com/improbable-eng/thanos/pkg/tracing"
diff --git a/pkg/promclient/promclient_e2e_test.go b/pkg/promclient/promclient_e2e_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/go-kit/kit/log"
-	"github.com/hashicorp/go-version"
+	version "github.com/hashicorp/go-version"
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/improbable-eng/thanos/pkg/testutil"
 	"github.com/oklog/ulid"
diff --git a/pkg/query/api/v1.go b/pkg/query/api/v1.go
@@ -32,7 +32,7 @@ import (
 	"github.com/improbable-eng/thanos/pkg/query"
 	"github.com/improbable-eng/thanos/pkg/runutil"
 	"github.com/improbable-eng/thanos/pkg/tracing"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
diff --git a/pkg/query/api/v1_test.go b/pkg/query/api/v1_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/improbable-eng/thanos/pkg/compact"
 	"github.com/improbable-eng/thanos/pkg/query"
 	"github.com/improbable-eng/thanos/pkg/testutil"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/route"
 	"github.com/prometheus/prometheus/pkg/labels"
diff --git a/pkg/rule/api/v1.go b/pkg/rule/api/v1.go
@@ -11,7 +11,7 @@ import (
 	thanosrule "github.com/improbable-eng/thanos/pkg/rule"
 	"github.com/improbable-eng/thanos/pkg/store/storepb"
 	"github.com/improbable-eng/thanos/pkg/tracing"
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/route"
 	"github.com/prometheus/prometheus/pkg/labels"
diff --git a/pkg/runutil/runutil_test.go b/pkg/runutil/runutil_test.go
diff --git a/pkg/store/tsdb_test.go b/pkg/store/tsdb_test.go
diff --git a/pkg/tracing/gct.go b/pkg/tracing/gct.go
diff --git a/pkg/tracing/grpc.go b/pkg/tracing/grpc.go
diff --git a/pkg/tracing/http.go b/pkg/tracing/http.go
diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go
diff --git a/pkg/tracing/tracing_test.go b/pkg/tracing/tracing_test.go
diff --git a/scripts/bucketcfggen/main.go b/scripts/bucketcfggen/main.go
diff --git a/tutorials/kubernetes-demo/blockgen/main.go b/tutorials/kubernetes-demo/blockgen/main.go

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/go-kit/kit/log"`
`9`	`9`	`"github.com/prometheus/common/version"`
`10`		`- "gopkg.in/alecthomas/kingpin.v2"`
	`10`	`+ kingpin "gopkg.in/alecthomas/kingpin.v2"`
`11`	`11`	`"k8s.io/client-go/tools/clientcmd"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/pkg/errors"`
`15`	`15`	`"github.com/prometheus/client_golang/prometheus"`
`16`	`16`	`"github.com/prometheus/common/model"`
`17`		`- "gopkg.in/alecthomas/kingpin.v2"`
	`17`	`+ kingpin "gopkg.in/alecthomas/kingpin.v2"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func regGRPCFlags(cmd *kingpin.CmdClause) (`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@ package cluster`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net"`
`5`		`-`
`6`	`5`	`"strconv"`
`7`	`6`
`8`		`- "github.com/hashicorp/go-sockaddr"`
	`7`	`+ sockaddr "github.com/hashicorp/go-sockaddr"`
`9`	`8`	`"github.com/pkg/errors"`
`10`	`9`	`)`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func getContainerURL(ctx context.Context, conf Config) (blob.ContainerURL, error`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`p := blob.NewPipeline(c, blob.PipelineOptions{`
`30`		`- Retry: retryOptions,`
	`30`	`+ Retry: retryOptions,`
`31`	`31`	`Telemetry: blob.TelemetryOptions{Value: "Thanos"},`
`32`	`32`	`})`
`33`	`33`	`u, err := url.Parse(fmt.Sprintf("https://%s.%s", conf.StorageAccountName, conf.Endpoint))`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/improbable-eng/thanos/pkg/objstore/swift"`
`16`	`16`	`"github.com/pkg/errors"`
`17`	`17`	`"github.com/prometheus/client_golang/prometheus"`
`18`		`- "gopkg.in/yaml.v2"`
	`18`	`+ yaml "gopkg.in/yaml.v2"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`type ObjProvider string`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"`
`21`	`21`	`"github.com/gophercloud/gophercloud/pagination"`
`22`	`22`	`"github.com/pkg/errors"`
`23`		`- "gopkg.in/yaml.v2"`
	`23`	`+ yaml "gopkg.in/yaml.v2"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// DirDelim is the delimiter used to model a directory structure in an object store bucket.`