Fix goimports in all existing files. Execution of ./scripts/fix.sh

Signed-off-by: Piotr Tabor <ptab@google.com>

client/pkg/fileutil/fileutil.go

@@ -21,8 +21,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/client/pkg/v3/verify"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/client/pkg/v3/verify"
 )
 
 const (

client/pkg/testutil/before.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.etcd.io/etcd/client/pkg/v3/verify"
 )
 

client/v2/keys.go

@@ -25,8 +25,9 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/client/pkg/v3/pathutil"
 	kjson "sigs.k8s.io/json"
+
+	"go.etcd.io/etcd/client/pkg/v3/pathutil"
 )
 
 const (

client/v3/auth.go

@@ -19,9 +19,10 @@ import (
 	"fmt"
 	"strings"
 
+	"google.golang.org/grpc"
+
 	"go.etcd.io/etcd/api/v3/authpb"
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"google.golang.org/grpc"
 )
 
 type (

client/v3/client.go

@@ -23,11 +23,6 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	"go.etcd.io/etcd/client/pkg/v3/logutil"
-	"go.etcd.io/etcd/client/v3/credentials"
-	"go.etcd.io/etcd/client/v3/internal/endpoint"
-	"go.etcd.io/etcd/client/v3/internal/resolver"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -35,6 +30,12 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/status"
+
+	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	"go.etcd.io/etcd/client/pkg/v3/logutil"
+	"go.etcd.io/etcd/client/v3/credentials"
+	"go.etcd.io/etcd/client/v3/internal/endpoint"
+	"go.etcd.io/etcd/client/v3/internal/resolver"
 )
 
 var (

client/v3/concurrency/session.go

@@ -18,8 +18,9 @@ import (
 	"context"
 	"time"
 
-	v3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
+
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 const defaultSessionTTL = 60

client/v3/credentials/credentials.go

@@ -22,8 +22,9 @@ import (
 	"net"
 	"sync"
 
-	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	grpccredentials "google.golang.org/grpc/credentials"
+
+	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 )
 
 // Config defines gRPC credential configuration.

client/v3/ctx.go

@@ -17,9 +17,10 @@ package clientv3
 import (
 	"context"
 
+	"google.golang.org/grpc/metadata"
+
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/api/v3/version"
-	"google.golang.org/grpc/metadata"
 )
 
 // WithRequireLeader requires client requests to only succeed

client/v3/internal/resolver/resolver.go

@@ -15,10 +15,11 @@
 package resolver
 
 import (
-	"go.etcd.io/etcd/client/v3/internal/endpoint"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
 	"google.golang.org/grpc/serviceconfig"
+
+	"go.etcd.io/etcd/client/v3/internal/endpoint"
 )
 
 const (

client/v3/logger.go

@@ -18,10 +18,11 @@ import (
 	"log"
 	"os"
 
-	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zapgrpc"
 	"google.golang.org/grpc/grpclog"
+
+	"go.etcd.io/etcd/client/pkg/v3/logutil"
 )
 
 func init() {

client/v3/maintenance.go

@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"io"
 
-	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
+
+	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 type (

client/v3/retry_interceptor.go

@@ -24,12 +24,13 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+
+	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 )
 
 // unaryClientInterceptor returns a new retrying unary client interceptor.

client/v3/snapshot/v3_snapshot.go

@@ -23,9 +23,10 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.uber.org/zap"
 )
 
 // hasChecksum returns "true" if the file size "n"

client/v3/watch.go

@@ -21,14 +21,15 @@ import (
 	"sync"
 	"time"
 
-	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/api/v3/mvccpb"
-	v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+
+	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 )
 
 const (

etcdctl/ctlv3/command/alarm_command.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/auth_command.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/compaction_command.go

@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/defrag_command.go

@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )
 

etcdctl/ctlv3/command/del_command.go

@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/downgrade_command.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/get_command.go

@@ -19,6 +19,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/global.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/bgentry/speakeasy"
+
 	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.etcd.io/etcd/client/pkg/v3/srv"
 	"go.etcd.io/etcd/client/pkg/v3/transport"

etcdctl/ctlv3/command/make_mirror_command.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/bgentry/speakeasy"
+
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"

etcdctl/ctlv3/command/member_command.go

@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/move_leader_command.go

@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/put_command.go

@@ -20,6 +20,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/role_command.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdctl/ctlv3/command/snapshot_command.go

@@ -19,10 +19,11 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	snapshot "go.etcd.io/etcd/client/v3/snapshot"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
-	"go.uber.org/zap"
 )
 
 // NewSnapshotCommand returns the cobra command for "snapshot".

etcdctl/ctlv3/command/user_command.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/bgentry/speakeasy"
 	"github.com/spf13/cobra"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )

etcdutl/ctl.go

@@ -17,6 +17,7 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
 	"go.etcd.io/etcd/etcdutl/v3/etcdutl"
 )
 

etcdutl/etcdutl/backup_command.go

@@ -21,6 +21,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
 	"go.etcd.io/etcd/client/pkg/v3/types"
@@ -38,7 +40,6 @@ import (
 	"go.etcd.io/raft/v3/raftpb"
 
 	bolt "go.etcd.io/bbolt"
-	"go.uber.org/zap"
 )
 
 var (

etcdutl/etcdutl/common.go

@@ -15,10 +15,11 @@
 package etcdutl
 
 import (
-	"go.etcd.io/etcd/client/pkg/v3/logutil"
-	"go.etcd.io/etcd/pkg/v3/cobrautl"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	"go.etcd.io/etcd/client/pkg/v3/logutil"
+	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )
 
 func GetLogger() *zap.Logger {

etcdutl/etcdutl/defrag_command.go

@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/datadir"

etcdutl/etcdutl/printer.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	"go.etcd.io/etcd/etcdutl/v3/snapshot"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 

etcdutl/snapshot/v3_snapshot.go

@@ -26,6 +26,8 @@ import (
 	"reflect"
 	"strings"
 
+	"go.uber.org/zap"
+
 	bolt "go.etcd.io/bbolt"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
@@ -45,7 +47,6 @@ import (
 	"go.etcd.io/etcd/server/v3/verify"
 	"go.etcd.io/raft/v3"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap"
 )
 
 // Manager defines snapshot methods.

scripts/fix.sh

@@ -8,7 +8,7 @@ go mod tidy
 source ./scripts/test_lib.sh
 source ./scripts/updatebom.sh
 
-ROOTDIR=`pwd`
+ROOTDIR=$(pwd)
 
 # To fix according to newer version of go:
 # go get golang.org/dl/gotip
@@ -32,9 +32,9 @@ function bash_ws_fix {
 }
 
 function go_imports_fix {
-  GOFILES=$(run ${GO_CMD} list  --f '{{with $d:=.}}{{range .GoFiles}}{{$d.Dir}}/{{.}}{{"\n"}}{{end}}{{end}}' ./...)
-  cd ${ROOTDIR}/tools/mod
-  echo "$GOFILES" | grep -v '.gw.go' | grep -v '.pb.go' | xargs -n 100 go run golang.org/x/tools/cmd/goimports -w -local go.etcd.io
+  GOFILES=$(run ${GO_CMD} list  --f "{{with \$d:=.}}{{range .GoFiles}}{{\$d.Dir}}/{{.}}{{\"\n\"}}{{end}}{{end}}" ./...)
+  cd "${ROOTDIR}/tools/mod"
+  echo "${GOFILES}" | grep -v '.gw.go' | grep -v '.pb.go' | xargs -n 100 go run golang.org/x/tools/cmd/goimports -w -local go.etcd.io
 }
 
 log_callout -e "\\nFixing etcd code for you...\n"
@@ -42,6 +42,7 @@ log_callout -e "\\nFixing etcd code for you...\n"
 run_for_modules mod_tidy_fix || exit 2
 run_for_modules run ${GO_CMD} fmt || exit 2
 run_for_module tests bom_fix || exit 2
+log_callout "Fixing goimports..."
 run_for_modules go_imports_fix || exit 2
 bash_ws_fix || exit 2
 

scripts/install-marker.sh

@@ -9,9 +9,9 @@ if [ -z "$1" ]; then
     ARCH=amd64
 fi
 
-MARKER_URL=https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-unknown-linux-gnu
-if [ ${ARCH} == "darwin" ]; then
-    MARKER_URL=https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-apple-darwin
+MARKER_URL="https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-unknown-linux-gnu"
+if [ "${ARCH}" == "darwin" ]; then
+    MARKER_URL="https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-apple-darwin"
 fi
 
 echo "Installing marker"

server/auth/range_perm_cache.go

@@ -15,9 +15,10 @@
 package auth
 
 import (
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/authpb"
 	"go.etcd.io/etcd/pkg/v3/adt"
-	"go.uber.org/zap"
 )
 
 func getMergedPerms(tx AuthReadTx, userName string) *unifiedRangePermissions {

server/config/config.go

@@ -22,15 +22,16 @@ import (
 	"strings"
 	"time"
 
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	"go.etcd.io/etcd/client/pkg/v3/types"
 	"go.etcd.io/etcd/pkg/v3/netutil"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v3discovery"
 	"go.etcd.io/etcd/server/v3/storage/datadir"
-	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 
 	bolt "go.etcd.io/bbolt"
-	"go.uber.org/zap"
 )
 
 // ServerConfig holds the configuration of etcd as taken from the command line or discovery.

server/embed/config.go

@@ -41,12 +41,13 @@ import (
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v3compactor"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v3discovery"
 
-	bolt "go.etcd.io/bbolt"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/grpc"
 	"sigs.k8s.io/yaml"
+
+	bolt "go.etcd.io/bbolt"
 )
 
 const (

server/embed/config_logging.go

@@ -23,13 +23,14 @@ import (
 	"net/url"
 	"os"
 
-	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zapgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/grpclog"
 	"gopkg.in/natefinch/lumberjack.v2"
+
+	"go.etcd.io/etcd/client/pkg/v3/logutil"
 )
 
 // GetLogger returns the logger.

server/etcdmain/etcd.go

@@ -21,6 +21,9 @@ import (
 	"strings"
 	"time"
 
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
 	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.etcd.io/etcd/client/pkg/v3/types"
@@ -28,8 +31,6 @@ import (
 	"go.etcd.io/etcd/server/v3/embed"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v2discovery"
 	"go.etcd.io/etcd/server/v3/etcdserver/errors"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
 )
 
 type dirType string

server/etcdmain/help.go

@@ -19,9 +19,10 @@ import (
 	"fmt"
 	"strconv"
 
+	"golang.org/x/crypto/bcrypt"
+
 	cconfig "go.etcd.io/etcd/server/v3/config"
 	"go.etcd.io/etcd/server/v3/embed"
-	"golang.org/x/crypto/bcrypt"
 )
 
 var (

server/etcdserver/api/capability.go

@@ -17,9 +17,10 @@ package api
 import (
 	"sync"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/version"
 	serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"
-	"go.uber.org/zap"
 
 	"github.com/coreos/go-semver/semver"
 )

server/etcdserver/api/etcdhttp/health.go

@@ -21,13 +21,14 @@ import (
 	"net/http"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/types"
 	"go.etcd.io/etcd/server/v3/auth"
 	"go.etcd.io/etcd/server/v3/config"
 	"go.etcd.io/raft/v3"
-	"go.uber.org/zap"
 )
 
 const (

server/etcdserver/api/etcdhttp/utils.go

@@ -17,10 +17,11 @@ package etcdhttp
 import (
 	"net/http"
 
+	"go.uber.org/zap"
+
 	httptypes "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
 	"go.etcd.io/etcd/server/v3/etcdserver/errors"
-	"go.uber.org/zap"
 )
 
 func allowMethod(w http.ResponseWriter, r *http.Request, m string) bool {

server/etcdserver/api/v3rpc/interceptor.go

@@ -26,11 +26,12 @@ import (
 	"go.etcd.io/etcd/server/v3/etcdserver/api"
 	"go.etcd.io/raft/v3"
 
-	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+
+	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 const (

server/etcdserver/api/v3rpc/maintenance.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/api/v3/version"

server/etcdserver/apply/apply.go

@@ -17,6 +17,8 @@ package apply
 import (
 	"context"
 
+	"go.uber.org/zap"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/membershippb"
 	"go.etcd.io/etcd/client/pkg/v3/types"
@@ -33,7 +35,6 @@ import (
 	serverstorage "go.etcd.io/etcd/server/v3/storage"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/mvcc"
-	"go.uber.org/zap"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/gogo/protobuf/proto"

server/etcdserver/apply/uber_applier.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"time"
 
+	"go.uber.org/zap"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/server/v3/auth"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
@@ -27,7 +29,6 @@ import (
 	"go.etcd.io/etcd/server/v3/lease"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/mvcc"
-	"go.uber.org/zap"
 )
 
 type UberApplier interface {

server/etcdserver/apply_v2.go

@@ -22,6 +22,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/coreos/go-semver/semver"
+
 	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/etcd/server/v3/etcdserver/api"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/membership"

server/etcdserver/bootstrap.go

@@ -25,9 +25,10 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/dustin/go-humanize"
-	"go.etcd.io/etcd/server/v3/etcdserver/errors"
 	"go.uber.org/zap"
 
+	"go.etcd.io/etcd/server/v3/etcdserver/errors"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
 	"go.etcd.io/etcd/client/pkg/v3/types"

server/etcdserver/raft.go

@@ -21,13 +21,14 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.etcd.io/etcd/pkg/v3/contention"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
 	serverstorage "go.etcd.io/etcd/server/v3/storage"
 	"go.etcd.io/raft/v3"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap"
 )
 
 const (

server/etcdserver/server.go

@@ -32,12 +32,13 @@ import (
 	"github.com/coreos/go-semver/semver"
 	humanize "github.com/dustin/go-humanize"
 	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/pkg/v3/notify"
 	"go.etcd.io/etcd/pkg/v3/runtime"
 	"go.etcd.io/etcd/server/v3/config"
 	"go.etcd.io/etcd/server/v3/etcdserver/apply"
 	"go.etcd.io/etcd/server/v3/etcdserver/errors"
-	"go.uber.org/zap"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/membershippb"

server/etcdserver/txn/txn.go

@@ -20,6 +20,8 @@ import (
 	"fmt"
 	"sort"
 
+	"go.uber.org/zap"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/pkg/v3/traceutil"
@@ -27,7 +29,6 @@ import (
 	"go.etcd.io/etcd/server/v3/etcdserver/errors"
 	"go.etcd.io/etcd/server/v3/lease"
 	"go.etcd.io/etcd/server/v3/storage/mvcc"
-	"go.uber.org/zap"
 )
 
 func Put(ctx context.Context, lg *zap.Logger, lessor lease.Lessor, kv mvcc.KV, txnWrite mvcc.TxnWrite, p *pb.PutRequest) (resp *pb.PutResponse, trace *traceutil.Trace, err error) {

server/etcdserver/txn/util.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 
 	"go.uber.org/zap"

server/etcdserver/version/downgrade.go

@@ -16,8 +16,9 @@ package version
 
 import (
 	"github.com/coreos/go-semver/semver"
-	"go.etcd.io/etcd/api/v3/version"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/api/v3/version"
 )
 
 type DowngradeInfo struct {

server/etcdserver/version/monitor.go

@@ -19,8 +19,9 @@ import (
 	"errors"
 
 	"github.com/coreos/go-semver/semver"
-	"go.etcd.io/etcd/api/v3/version"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/api/v3/version"
 )
 
 // Monitor contains logic used by cluster leader to monitor version changes and decide on cluster version or downgrade progress.

server/lease/lessor.go

@@ -24,12 +24,13 @@ import (
 	"time"
 
 	"github.com/coreos/go-semver/semver"
+	"go.uber.org/zap"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/version"
 	"go.etcd.io/etcd/server/v3/lease/leasepb"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/schema"
-	"go.uber.org/zap"
 )
 
 // NoLease is a special LeaseID representing the absence of a lease.

server/mock/mockstorage/storage_recorder.go

@@ -16,6 +16,7 @@ package mockstorage
 
 import (
 	"github.com/coreos/go-semver/semver"
+
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
 	"go.etcd.io/raft/v3"
 	"go.etcd.io/raft/v3/raftpb"

server/proxy/grpcproxy/adapter/watch_client_adapter.go

@@ -18,8 +18,9 @@ import (
 	"context"
 	"errors"
 
-	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"google.golang.org/grpc"
+
+	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 var errAlreadySentHeader = errors.New("adapter: already sent header")

server/proxy/grpcproxy/cache/store.go

@@ -21,6 +21,7 @@ import (
 	"sync"
 
 	"github.com/golang/groupcache/lru"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/pkg/v3/adt"

server/proxy/grpcproxy/cluster.go

@@ -21,10 +21,11 @@ import (
 	"os"
 	"sync"
 
+	"golang.org/x/time/rate"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/naming/endpoints"
-	"golang.org/x/time/rate"
 
 	"go.uber.org/zap"
 )

server/proxy/grpcproxy/health.go

@@ -20,10 +20,11 @@ import (
 	"net/http"
 	"time"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp"
-	"go.uber.org/zap"
 )
 
 // HandleHealth registers health handler on '/health'.

server/proxy/grpcproxy/metrics.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	"go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp"
 )
 

server/proxy/grpcproxy/watch.go

@@ -18,14 +18,15 @@ import (
 	"context"
 	"sync"
 
-	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+
+	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc"
 )
 
 type watchProxy struct {

server/storage/backend/backend.go

@@ -25,8 +25,9 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
+
+	bolt "go.etcd.io/bbolt"
 )
 
 var (

server/storage/backend/batch_tx.go

@@ -21,8 +21,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
+
+	bolt "go.etcd.io/bbolt"
 )
 
 type BucketID int

server/storage/backend/testing/betesting.go

@@ -21,8 +21,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.uber.org/zap/zaptest"
+
+	"go.etcd.io/etcd/server/v3/storage/backend"
 )
 
 func NewTmpBackendFromCfg(t testing.TB, bcfg backend.BackendConfig) (backend.Backend, string) {

server/storage/backend/verify.go

@@ -18,8 +18,9 @@ import (
 	"runtime/debug"
 	"strings"
 
-	"go.etcd.io/etcd/client/pkg/v3/verify"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/client/pkg/v3/verify"
 )
 
 const (

server/storage/mvcc/hash.go

@@ -20,9 +20,10 @@ import (
 	"sort"
 	"sync"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/schema"
-	"go.uber.org/zap"
 )
 
 const (

server/storage/mvcc/kvstore_compaction.go

@@ -19,8 +19,9 @@ import (
 	"fmt"
 	"time"
 
-	"go.etcd.io/etcd/server/v3/storage/schema"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/server/v3/storage/schema"
 )
 
 func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (KeyValueHash, error) {

server/storage/mvcc/kvstore_txn.go

@@ -18,12 +18,13 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.etcd.io/etcd/pkg/v3/traceutil"
 	"go.etcd.io/etcd/server/v3/lease"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/schema"
-	"go.uber.org/zap"
 )
 
 type storeTxnRead struct {

server/storage/mvcc/testutil/hash.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.etcd.io/bbolt"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 )

server/storage/schema/actions.go

@@ -15,8 +15,9 @@
 package schema
 
 import (
-	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/server/v3/storage/backend"
 )
 
 type action interface {

server/storage/schema/alarm.go

@@ -15,9 +15,10 @@
 package schema
 
 import (
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/server/v3/storage/backend"
-	"go.uber.org/zap"
 )
 
 type alarmBackend struct {

server/storage/schema/auth_roles.go

@@ -15,9 +15,10 @@
 package schema
 
 import (
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/authpb"
 	"go.etcd.io/etcd/server/v3/storage/backend"
-	"go.uber.org/zap"
 )
 
 func UnsafeCreateAuthRolesBucket(tx backend.BatchTx) {

server/storage/schema/auth_users.go

@@ -15,8 +15,9 @@
 package schema
 
 import (
-	"go.etcd.io/etcd/api/v3/authpb"
 	"go.uber.org/zap"
+
+	"go.etcd.io/etcd/api/v3/authpb"
 )
 
 func (abe *authBackend) GetUser(username string) *authpb.User {

server/storage/schema/confstate.go

@@ -18,9 +18,10 @@ import (
 	"encoding/json"
 	"log"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap"
 )
 
 // MustUnsafeSaveConfStateToBackend persists confState using given transaction (tx).

server/storage/schema/migration.go

@@ -18,9 +18,10 @@ import (
 	"fmt"
 
 	"github.com/coreos/go-semver/semver"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/version"
 	"go.etcd.io/etcd/server/v3/storage/backend"
-	"go.uber.org/zap"
 )
 
 type migrationPlan []migrationStep

server/storage/schema/schema.go

@@ -18,9 +18,10 @@ import (
 	"fmt"
 
 	"github.com/coreos/go-semver/semver"
-	"go.etcd.io/etcd/api/v3/version"
 	"go.uber.org/zap"
 
+	"go.etcd.io/etcd/api/v3/version"
+
 	"go.etcd.io/etcd/server/v3/storage/backend"
 )
 

server/storage/schema/version.go

@@ -16,6 +16,7 @@ package schema
 
 import (
 	"github.com/coreos/go-semver/semver"
+
 	"go.etcd.io/bbolt"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 )

server/storage/storage.go

@@ -18,11 +18,12 @@ import (
 	"sync"
 
 	"github.com/coreos/go-semver/semver"
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/server/v3/etcdserver/api/snap"
 	"go.etcd.io/etcd/server/v3/storage/wal"
 	"go.etcd.io/etcd/server/v3/storage/wal/walpb"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap"
 )
 
 type Storage interface {

server/storage/wal/repair.go

@@ -20,9 +20,10 @@ import (
 	"path/filepath"
 	"time"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
 	"go.etcd.io/etcd/server/v3/storage/wal/walpb"
-	"go.uber.org/zap"
 )
 
 // Repair tries to repair ErrUnexpectedEOF in the

server/storage/wal/testing/waltesting.go

@@ -19,12 +19,13 @@ import (
 	"path/filepath"
 	"testing"
 
+	"go.uber.org/zap/zaptest"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/etcd/server/v3/storage/wal"
 	"go.etcd.io/etcd/server/v3/storage/wal/walpb"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap/zaptest"
 )
 
 func NewTmpWAL(t testing.TB, reqs []etcdserverpb.InternalRaftRequest) (*wal.WAL, string) {

server/storage/wal/version.go

@@ -20,10 +20,11 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/golang/protobuf/proto"
-	"go.etcd.io/etcd/api/v3/version"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/descriptorpb"
 
+	"go.etcd.io/etcd/api/v3/version"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/pkg/v3/pbutil"
 	"go.etcd.io/raft/v3/raftpb"

server/verify/verify.go

@@ -17,6 +17,8 @@ package verify
 import (
 	"fmt"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/client/pkg/v3/verify"
 	"go.etcd.io/etcd/server/v3/storage/backend"
 	"go.etcd.io/etcd/server/v3/storage/datadir"
@@ -24,7 +26,6 @@ import (
 	wal2 "go.etcd.io/etcd/server/v3/storage/wal"
 	"go.etcd.io/etcd/server/v3/storage/wal/walpb"
 	"go.etcd.io/raft/v3/raftpb"
-	"go.uber.org/zap"
 )
 
 const ENV_VERIFY_VALUE_STORAGE_WAL verify.VerificationType = "storage_wal"

tests/framework/integration/cluster.go

@@ -34,6 +34,9 @@ import (
 	"testing"
 	"time"
 
+	"go.uber.org/zap/zapcore"
+	"go.uber.org/zap/zaptest"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
 	"go.etcd.io/etcd/client/pkg/v3/tlsutil"
@@ -57,8 +60,6 @@ import (
 	framecfg "go.etcd.io/etcd/tests/v3/framework/config"
 	"go.etcd.io/etcd/tests/v3/framework/testutils"
 	"go.etcd.io/raft/v3"
-	"go.uber.org/zap/zapcore"
-	"go.uber.org/zap/zaptest"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"

tests/framework/integration/testing.go

@@ -19,13 +19,14 @@ import (
 	"testing"
 
 	grpc_logsettable "github.com/grpc-ecosystem/go-grpc-middleware/logging/settable"
+	"go.uber.org/zap/zapcore"
+	"go.uber.org/zap/zapgrpc"
+	"go.uber.org/zap/zaptest"
+
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
 	"go.etcd.io/etcd/client/pkg/v3/verify"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"
-	"go.uber.org/zap/zapcore"
-	"go.uber.org/zap/zapgrpc"
-	"go.uber.org/zap/zaptest"
 )
 
 var grpc_logger grpc_logsettable.SettableLoggerV2

tests/functional/cmd/etcd-agent/main.go

@@ -18,9 +18,10 @@ package main
 import (
 	"flag"
 
-	"go.etcd.io/etcd/tests/v3/functional/agent"
 	"go.uber.org/zap/zapcore"
 
+	"go.etcd.io/etcd/tests/v3/functional/agent"
+
 	"go.uber.org/zap"
 )
 

tests/integration/clientv3/util.go

@@ -21,10 +21,11 @@ import (
 	"testing"
 	"time"
 
-	clientv3 "go.etcd.io/etcd/client/v3"
-	integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+
+	clientv3 "go.etcd.io/etcd/client/v3"
+	integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
 )
 
 // MustWaitPinReady waits up to 3-second until connection is up (pin endpoint).

tests/linearizability/client.go

@@ -18,9 +18,10 @@ import (
 	"context"
 	"time"
 
+	"go.uber.org/zap"
+
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.uber.org/zap"
 )
 
 type recordingClient struct {

tests/linearizability/history.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/anishathalye/porcupine"
+
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 

tests/linearizability/traffic.go

@@ -20,8 +20,9 @@ import (
 	"math/rand"
 	"time"
 
-	"go.etcd.io/etcd/api/v3/mvccpb"
 	"golang.org/x/time/rate"
+
+	"go.etcd.io/etcd/api/v3/mvccpb"
 )
 
 var (