server: Update imports.

find -name '*.go' | xargs sed -i --follow-symlinks 's|etcd/v3/|etcd/server/v3/|g'
This commit is contained in:
Piotr Tabor
2020-10-20 23:09:35 +02:00
parent 6c1efd6ba5
commit aaf423e962
186 changed files with 393 additions and 494 deletions

View File

@@ -18,8 +18,8 @@ import (
"fmt"
"net/http"
"go.etcd.io/etcd/v3/etcdserver/api"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
)
func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc {

View File

@@ -29,15 +29,15 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/pkg/v3/types"
"go.etcd.io/etcd/v3/etcdserver"
"go.etcd.io/etcd/v3/etcdserver/api"
"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
"go.etcd.io/etcd/v3/etcdserver/api/membership"
"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats"
"go.etcd.io/etcd/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"github.com/jonboulle/clockwork"
"go.uber.org/zap"

View File

@@ -20,9 +20,9 @@ import (
"path"
"strings"
"go.etcd.io/etcd/v3/etcdserver/api"
"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
"go.uber.org/zap"
)

View File

@@ -30,8 +30,8 @@ import (
"strings"
"testing"
"go.etcd.io/etcd/v3/etcdserver/api"
"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2auth"
"go.uber.org/zap"
)

View File

@@ -33,12 +33,12 @@ import (
"go.etcd.io/etcd/pkg/v3/testutil"
"go.etcd.io/etcd/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/v3/etcdserver"
"go.etcd.io/etcd/v3/etcdserver/api"
"go.etcd.io/etcd/v3/etcdserver/api/membership"
"go.etcd.io/etcd/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"github.com/coreos/go-semver/semver"
"github.com/jonboulle/clockwork"

View File

@@ -20,9 +20,9 @@ import (
"strings"
"time"
"go.etcd.io/etcd/v3/etcdserver/api/etcdhttp"
"go.etcd.io/etcd/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2auth"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
"go.uber.org/zap"
)

View File

@@ -25,9 +25,9 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/v3/etcdserver"
"go.etcd.io/etcd/v3/etcdserver/api/membership"
"go.etcd.io/etcd/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"github.com/coreos/go-semver/semver"
"go.uber.org/zap"

View File

@@ -21,8 +21,8 @@ import (
"net/http"
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"
"github.com/prometheus/client_golang/prometheus"
)