Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/raftexample/raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import (
"strconv"
"time"

"go.uber.org/zap"

"go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
Expand All @@ -34,8 +36,6 @@ import (
"go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.etcd.io/raft/v3"
"go.etcd.io/raft/v3/raftpb"

"go.uber.org/zap"
)

type commit struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/osutil/interrupt_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"syscall"

"go.etcd.io/etcd/client/pkg/v3/verify"

"go.uber.org/zap"

"go.etcd.io/etcd/client/pkg/v3/verify"
)

// InterruptHandler is a function that is called on receiving a
Expand Down
4 changes: 2 additions & 2 deletions server/etcdserver/api/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
package api

import (
"github.com/coreos/go-semver/semver"

"go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership"

"github.com/coreos/go-semver/semver"
)

// Cluster is an interface representing a collection of members in one etcd cluster.
Expand Down
3 changes: 1 addition & 2 deletions server/etcdserver/api/etcdhttp/health_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@ import (
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap/zaptest"

"go.etcd.io/raft/v3"

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/config"
betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/storage/schema"
"go.etcd.io/raft/v3"
)

type fakeHealthServer struct {
Expand Down
6 changes: 3 additions & 3 deletions server/etcdserver/cluster_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ package etcdserver
import (
"testing"

"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types"

"github.com/coreos/go-semver/semver"
"go.uber.org/zap/zaptest"

"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types"
)

func TestIsCompatibleWithVers(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/reproduce_19406_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"testing"
"time"

"github.com/stretchr/testify/require"

clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/stringutil"
"go.etcd.io/etcd/tests/v3/framework/e2e"

"github.com/stretchr/testify/require"
)

// TestReproduce19406 reproduces the issue: https://github.com/etcd-io/etcd/issues/19406
Expand Down
4 changes: 2 additions & 2 deletions tests/robustness/model/describe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"errors"
"testing"

"go.etcd.io/etcd/api/v3/mvccpb"

"github.com/stretchr/testify/assert"

"go.etcd.io/etcd/api/v3/mvccpb"
)

func TestModelDescribe(t *testing.T) {
Expand Down
9 changes: 9 additions & 0 deletions tools/.golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
---
run:
timeout: 30m
formatters:
enable:
- gci
settings: # please keep this alphabetized
gci:
sections:
- standard
- default
- prefix(go.etcd.io)
issues:
max-same-issues: 0
# Excluding configuration per-path, per-linter, per-text and per-source
Expand Down
4 changes: 2 additions & 2 deletions tools/benchmark/cmd/mvcc-put.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"runtime/pprof"
"time"

"github.com/spf13/cobra"

"go.etcd.io/etcd/pkg/v3/report"
"go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease"

"github.com/spf13/cobra"
)

// mvccPutCmd represents a storage put performance benchmarking tool
Expand Down
3 changes: 1 addition & 2 deletions tools/benchmark/cmd/mvcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ import (
"os"
"time"

"github.com/spf13/cobra"
"go.uber.org/zap"

"go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/storage/mvcc"

"github.com/spf13/cobra"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions tools/etcd-dump-metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"strings"
"time"

"go.etcd.io/etcd/client/pkg/v3/transport"

"go.uber.org/zap"

"go.etcd.io/etcd/client/pkg/v3/transport"
)

func fetchMetrics(ep string) (lines []string, err error) {
Expand Down
7 changes: 4 additions & 3 deletions tools/mod/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ import (
_ "github.com/google/yamlfmt/cmd/yamlfmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"
_ "go.etcd.io/gofail"
_ "go.etcd.io/protodoc"
_ "go.etcd.io/raft/v3"
_ "gotest.tools/gotestsum"
_ "gotest.tools/v3"
_ "honnef.co/go/tools/cmd/staticcheck"

_ "go.etcd.io/gofail"
_ "go.etcd.io/protodoc"
_ "go.etcd.io/raft/v3"
)