*: update import paths to "go.etcd.io/etcd"
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>release-3.4
parent
2ac04381a2
commit
d37f1521b7
|
@ -29,7 +29,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
@ -29,8 +29,8 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"go.etcd.io/etcd/pkg/testutil"
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
)
|
)
|
||||||
|
|
||||||
type actionAssertingHTTPClient struct {
|
type actionAssertingHTTPClient struct {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/coreos/etcd/pkg/srv"
|
"go.etcd.io/etcd/pkg/srv"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Discoverer is an interface that wraps the Discover method.
|
// Discoverer is an interface that wraps the Discover method.
|
||||||
|
|
|
@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
|
||||||
"net/http"
|
"net/http"
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
cfg := client.Config{
|
cfg := client.Config{
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ExampleKeysAPI_directory() {
|
func ExampleKeysAPI_directory() {
|
||||||
|
|
|
@ -24,9 +24,9 @@ import (
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/coreos/etcd/integration"
|
"go.etcd.io/etcd/integration"
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"go.etcd.io/etcd/pkg/testutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.
|
// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.
|
||||||
|
|
|
@ -8,7 +8,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"go.etcd.io/etcd/pkg/testutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMain(m *testing.M) {
|
func TestMain(m *testing.M) {
|
||||||
|
|
|
@ -27,7 +27,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/pathutil"
|
"go.etcd.io/etcd/pkg/pathutil"
|
||||||
"github.com/ugorji/go/codec"
|
"github.com/ugorji/go/codec"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -23,9 +23,9 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/integration"
|
"go.etcd.io/etcd/integration"
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"go.etcd.io/etcd/pkg/testutil"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
)
|
)
|
||||||
|
|
||||||
var exampleEndpoints []string
|
var exampleEndpoints []string
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMembersAPIActionList(t *testing.T) {
|
func TestMembersAPIActionList(t *testing.T) {
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Handler for a http based key-value store backed by raft
|
// Handler for a http based key-value store backed by raft
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver/api/snap"
|
"go.etcd.io/etcd/etcdserver/api/snap"
|
||||||
)
|
)
|
||||||
|
|
||||||
// a key-value store backed by raft
|
// a key-value store backed by raft
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"flag"
|
"flag"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
@ -24,15 +24,15 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver/api/rafthttp"
|
"go.etcd.io/etcd/etcdserver/api/rafthttp"
|
||||||
"github.com/coreos/etcd/etcdserver/api/snap"
|
"go.etcd.io/etcd/etcdserver/api/snap"
|
||||||
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
|
stats "go.etcd.io/etcd/etcdserver/api/v2stats"
|
||||||
"github.com/coreos/etcd/pkg/fileutil"
|
"go.etcd.io/etcd/pkg/fileutil"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/raft"
|
"go.etcd.io/etcd/raft"
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
"github.com/coreos/etcd/wal"
|
"go.etcd.io/etcd/wal"
|
||||||
"github.com/coreos/etcd/wal/walpb"
|
"go.etcd.io/etcd/wal/walpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type cluster struct {
|
type cluster struct {
|
||||||
|
|
|
@ -17,8 +17,8 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Barrier creates a key in etcd to block processes, then deletes the key to
|
// Barrier creates a key in etcd to block processes, then deletes the key to
|
||||||
|
|
|
@ -18,8 +18,8 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
spb "github.com/coreos/etcd/mvcc/mvccpb"
|
spb "go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
@ -17,9 +17,9 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/concurrency"
|
"go.etcd.io/etcd/clientv3/concurrency"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DoubleBarrier blocks processes on Enter until an expected count enters, then
|
// DoubleBarrier blocks processes on Enter until an expected count enters, then
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/concurrency"
|
"go.etcd.io/etcd/clientv3/concurrency"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RemoteKV is a key/revision pair created by the client and stored on etcd
|
// RemoteKV is a key/revision pair created by the client and stored on etcd
|
||||||
|
|
|
@ -18,8 +18,8 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// PriorityQueue implements a multi-reader, multi-writer distributed queue.
|
// PriorityQueue implements a multi-reader, multi-writer distributed queue.
|
||||||
|
|
|
@ -17,8 +17,8 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Queue implements a multi-reader, multi-writer distributed queue.
|
// Queue implements a multi-reader, multi-writer distributed queue.
|
||||||
|
|
|
@ -17,9 +17,9 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/concurrency"
|
"go.etcd.io/etcd/clientv3/concurrency"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RWMutex struct {
|
type RWMutex struct {
|
||||||
|
|
|
@ -17,8 +17,8 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
// WaitEvents waits on a key until it observes the given events and returns the final one.
|
// WaitEvents waits on a key until it observes the given events and returns the final one.
|
||||||
|
|
|
@ -27,14 +27,14 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"go.etcd.io/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3compactor"
|
"go.etcd.io/etcd/etcdserver/api/v3compactor"
|
||||||
"github.com/coreos/etcd/pkg/flags"
|
"go.etcd.io/etcd/pkg/flags"
|
||||||
"github.com/coreos/etcd/pkg/netutil"
|
"go.etcd.io/etcd/pkg/netutil"
|
||||||
"github.com/coreos/etcd/pkg/srv"
|
"go.etcd.io/etcd/pkg/srv"
|
||||||
"github.com/coreos/etcd/pkg/tlsutil"
|
"go.etcd.io/etcd/pkg/tlsutil"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -162,7 +162,7 @@ type Config struct {
|
||||||
//
|
//
|
||||||
// If single-node, it advances ticks regardless.
|
// If single-node, it advances ticks regardless.
|
||||||
//
|
//
|
||||||
// See https://github.com/coreos/etcd/issues/9333 for more detail.
|
// See https://go.etcd.io/etcd/issues/9333 for more detail.
|
||||||
InitialElectionTickAdvance bool `json:"initial-election-tick-advance"`
|
InitialElectionTickAdvance bool `json:"initial-election-tick-advance"`
|
||||||
|
|
||||||
QuotaBackendBytes int64 `json:"quota-backend-bytes"`
|
QuotaBackendBytes int64 `json:"quota-backend-bytes"`
|
||||||
|
@ -246,7 +246,7 @@ type Config struct {
|
||||||
// CVE-2018-5702 reference:
|
// CVE-2018-5702 reference:
|
||||||
// - https://bugs.chromium.org/p/project-zero/issues/detail?id=1447#c2
|
// - https://bugs.chromium.org/p/project-zero/issues/detail?id=1447#c2
|
||||||
// - https://github.com/transmission/transmission/pull/468
|
// - https://github.com/transmission/transmission/pull/468
|
||||||
// - https://github.com/coreos/etcd/issues/9353
|
// - https://go.etcd.io/etcd/issues/9353
|
||||||
HostWhitelist map[string]struct{}
|
HostWhitelist map[string]struct{}
|
||||||
|
|
||||||
// UserHandlers is for registering users handlers and only used for
|
// UserHandlers is for registering users handlers and only used for
|
||||||
|
|
|
@ -24,7 +24,7 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/logutil"
|
"go.etcd.io/etcd/pkg/logutil"
|
||||||
|
|
||||||
"github.com/coreos/pkg/capnslog"
|
"github.com/coreos/pkg/capnslog"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -93,7 +93,7 @@ func (cfg *Config) setupLogging() error {
|
||||||
|
|
||||||
// TODO: deprecate with "capnslog"
|
// TODO: deprecate with "capnslog"
|
||||||
if cfg.LogPkgLevels != "" {
|
if cfg.LogPkgLevels != "" {
|
||||||
repoLog := capnslog.MustRepoLogger("github.com/coreos/etcd")
|
repoLog := capnslog.MustRepoLogger("go.etcd.io/etcd")
|
||||||
settings, err := repoLog.ParseLogLevelConfig(cfg.LogPkgLevels)
|
settings, err := repoLog.ParseLogLevelConfig(cfg.LogPkgLevels)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
plog.Warningf("couldn't parse log level string: %s, continuing with default levels", err.Error())
|
plog.Warningf("couldn't parse log level string: %s, continuing with default levels", err.Error())
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/logutil"
|
"go.etcd.io/etcd/pkg/logutil"
|
||||||
|
|
||||||
"go.uber.org/zap/zapcore"
|
"go.uber.org/zap/zapcore"
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults:
|
||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
@ -29,18 +29,18 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"go.etcd.io/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
|
"go.etcd.io/etcd/etcdserver/api/etcdhttp"
|
||||||
"github.com/coreos/etcd/etcdserver/api/rafthttp"
|
"go.etcd.io/etcd/etcdserver/api/rafthttp"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v2http"
|
"go.etcd.io/etcd/etcdserver/api/v2http"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v2v3"
|
"go.etcd.io/etcd/etcdserver/api/v2v3"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3client"
|
"go.etcd.io/etcd/etcdserver/api/v3client"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc"
|
"go.etcd.io/etcd/etcdserver/api/v3rpc"
|
||||||
"github.com/coreos/etcd/pkg/debugutil"
|
"go.etcd.io/etcd/pkg/debugutil"
|
||||||
runtimeutil "github.com/coreos/etcd/pkg/runtime"
|
runtimeutil "go.etcd.io/etcd/pkg/runtime"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/coreos/pkg/capnslog"
|
"github.com/coreos/pkg/capnslog"
|
||||||
"github.com/grpc-ecosystem/go-grpc-prometheus"
|
"github.com/grpc-ecosystem/go-grpc-prometheus"
|
||||||
|
@ -50,7 +50,7 @@ import (
|
||||||
"google.golang.org/grpc/keepalive"
|
"google.golang.org/grpc/keepalive"
|
||||||
)
|
)
|
||||||
|
|
||||||
var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed")
|
var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed")
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// internal fd usage includes disk usage and transport usage.
|
// internal fd usage includes disk usage and transport usage.
|
||||||
|
@ -412,7 +412,7 @@ func stopServers(ctx context.Context, ss *servers) {
|
||||||
|
|
||||||
// do not grpc.Server.GracefulStop with TLS enabled etcd server
|
// do not grpc.Server.GracefulStop with TLS enabled etcd server
|
||||||
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
|
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
|
||||||
// and https://github.com/coreos/etcd/issues/8916
|
// and https://go.etcd.io/etcd/issues/8916
|
||||||
if ss.secure {
|
if ss.secure {
|
||||||
shutdownNow()
|
shutdownNow()
|
||||||
return
|
return
|
||||||
|
|
|
@ -23,19 +23,19 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"go.etcd.io/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3client"
|
"go.etcd.io/etcd/etcdserver/api/v3client"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3election"
|
"go.etcd.io/etcd/etcdserver/api/v3election"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb"
|
"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
|
||||||
v3electiongw "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb/gw"
|
v3electiongw "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb/gw"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3lock"
|
"go.etcd.io/etcd/etcdserver/api/v3lock"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb"
|
"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
|
||||||
v3lockgw "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb/gw"
|
v3lockgw "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb/gw"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc"
|
"go.etcd.io/etcd/etcdserver/api/v3rpc"
|
||||||
etcdservergw "github.com/coreos/etcd/etcdserver/etcdserverpb/gw"
|
etcdservergw "go.etcd.io/etcd/etcdserver/etcdserverpb/gw"
|
||||||
"github.com/coreos/etcd/pkg/debugutil"
|
"go.etcd.io/etcd/pkg/debugutil"
|
||||||
"github.com/coreos/etcd/pkg/httputil"
|
"go.etcd.io/etcd/pkg/httputil"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
|
|
||||||
gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
|
gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
|
||||||
"github.com/soheilhy/cmux"
|
"github.com/soheilhy/cmux"
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/auth"
|
"go.etcd.io/etcd/auth"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.
|
// TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.
|
||||||
|
|
|
@ -17,7 +17,7 @@ package embed
|
||||||
import (
|
import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/coreos/etcd/wal"
|
"go.etcd.io/etcd/wal"
|
||||||
)
|
)
|
||||||
|
|
||||||
func isMemberInitialized(cfg *Config) bool {
|
func isMemberInitialized(cfg *Config) bool {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -23,15 +23,15 @@ import (
|
||||||
"regexp"
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver/api/membership"
|
"go.etcd.io/etcd/etcdserver/api/membership"
|
||||||
"github.com/coreos/etcd/etcdserver/api/snap"
|
"go.etcd.io/etcd/etcdserver/api/snap"
|
||||||
"github.com/coreos/etcd/etcdserver/etcdserverpb"
|
"go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/pkg/fileutil"
|
"go.etcd.io/etcd/pkg/fileutil"
|
||||||
"github.com/coreos/etcd/pkg/idutil"
|
"go.etcd.io/etcd/pkg/idutil"
|
||||||
"github.com/coreos/etcd/pkg/pbutil"
|
"go.etcd.io/etcd/pkg/pbutil"
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
"github.com/coreos/etcd/wal"
|
"go.etcd.io/etcd/wal"
|
||||||
"github.com/coreos/etcd/wal/walpb"
|
"go.etcd.io/etcd/wal/walpb"
|
||||||
|
|
||||||
bolt "github.com/coreos/bbolt"
|
bolt "github.com/coreos/bbolt"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
|
@ -24,7 +24,7 @@ import (
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
// printResponseKey only supports to print key correctly.
|
// printResponseKey only supports to print key correctly.
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -164,7 +164,7 @@ func actionMemberRemove(c *cli.Context) error {
|
||||||
if m.Name == removalID {
|
if m.Name == removalID {
|
||||||
// Note that, so long as it's not ambiguous, we *could* do the right thing by name here.
|
// Note that, so long as it's not ambiguous, we *could* do the right thing by name here.
|
||||||
fmt.Fprintf(os.Stderr, "Found a member named %s; if this is correct, please use its ID, eg:\n\tetcdctl member remove %s\n", m.Name, m.ID)
|
fmt.Fprintf(os.Stderr, "Found a member named %s; if this is correct, please use its ID, eg:\n\tetcdctl member remove %s\n", m.Name, m.ID)
|
||||||
fmt.Fprintf(os.Stderr, "For more details, read the documentation at https://github.com/coreos/etcd/blob/master/Documentation/runtime-configuration.md#remove-a-member\n\n")
|
fmt.Fprintf(os.Stderr, "For more details, read the documentation at https://go.etcd.io/etcd/blob/master/Documentation/runtime-configuration.md#remove-a-member\n\n")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !foundID {
|
if !foundID {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@ package command
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
"go.etcd.io/etcd/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewRemoveDirCommand returns the CLI command for "rmdir".
|
// NewRemoveDirCommand returns the CLI command for "rmdir".
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/coreos/etcd/pkg/pathutil"
|
"go.etcd.io/etcd/pkg/pathutil"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
package command
|
package command
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/bgentry/speakeasy"
|
"github.com/bgentry/speakeasy"
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,8 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
|
|
||||||
"github.com/bgentry/speakeasy"
|
"github.com/bgentry/speakeasy"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdctl/ctlv2/command"
|
"go.etcd.io/etcd/etcdctl/ctlv2/command"
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,8 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/pkg/report"
|
"go.etcd.io/etcd/pkg/report"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
|
|
|
@ -18,8 +18,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"go.etcd.io/etcd/clientv3"
|
||||||
)
|
)
|
||||||
|
|
||||||
var compactPhysical bool
|
var compactPhysical bool
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/mvcc/backend"
|
"go.etcd.io/etcd/mvcc/backend"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ import (
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/concurrency"
|
"go.etcd.io/etcd/clientv3/concurrency"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,9 +20,9 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
"github.com/coreos/etcd/pkg/flags"
|
"go.etcd.io/etcd/pkg/flags"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,10 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/bgentry/speakeasy"
|
"github.com/bgentry/speakeasy"
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/pkg/flags"
|
"go.etcd.io/etcd/pkg/flags"
|
||||||
"github.com/coreos/etcd/pkg/srv"
|
"go.etcd.io/etcd/pkg/srv"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
|
@ -133,7 +133,7 @@ func clientConfigFromCmd(cmd *cobra.Command) *clientConfig {
|
||||||
// WARNING logs contain important information like TLS misconfirugation, but spams
|
// WARNING logs contain important information like TLS misconfirugation, but spams
|
||||||
// too many routine connection disconnects to turn on by default.
|
// too many routine connection disconnects to turn on by default.
|
||||||
//
|
//
|
||||||
// See https://github.com/coreos/etcd/pull/9623 for background
|
// See https://go.etcd.io/etcd/pull/9623 for background
|
||||||
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr))
|
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,8 +23,8 @@ import (
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/concurrency"
|
"go.etcd.io/etcd/clientv3/concurrency"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,10 +22,10 @@ import (
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/mirror"
|
"go.etcd.io/etcd/clientv3/mirror"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,22 +24,22 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/client"
|
"go.etcd.io/etcd/client"
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"go.etcd.io/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api"
|
"go.etcd.io/etcd/etcdserver/api"
|
||||||
"github.com/coreos/etcd/etcdserver/api/membership"
|
"go.etcd.io/etcd/etcdserver/api/membership"
|
||||||
"github.com/coreos/etcd/etcdserver/api/snap"
|
"go.etcd.io/etcd/etcdserver/api/snap"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v2error"
|
"go.etcd.io/etcd/etcdserver/api/v2error"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v2store"
|
"go.etcd.io/etcd/etcdserver/api/v2store"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/mvcc"
|
"go.etcd.io/etcd/mvcc"
|
||||||
"github.com/coreos/etcd/mvcc/backend"
|
"go.etcd.io/etcd/mvcc/backend"
|
||||||
"github.com/coreos/etcd/mvcc/mvccpb"
|
"go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
"github.com/coreos/etcd/pkg/pbutil"
|
"go.etcd.io/etcd/pkg/pbutil"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"go.etcd.io/etcd/raft/raftpb"
|
||||||
"github.com/coreos/etcd/wal"
|
"go.etcd.io/etcd/wal"
|
||||||
"github.com/coreos/etcd/wal/walpb"
|
"go.etcd.io/etcd/wal/walpb"
|
||||||
|
|
||||||
"github.com/gogo/protobuf/proto"
|
"github.com/gogo/protobuf/proto"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
|
|
||||||
"github.com/dustin/go-humanize"
|
"github.com/dustin/go-humanize"
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,10 +17,10 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
spb "github.com/coreos/etcd/mvcc/mvccpb"
|
spb "go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fieldsPrinter struct{ printer }
|
type fieldsPrinter struct{ printer }
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
)
|
)
|
||||||
|
|
||||||
type jsonPrinter struct{ printer }
|
type jsonPrinter struct{ printer }
|
||||||
|
|
|
@ -18,9 +18,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
|
mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type pbPrinter struct{ printer }
|
type pbPrinter struct{ printer }
|
||||||
|
|
|
@ -19,10 +19,10 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
type simplePrinter struct {
|
type simplePrinter struct {
|
||||||
|
|
|
@ -17,8 +17,8 @@ package command
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
|
|
||||||
"github.com/olekukonko/tablewriter"
|
"github.com/olekukonko/tablewriter"
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3/snapshot"
|
"go.etcd.io/etcd/clientv3/snapshot"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -22,8 +22,8 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,8 +25,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
v3 "github.com/coreos/etcd/clientv3"
|
v3 "go.etcd.io/etcd/clientv3"
|
||||||
pb "github.com/coreos/etcd/mvcc/mvccpb"
|
pb "go.etcd.io/etcd/mvcc/mvccpb"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,7 +17,7 @@ package command
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,7 +18,7 @@ package ctlv3
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdctl/ctlv3/command"
|
"go.etcd.io/etcd/etcdctl/ctlv3/command"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdctl/ctlv3/command"
|
"go.etcd.io/etcd/etcdctl/ctlv3/command"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Start() {
|
func Start() {
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
package ctlv3
|
package ctlv3
|
||||||
|
|
||||||
import "github.com/coreos/etcd/etcdctl/ctlv3/command"
|
import "go.etcd.io/etcd/etcdctl/ctlv3/command"
|
||||||
|
|
||||||
func Start() {
|
func Start() {
|
||||||
rootCmd.SetUsageFunc(usageFunc)
|
rootCmd.SetUsageFunc(usageFunc)
|
||||||
|
|
|
@ -25,7 +25,7 @@ import (
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
"text/template"
|
"text/template"
|
||||||
|
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
|
|
|
@ -19,8 +19,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/etcdctl/ctlv2"
|
"go.etcd.io/etcd/etcdctl/ctlv2"
|
||||||
"github.com/coreos/etcd/etcdctl/ctlv3"
|
"go.etcd.io/etcd/etcdctl/ctlv3"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -27,10 +27,10 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"github.com/coreos/etcd/pkg/flags"
|
"go.etcd.io/etcd/pkg/flags"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -26,17 +26,17 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"go.etcd.io/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
|
"go.etcd.io/etcd/etcdserver/api/etcdhttp"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v2discovery"
|
"go.etcd.io/etcd/etcdserver/api/v2discovery"
|
||||||
"github.com/coreos/etcd/pkg/fileutil"
|
"go.etcd.io/etcd/pkg/fileutil"
|
||||||
pkgioutil "github.com/coreos/etcd/pkg/ioutil"
|
pkgioutil "go.etcd.io/etcd/pkg/ioutil"
|
||||||
"github.com/coreos/etcd/pkg/osutil"
|
"go.etcd.io/etcd/pkg/osutil"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"go.etcd.io/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/proxy/httpproxy"
|
"go.etcd.io/etcd/proxy/httpproxy"
|
||||||
"github.com/coreos/etcd/version"
|
"go.etcd.io/etcd/version"
|
||||||
|
|
||||||
"github.com/coreos/pkg/capnslog"
|
"github.com/coreos/pkg/capnslog"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -45,7 +45,7 @@ import (
|
||||||
|
|
||||||
type dirType string
|
type dirType string
|
||||||
|
|
||||||
var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdmain")
|
var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdmain")
|
||||||
|
|
||||||
var (
|
var (
|
||||||
dirMember = dirType("member")
|
dirMember = dirType("member")
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/proxy/tcpproxy"
|
"go.etcd.io/etcd/proxy/tcpproxy"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -27,18 +27,18 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/clientv3"
|
"go.etcd.io/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/clientv3/leasing"
|
"go.etcd.io/etcd/clientv3/leasing"
|
||||||
"github.com/coreos/etcd/clientv3/namespace"
|
"go.etcd.io/etcd/clientv3/namespace"
|
||||||
"github.com/coreos/etcd/clientv3/ordering"
|
"go.etcd.io/etcd/clientv3/ordering"
|
||||||
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
|
"go.etcd.io/etcd/etcdserver/api/etcdhttp"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb"
|
"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb"
|
"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/pkg/debugutil"
|
"go.etcd.io/etcd/pkg/debugutil"
|
||||||
"github.com/coreos/etcd/pkg/logutil"
|
"go.etcd.io/etcd/pkg/logutil"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
"github.com/coreos/etcd/proxy/grpcproxy"
|
"go.etcd.io/etcd/proxy/grpcproxy"
|
||||||
|
|
||||||
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
|
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
|
||||||
"github.com/soheilhy/cmux"
|
"github.com/soheilhy/cmux"
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/srv"
|
"go.etcd.io/etcd/pkg/srv"
|
||||||
"github.com/coreos/etcd/pkg/transport"
|
"go.etcd.io/etcd/pkg/transport"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,10 +25,10 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"github.com/coreos/etcd/functional/rpcpb"
|
"go.etcd.io/etcd/functional/rpcpb"
|
||||||
"github.com/coreos/etcd/pkg/fileutil"
|
"go.etcd.io/etcd/pkg/fileutil"
|
||||||
"github.com/coreos/etcd/pkg/proxy"
|
"go.etcd.io/etcd/pkg/proxy"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,9 +21,9 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/coreos/etcd/embed"
|
"go.etcd.io/etcd/embed"
|
||||||
"github.com/coreos/etcd/functional/rpcpb"
|
"go.etcd.io/etcd/functional/rpcpb"
|
||||||
"github.com/coreos/etcd/pkg/proxy"
|
"go.etcd.io/etcd/pkg/proxy"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/pkg/fileutil"
|
"go.etcd.io/etcd/pkg/fileutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: support separate WAL directory
|
// TODO: support separate WAL directory
|
||||||
|
|
|
@ -18,7 +18,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
|
|
||||||
"github.com/coreos/etcd/functional/agent"
|
"go.etcd.io/etcd/functional/agent"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue