chore: add goimports

Makefile

@@ -128,7 +128,7 @@ ui_client:
 #
 
 fmt: $(SOURCES_NO_VENDOR)
-	gofmt -w -s $^
+	./etc/fmt.sh
 
 checkfmt:
 	./etc/checkfmt.sh

chronograf/dist/dist.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 )
 
 // DebugAssets serves assets via a specified directory

cmd/internal/input.go

@@ -3,11 +3,11 @@ package internal
 import (
 	"errors"
 	"fmt"
-	"github.com/influxdata/influxdb/v2/task/options"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/influxdata/influxdb/v2/task/options"
 	"github.com/tcnksm/go-input"
 )
 

etc/checkfmt.sh

@@ -5,8 +5,8 @@ HAS_FMT_ERR=0
 for file in $(go list -f '{{$dir := .Dir}}{{range .GoFiles}}{{printf "%s/%s\n" $dir .}}{{end}}' ./...); do
   # ... if file does not contain standard generated code comment (https://golang.org/s/generatedcode)...
   if ! grep -Exq '^// Code generated .* DO NOT EDIT\.$' $file; then
-    FMT_OUT="$(gofmt -l -d -e $file)" # gofmt exits 0 regardless of whether it's formatted.
-    # ... and if gofmt had any output...
+    FMT_OUT="$(goimports -l -d $file)"
+    # ... and if goimports had any output...
     if [[ -n "$FMT_OUT" ]]; then
       if [ "$HAS_FMT_ERR" -eq "0" ]; then
         # Only print this once.

etc/fmt.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# For every Go file in the project, excluding vendor...
+for file in $(go list -f '{{$dir := .Dir}}{{range .GoFiles}}{{printf "%s/%s\n" $dir .}}{{end}}' ./...); do
+  # ... if file does not contain standard generated code comment (https://golang.org/s/generatedcode)...
+  if ! grep -Exq '^// Code generated .* DO NOT EDIT\.$' $file; then
+    gofmt -w -s $file
+    goimports -w $file
+  fi
+done

http/backup_service.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/influxdata/httprouter"
 	"github.com/influxdata/influxdb/v2"
-	// "github.com/influxdata/influxdb/v2/bolt"
 	"github.com/influxdata/influxdb/v2/kit/tracing"
 	"go.uber.org/zap"
 )

logger/logger.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/jsternberg/zap-logfmt"
+	zaplogfmt "github.com/jsternberg/zap-logfmt"
 	isatty "github.com/mattn/go-isatty"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"

task/backend/analytical_storage.go

@@ -5,12 +5,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/influxdb/v2/kit/errors"
 	"time"
 
 	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/influxdb/v2"
+	"github.com/influxdata/influxdb/v2/kit/errors"
 	"github.com/influxdata/influxdb/v2/query"
 	"github.com/influxdata/influxdb/v2/storage"
 	"go.uber.org/zap"

tenant/service_onboarding.go

@@ -3,6 +3,7 @@ package tenant
 import (
 	"context"
 	"fmt"
+
 	"github.com/influxdata/influxdb/v2"
 	icontext "github.com/influxdata/influxdb/v2/context"
 	"github.com/influxdata/influxdb/v2/kv"

tsdb/index/tsi1/cache.go

@@ -136,7 +136,7 @@ func (c *TagValueSeriesIDCache) Put(name, key, value []byte, ss *tsdb.SeriesIDSe
 
 	// No map for the measurement - first tag key for the measurement.
 	c.cache[string(name)] = map[string]map[string]*list.Element{
-		string(key): map[string]*list.Element{string(value): listElement},
+		string(key): {string(value): listElement},
 	}
 
 EVICT: