Browse Source

*: update import paths to "go.etcd.io/etcd"

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Gyuho Lee 7 years ago
parent
commit
d37f1521b7
100 changed files with 241 additions and 241 deletions
  1. 1 1
      client/client.go
  2. 2 2
      client/client_test.go
  3. 1 1
      client/discover.go
  4. 1 1
      client/doc.go
  5. 1 1
      client/example_keys_test.go
  6. 3 3
      client/integration/client_test.go
  7. 1 1
      client/integration/main_test.go
  8. 1 1
      client/keys.go
  9. 3 3
      client/main_test.go
  10. 1 1
      client/members.go
  11. 1 1
      client/members_test.go
  12. 1 1
      contrib/raftexample/httpapi.go
  13. 1 1
      contrib/raftexample/kvstore.go
  14. 1 1
      contrib/raftexample/main.go
  15. 9 9
      contrib/raftexample/raft.go
  16. 1 1
      contrib/raftexample/raftexample_test.go
  17. 2 2
      contrib/recipes/barrier.go
  18. 2 2
      contrib/recipes/client.go
  19. 3 3
      contrib/recipes/double_barrier.go
  20. 2 2
      contrib/recipes/key.go
  21. 2 2
      contrib/recipes/priority_queue.go
  22. 2 2
      contrib/recipes/queue.go
  23. 3 3
      contrib/recipes/rwmutex.go
  24. 2 2
      contrib/recipes/watch.go
  25. 10 10
      embed/config.go
  26. 2 2
      embed/config_logging.go
  27. 1 1
      embed/config_logging_journal_unix.go
  28. 1 1
      embed/config_test.go
  29. 1 1
      embed/doc.go
  30. 14 14
      embed/etcd.go
  31. 13 13
      embed/serve.go
  32. 1 1
      embed/serve_test.go
  33. 1 1
      embed/util.go
  34. 1 1
      etcdctl/ctlv2/command/auth_commands.go
  35. 9 9
      etcdctl/ctlv2/command/backup_command.go
  36. 1 1
      etcdctl/ctlv2/command/cluster_health.go
  37. 1 1
      etcdctl/ctlv2/command/error.go
  38. 1 1
      etcdctl/ctlv2/command/exec_watch_command.go
  39. 1 1
      etcdctl/ctlv2/command/format.go
  40. 1 1
      etcdctl/ctlv2/command/get_command.go
  41. 1 1
      etcdctl/ctlv2/command/ls_command.go
  42. 1 1
      etcdctl/ctlv2/command/member_commands.go
  43. 1 1
      etcdctl/ctlv2/command/mk_command.go
  44. 1 1
      etcdctl/ctlv2/command/mkdir_command.go
  45. 1 1
      etcdctl/ctlv2/command/rm_command.go
  46. 1 1
      etcdctl/ctlv2/command/rmdir_command.go
  47. 2 2
      etcdctl/ctlv2/command/role_commands.go
  48. 1 1
      etcdctl/ctlv2/command/set_command.go
  49. 1 1
      etcdctl/ctlv2/command/set_dir_command.go
  50. 1 1
      etcdctl/ctlv2/command/update_command.go
  51. 1 1
      etcdctl/ctlv2/command/update_dir_command.go
  52. 1 1
      etcdctl/ctlv2/command/user_commands.go
  53. 2 2
      etcdctl/ctlv2/command/util.go
  54. 1 1
      etcdctl/ctlv2/command/watch_command.go
  55. 2 2
      etcdctl/ctlv2/ctl.go
  56. 1 1
      etcdctl/ctlv3/command/alarm_command.go
  57. 1 1
      etcdctl/ctlv3/command/auth_command.go
  58. 2 2
      etcdctl/ctlv3/command/check.go
  59. 1 1
      etcdctl/ctlv3/command/compaction_command.go
  60. 1 1
      etcdctl/ctlv3/command/defrag_command.go
  61. 1 1
      etcdctl/ctlv3/command/del_command.go
  62. 2 2
      etcdctl/ctlv3/command/elect_command.go
  63. 3 3
      etcdctl/ctlv3/command/ep_command.go
  64. 1 1
      etcdctl/ctlv3/command/error.go
  65. 1 1
      etcdctl/ctlv3/command/get_command.go
  66. 5 5
      etcdctl/ctlv3/command/global.go
  67. 1 1
      etcdctl/ctlv3/command/lease_command.go
  68. 2 2
      etcdctl/ctlv3/command/lock_command.go
  69. 4 4
      etcdctl/ctlv3/command/make_mirror_command.go
  70. 16 16
      etcdctl/ctlv3/command/migrate_command.go
  71. 1 1
      etcdctl/ctlv3/command/move_leader_command.go
  72. 3 3
      etcdctl/ctlv3/command/printer.go
  73. 4 4
      etcdctl/ctlv3/command/printer_fields.go
  74. 1 1
      etcdctl/ctlv3/command/printer_json.go
  75. 3 3
      etcdctl/ctlv3/command/printer_protobuf.go
  76. 4 4
      etcdctl/ctlv3/command/printer_simple.go
  77. 2 2
      etcdctl/ctlv3/command/printer_table.go
  78. 1 1
      etcdctl/ctlv3/command/put_command.go
  79. 1 1
      etcdctl/ctlv3/command/role_command.go
  80. 1 1
      etcdctl/ctlv3/command/snapshot_command.go
  81. 2 2
      etcdctl/ctlv3/command/txn_command.go
  82. 2 2
      etcdctl/ctlv3/command/util.go
  83. 1 1
      etcdctl/ctlv3/command/version_command.go
  84. 1 1
      etcdctl/ctlv3/command/watch_command.go
  85. 1 1
      etcdctl/ctlv3/ctl.go
  86. 1 1
      etcdctl/ctlv3/ctl_cov.go
  87. 1 1
      etcdctl/ctlv3/ctl_nocov.go
  88. 1 1
      etcdctl/ctlv3/help.go
  89. 2 2
      etcdctl/main.go
  90. 4 4
      etcdmain/config.go
  91. 1 1
      etcdmain/config_test.go
  92. 12 12
      etcdmain/etcd.go
  93. 1 1
      etcdmain/gateway.go
  94. 12 12
      etcdmain/grpc_proxy.go
  95. 1 1
      etcdmain/help.go
  96. 2 2
      etcdmain/util.go
  97. 4 4
      functional/agent/handler.go
  98. 3 3
      functional/agent/server.go
  99. 1 1
      functional/agent/utils.go
  100. 1 1
      functional/cmd/etcd-agent/main.go

+ 1 - 1
client/client.go

@@ -29,7 +29,7 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/version"
 )
 )
 
 
 var (
 var (

+ 2 - 2
client/client_test.go

@@ -29,8 +29,8 @@ import (
 	"testing"
 	"testing"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/pkg/testutil"
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/version"
 )
 )
 
 
 type actionAssertingHTTPClient struct {
 type actionAssertingHTTPClient struct {

+ 1 - 1
client/discover.go

@@ -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.

+ 1 - 1
client/doc.go

@@ -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{

+ 1 - 1
client/example_keys_test.go

@@ -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() {

+ 3 - 3
client/integration/client_test.go

@@ -24,9 +24,9 @@ import (
 	"sync/atomic"
 	"sync/atomic"
 	"testing"
 	"testing"
 
 
-	"github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/integration"
-	"github.com/coreos/etcd/pkg/testutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/integration"
+	"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.

+ 1 - 1
client/integration/main_test.go

@@ -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) {

+ 1 - 1
client/keys.go

@@ -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"
 )
 )
 
 

+ 3 - 3
client/main_test.go

@@ -23,9 +23,9 @@ import (
 	"testing"
 	"testing"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/integration"
-	"github.com/coreos/etcd/pkg/testutil"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+	"go.etcd.io/etcd/pkg/transport"
 )
 )
 
 
 var exampleEndpoints []string
 var exampleEndpoints []string

+ 1 - 1
client/members.go

@@ -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 (

+ 1 - 1
client/members_test.go

@@ -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) {

+ 1 - 1
contrib/raftexample/httpapi.go

@@ -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

+ 1 - 1
contrib/raftexample/kvstore.go

@@ -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

+ 1 - 1
contrib/raftexample/main.go

@@ -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() {

+ 9 - 9
contrib/raftexample/raft.go

@@ -24,15 +24,15 @@ import (
 	"strconv"
 	"strconv"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/etcdserver/api/rafthttp"
-	"github.com/coreos/etcd/etcdserver/api/snap"
-	stats "github.com/coreos/etcd/etcdserver/api/v2stats"
-	"github.com/coreos/etcd/pkg/fileutil"
-	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/raft"
-	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/wal"
-	"github.com/coreos/etcd/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	stats "go.etcd.io/etcd/etcdserver/api/v2stats"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 
 	"go.uber.org/zap"
 	"go.uber.org/zap"
 )
 )

+ 1 - 1
contrib/raftexample/raftexample_test.go

@@ -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 {

+ 2 - 2
contrib/recipes/barrier.go

@@ -17,8 +17,8 @@ package recipe
 import (
 import (
 	"context"
 	"context"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"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

+ 2 - 2
contrib/recipes/client.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"context"
 	"errors"
 	"errors"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	spb "github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	spb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 var (
 var (

+ 3 - 3
contrib/recipes/double_barrier.go

@@ -17,9 +17,9 @@ package recipe
 import (
 import (
 	"context"
 	"context"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"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

+ 2 - 2
contrib/recipes/key.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
+	v3 "go.etcd.io/etcd/clientv3"
+	"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

+ 2 - 2
contrib/recipes/priority_queue.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"context"
 	"fmt"
 	"fmt"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.

+ 2 - 2
contrib/recipes/queue.go

@@ -17,8 +17,8 @@ package recipe
 import (
 import (
 	"context"
 	"context"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 // Queue implements a multi-reader, multi-writer distributed queue.
 // Queue implements a multi-reader, multi-writer distributed queue.

+ 3 - 3
contrib/recipes/rwmutex.go

@@ -17,9 +17,9 @@ package recipe
 import (
 import (
 	"context"
 	"context"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 type RWMutex struct {
 type RWMutex struct {

+ 2 - 2
contrib/recipes/watch.go

@@ -17,8 +17,8 @@ package recipe
 import (
 import (
 	"context"
 	"context"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"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.

+ 10 - 10
embed/config.go

@@ -27,14 +27,14 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api/v3compactor"
-	"github.com/coreos/etcd/pkg/flags"
-	"github.com/coreos/etcd/pkg/netutil"
-	"github.com/coreos/etcd/pkg/srv"
-	"github.com/coreos/etcd/pkg/tlsutil"
-	"github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/etcd/pkg/types"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3compactor"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/netutil"
+	"go.etcd.io/etcd/pkg/srv"
+	"go.etcd.io/etcd/pkg/tlsutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"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

+ 2 - 2
embed/config_logging.go

@@ -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())

+ 1 - 1
embed/config_logging_journal_unix.go

@@ -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"
 )
 )

+ 1 - 1
embed/config_test.go

@@ -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"
 )
 )

+ 1 - 1
embed/doc.go

@@ -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() {

+ 14 - 14
embed/etcd.go

@@ -29,18 +29,18 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
-	"github.com/coreos/etcd/etcdserver/api/rafthttp"
-	"github.com/coreos/etcd/etcdserver/api/v2http"
-	"github.com/coreos/etcd/etcdserver/api/v2v3"
-	"github.com/coreos/etcd/etcdserver/api/v3client"
-	"github.com/coreos/etcd/etcdserver/api/v3rpc"
-	"github.com/coreos/etcd/pkg/debugutil"
-	runtimeutil "github.com/coreos/etcd/pkg/runtime"
-	"github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/rafthttp"
+	"go.etcd.io/etcd/etcdserver/api/v2http"
+	"go.etcd.io/etcd/etcdserver/api/v2v3"
+	"go.etcd.io/etcd/etcdserver/api/v3client"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	"go.etcd.io/etcd/pkg/debugutil"
+	runtimeutil "go.etcd.io/etcd/pkg/runtime"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"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

+ 13 - 13
embed/serve.go

@@ -23,19 +23,19 @@ import (
 	"net/http"
 	"net/http"
 	"strings"
 	"strings"
 
 
-	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api/v3client"
-	"github.com/coreos/etcd/etcdserver/api/v3election"
-	"github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb"
-	v3electiongw "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb/gw"
-	"github.com/coreos/etcd/etcdserver/api/v3lock"
-	"github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb"
-	v3lockgw "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb/gw"
-	"github.com/coreos/etcd/etcdserver/api/v3rpc"
-	etcdservergw "github.com/coreos/etcd/etcdserver/etcdserverpb/gw"
-	"github.com/coreos/etcd/pkg/debugutil"
-	"github.com/coreos/etcd/pkg/httputil"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/v3client"
+	"go.etcd.io/etcd/etcdserver/api/v3election"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	v3electiongw "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb/gw"
+	"go.etcd.io/etcd/etcdserver/api/v3lock"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	v3lockgw "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb/gw"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc"
+	etcdservergw "go.etcd.io/etcd/etcdserver/etcdserverpb/gw"
+	"go.etcd.io/etcd/pkg/debugutil"
+	"go.etcd.io/etcd/pkg/httputil"
+	"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"

+ 1 - 1
embed/serve_test.go

@@ -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.

+ 1 - 1
embed/util.go

@@ -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 {

+ 1 - 1
etcdctl/ctlv2/command/auth_commands.go

@@ -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"
 )
 )
 
 

+ 9 - 9
etcdctl/ctlv2/command/backup_command.go

@@ -23,15 +23,15 @@ import (
 	"regexp"
 	"regexp"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/etcdserver/api/membership"
-	"github.com/coreos/etcd/etcdserver/api/snap"
-	"github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/pkg/fileutil"
-	"github.com/coreos/etcd/pkg/idutil"
-	"github.com/coreos/etcd/pkg/pbutil"
-	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/wal"
-	"github.com/coreos/etcd/wal/walpb"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/idutil"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 
 	bolt "github.com/coreos/bbolt"
 	bolt "github.com/coreos/bbolt"
 	"github.com/urfave/cli"
 	"github.com/urfave/cli"

+ 1 - 1
etcdctl/ctlv2/command/cluster_health.go

@@ -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"
 )
 )

+ 1 - 1
etcdctl/ctlv2/command/error.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/exec_watch_command.go

@@ -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"
 )
 )

+ 1 - 1
etcdctl/ctlv2/command/format.go

@@ -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.

+ 1 - 1
etcdctl/ctlv2/command/get_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/ls_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/member_commands.go

@@ -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 {

+ 1 - 1
etcdctl/ctlv2/command/mk_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/mkdir_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/rm_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/rmdir_command.go

@@ -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".

+ 2 - 2
etcdctl/ctlv2/command/role_commands.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
-	"github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/pkg/pathutil"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/pathutil"
 	"github.com/urfave/cli"
 	"github.com/urfave/cli"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/set_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/set_dir_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/update_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/update_dir_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv2/command/user_commands.go

@@ -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"
 )
 )
 
 

+ 2 - 2
etcdctl/ctlv2/command/util.go

@@ -28,8 +28,8 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/pkg/transport"
 
 
 	"github.com/bgentry/speakeasy"
 	"github.com/bgentry/speakeasy"
 	"github.com/urfave/cli"
 	"github.com/urfave/cli"

+ 1 - 1
etcdctl/ctlv2/command/watch_command.go

@@ -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"
 )
 )

+ 2 - 2
etcdctl/ctlv2/ctl.go

@@ -20,8 +20,8 @@ import (
 	"os"
 	"os"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/etcdctl/ctlv2/command"
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/etcdctl/ctlv2/command"
+	"go.etcd.io/etcd/version"
 
 
 	"github.com/urfave/cli"
 	"github.com/urfave/cli"
 )
 )

+ 1 - 1
etcdctl/ctlv3/command/alarm_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv3/command/auth_command.go

@@ -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"
 )
 )
 
 

+ 2 - 2
etcdctl/ctlv3/command/check.go

@@ -25,8 +25,8 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/report"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/report"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
 	"golang.org/x/time/rate"

+ 1 - 1
etcdctl/ctlv3/command/compaction_command.go

@@ -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

+ 1 - 1
etcdctl/ctlv3/command/defrag_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv3/command/del_command.go

@@ -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"
 )
 )
 
 

+ 2 - 2
etcdctl/ctlv3/command/elect_command.go

@@ -21,8 +21,8 @@ import (
 	"os/signal"
 	"os/signal"
 	"syscall"
 	"syscall"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 3 - 3
etcdctl/ctlv3/command/ep_command.go

@@ -20,9 +20,9 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
-	"github.com/coreos/etcd/pkg/flags"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/pkg/flags"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 1 - 1
etcdctl/ctlv3/command/error.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 
 
-	"github.com/coreos/etcd/client"
+	"go.etcd.io/etcd/client"
 )
 )
 
 
 const (
 const (

+ 1 - 1
etcdctl/ctlv3/command/get_command.go

@@ -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"
 )
 )
 
 

+ 5 - 5
etcdctl/ctlv3/command/global.go

@@ -25,10 +25,10 @@ import (
 	"time"
 	"time"
 
 
 	"github.com/bgentry/speakeasy"
 	"github.com/bgentry/speakeasy"
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/flags"
-	"github.com/coreos/etcd/pkg/srv"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/srv"
+	"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))
 	}
 	}
 
 

+ 1 - 1
etcdctl/ctlv3/command/lease_command.go

@@ -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"
 )
 )

+ 2 - 2
etcdctl/ctlv3/command/lock_command.go

@@ -23,8 +23,8 @@ import (
 	"os/signal"
 	"os/signal"
 	"syscall"
 	"syscall"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/concurrency"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 4 - 4
etcdctl/ctlv3/command/make_mirror_command.go

@@ -22,10 +22,10 @@ import (
 	"sync/atomic"
 	"sync/atomic"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/mirror"
-	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/mirror"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 16 - 16
etcdctl/ctlv3/command/migrate_command.go

@@ -24,22 +24,22 @@ import (
 	"path/filepath"
 	"path/filepath"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api"
-	"github.com/coreos/etcd/etcdserver/api/membership"
-	"github.com/coreos/etcd/etcdserver/api/snap"
-	"github.com/coreos/etcd/etcdserver/api/v2error"
-	"github.com/coreos/etcd/etcdserver/api/v2store"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/pkg/pbutil"
-	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/wal"
-	"github.com/coreos/etcd/wal/walpb"
+	"go.etcd.io/etcd/client"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api"
+	"go.etcd.io/etcd/etcdserver/api/membership"
+	"go.etcd.io/etcd/etcdserver/api/snap"
+	"go.etcd.io/etcd/etcdserver/api/v2error"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/mvcc"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/pbutil"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/raft/raftpb"
+	"go.etcd.io/etcd/wal"
+	"go.etcd.io/etcd/wal/walpb"
 
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"

+ 1 - 1
etcdctl/ctlv3/command/move_leader_command.go

@@ -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"
 )
 )
 
 

+ 3 - 3
etcdctl/ctlv3/command/printer.go

@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/snapshot"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 
 	"github.com/dustin/go-humanize"
 	"github.com/dustin/go-humanize"
 )
 )

+ 4 - 4
etcdctl/ctlv3/command/printer_fields.go

@@ -17,10 +17,10 @@ package command
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/snapshot"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	spb "github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	spb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 type fieldsPrinter struct{ printer }
 type fieldsPrinter struct{ printer }

+ 1 - 1
etcdctl/ctlv3/command/printer_json.go

@@ -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 }

+ 3 - 3
etcdctl/ctlv3/command/printer_protobuf.go

@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 )
 )
 
 
 type pbPrinter struct{ printer }
 type pbPrinter struct{ printer }

+ 4 - 4
etcdctl/ctlv3/command/printer_simple.go

@@ -19,10 +19,10 @@ import (
 	"os"
 	"os"
 	"strings"
 	"strings"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/snapshot"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/pkg/types"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/types"
 )
 )
 
 
 type simplePrinter struct {
 type simplePrinter struct {

+ 2 - 2
etcdctl/ctlv3/command/printer_table.go

@@ -17,8 +17,8 @@ package command
 import (
 import (
 	"os"
 	"os"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/snapshot"
+	v3 "go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/snapshot"
 
 
 	"github.com/olekukonko/tablewriter"
 	"github.com/olekukonko/tablewriter"
 )
 )

+ 1 - 1
etcdctl/ctlv3/command/put_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv3/command/role_command.go

@@ -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"
 )
 )
 
 

+ 1 - 1
etcdctl/ctlv3/command/snapshot_command.go

@@ -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"

+ 2 - 2
etcdctl/ctlv3/command/txn_command.go

@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 
 
-	"github.com/coreos/etcd/clientv3"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 2 - 2
etcdctl/ctlv3/command/util.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	v3 "github.com/coreos/etcd/clientv3"
-	pb "github.com/coreos/etcd/mvcc/mvccpb"
+	v3 "go.etcd.io/etcd/clientv3"
+	pb "go.etcd.io/etcd/mvcc/mvccpb"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 )
 )

+ 1 - 1
etcdctl/ctlv3/command/version_command.go

@@ -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"
 )
 )

+ 1 - 1
etcdctl/ctlv3/command/watch_command.go

@@ -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"
 )
 )

+ 1 - 1
etcdctl/ctlv3/ctl.go

@@ -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"
 )
 )

+ 1 - 1
etcdctl/ctlv3/ctl_cov.go

@@ -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() {

+ 1 - 1
etcdctl/ctlv3/ctl_nocov.go

@@ -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)

+ 1 - 1
etcdctl/ctlv3/help.go

@@ -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"

+ 2 - 2
etcdctl/main.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 
 
-	"github.com/coreos/etcd/etcdctl/ctlv2"
-	"github.com/coreos/etcd/etcdctl/ctlv3"
+	"go.etcd.io/etcd/etcdctl/ctlv2"
+	"go.etcd.io/etcd/etcdctl/ctlv3"
 )
 )
 
 
 const (
 const (

+ 4 - 4
etcdmain/config.go

@@ -27,10 +27,10 @@ import (
 	"sort"
 	"sort"
 	"strings"
 	"strings"
 
 
-	"github.com/coreos/etcd/embed"
-	"github.com/coreos/etcd/pkg/flags"
-	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/pkg/flags"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/version"
 
 
 	"github.com/ghodss/yaml"
 	"github.com/ghodss/yaml"
 	"go.uber.org/zap"
 	"go.uber.org/zap"

+ 1 - 1
etcdmain/config_test.go

@@ -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"
 )
 )
 
 

+ 12 - 12
etcdmain/etcd.go

@@ -26,17 +26,17 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/embed"
-	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
-	"github.com/coreos/etcd/etcdserver/api/v2discovery"
-	"github.com/coreos/etcd/pkg/fileutil"
-	pkgioutil "github.com/coreos/etcd/pkg/ioutil"
-	"github.com/coreos/etcd/pkg/osutil"
-	"github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/proxy/httpproxy"
-	"github.com/coreos/etcd/version"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/etcdserver"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/v2discovery"
+	"go.etcd.io/etcd/pkg/fileutil"
+	pkgioutil "go.etcd.io/etcd/pkg/ioutil"
+	"go.etcd.io/etcd/pkg/osutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/types"
+	"go.etcd.io/etcd/proxy/httpproxy"
+	"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")

+ 1 - 1
etcdmain/gateway.go

@@ -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"

+ 12 - 12
etcdmain/grpc_proxy.go

@@ -27,18 +27,18 @@ import (
 	"path/filepath"
 	"path/filepath"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/leasing"
-	"github.com/coreos/etcd/clientv3/namespace"
-	"github.com/coreos/etcd/clientv3/ordering"
-	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
-	"github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb"
-	"github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb"
-	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/pkg/debugutil"
-	"github.com/coreos/etcd/pkg/logutil"
-	"github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/etcd/proxy/grpcproxy"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3/leasing"
+	"go.etcd.io/etcd/clientv3/namespace"
+	"go.etcd.io/etcd/clientv3/ordering"
+	"go.etcd.io/etcd/etcdserver/api/etcdhttp"
+	"go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
+	"go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/debugutil"
+	"go.etcd.io/etcd/pkg/logutil"
+	"go.etcd.io/etcd/pkg/transport"
+	"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"

+ 1 - 1
etcdmain/help.go

@@ -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"
 )
 )
 
 

+ 2 - 2
etcdmain/util.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 
 
-	"github.com/coreos/etcd/pkg/srv"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/pkg/srv"
+	"go.etcd.io/etcd/pkg/transport"
 
 
 	"go.uber.org/zap"
 	"go.uber.org/zap"
 )
 )

+ 4 - 4
functional/agent/handler.go

@@ -25,10 +25,10 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/coreos/etcd/embed"
-	"github.com/coreos/etcd/functional/rpcpb"
-	"github.com/coreos/etcd/pkg/fileutil"
-	"github.com/coreos/etcd/pkg/proxy"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/proxy"
 
 
 	"go.uber.org/zap"
 	"go.uber.org/zap"
 )
 )

+ 3 - 3
functional/agent/server.go

@@ -21,9 +21,9 @@ import (
 	"os/exec"
 	"os/exec"
 	"strings"
 	"strings"
 
 
-	"github.com/coreos/etcd/embed"
-	"github.com/coreos/etcd/functional/rpcpb"
-	"github.com/coreos/etcd/pkg/proxy"
+	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/functional/rpcpb"
+	"go.etcd.io/etcd/pkg/proxy"
 
 
 	"go.uber.org/zap"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc"

+ 1 - 1
functional/agent/utils.go

@@ -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

+ 1 - 1
functional/cmd/etcd-agent/main.go

@@ -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 changed in this diff