Skip to content

Commit d37f152

Browse files
gyuhogyuho
committed
*: update import paths to "go.etcd.io/etcd"
Signed-off-by: Gyuho Lee <[email protected]>
1 parent 2ac0438 commit d37f152

File tree

278 files changed

+623
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+623
-623
lines changed

‎client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sync"
3030
"time"
3131

32-
"github.com/coreos/etcd/version"
32+
"go.etcd.io/etcd/version"
3333
)
3434

3535
var (

‎client/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"testing"
3030
"time"
3131

32-
"github.com/coreos/etcd/pkg/testutil"
33-
"github.com/coreos/etcd/version"
32+
"go.etcd.io/etcd/pkg/testutil"
33+
"go.etcd.io/etcd/version"
3434
)
3535

3636
type actionAssertingHTTPClient struct {

‎client/discover.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package client
1616

1717
import (
18-
"github.com/coreos/etcd/pkg/srv"
18+
"go.etcd.io/etcd/pkg/srv"
1919
)
2020

2121
// Discoverer is an interface that wraps the Discover method.

‎client/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
2121
"net/http"
2222
"context"
2323
24-
"github.com/coreos/etcd/client"
24+
"go.etcd.io/etcd/client"
2525
)
2626
2727
cfg := client.Config{

‎client/example_keys_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"log"
2121
"sort"
2222

23-
"github.com/coreos/etcd/client"
23+
"go.etcd.io/etcd/client"
2424
)
2525

2626
func ExampleKeysAPI_directory() {

‎client/integration/client_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"sync/atomic"
2525
"testing"
2626

27-
"github.com/coreos/etcd/client"
28-
"github.com/coreos/etcd/integration"
29-
"github.com/coreos/etcd/pkg/testutil"
27+
"go.etcd.io/etcd/client"
28+
"go.etcd.io/etcd/integration"
29+
"go.etcd.io/etcd/pkg/testutil"
3030
)
3131

3232
// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.

‎client/integration/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"testing"
1010

11-
"github.com/coreos/etcd/pkg/testutil"
11+
"go.etcd.io/etcd/pkg/testutil"
1212
)
1313

1414
func TestMain(m *testing.M) {

‎client/keys.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"strings"
2828
"time"
2929

30-
"github.com/coreos/etcd/pkg/pathutil"
30+
"go.etcd.io/etcd/pkg/pathutil"
3131
"github.com/ugorji/go/codec"
3232
)
3333

‎client/main_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"testing"
2424
"time"
2525

26-
"github.com/coreos/etcd/integration"
27-
"github.com/coreos/etcd/pkg/testutil"
28-
"github.com/coreos/etcd/pkg/transport"
26+
"go.etcd.io/etcd/integration"
27+
"go.etcd.io/etcd/pkg/testutil"
28+
"go.etcd.io/etcd/pkg/transport"
2929
)
3030

3131
var exampleEndpoints []string

‎client/members.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"net/url"
2424
"path"
2525

26-
"github.com/coreos/etcd/pkg/types"
26+
"go.etcd.io/etcd/pkg/types"
2727
)
2828

2929
var (

‎client/members_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"reflect"
2424
"testing"
2525

26-
"github.com/coreos/etcd/pkg/types"
26+
"go.etcd.io/etcd/pkg/types"
2727
)
2828

2929
func TestMembersAPIActionList(t *testing.T) {

‎contrib/raftexample/httpapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"net/http"
2121
"strconv"
2222

23-
"github.com/coreos/etcd/raft/raftpb"
23+
"go.etcd.io/etcd/raft/raftpb"
2424
)
2525

2626
// Handler for a http based key-value store backed by raft

‎contrib/raftexample/kvstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"log"
2222
"sync"
2323

24-
"github.com/coreos/etcd/etcdserver/api/snap"
24+
"go.etcd.io/etcd/etcdserver/api/snap"
2525
)
2626

2727
// a key-value store backed by raft

‎contrib/raftexample/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"flag"
1919
"strings"
2020

21-
"github.com/coreos/etcd/raft/raftpb"
21+
"go.etcd.io/etcd/raft/raftpb"
2222
)
2323

2424
func main() {

‎contrib/raftexample/raft.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ import (
2424
"strconv"
2525
"time"
2626

27-
"github.com/coreos/etcd/etcdserver/api/rafthttp"
28-
"github.com/coreos/etcd/etcdserver/api/snap"
29-
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
30-
"github.com/coreos/etcd/pkg/fileutil"
31-
"github.com/coreos/etcd/pkg/types"
32-
"github.com/coreos/etcd/raft"
33-
"github.com/coreos/etcd/raft/raftpb"
34-
"github.com/coreos/etcd/wal"
35-
"github.com/coreos/etcd/wal/walpb"
27+
"go.etcd.io/etcd/etcdserver/api/rafthttp"
28+
"go.etcd.io/etcd/etcdserver/api/snap"
29+
stats "go.etcd.io/etcd/etcdserver/api/v2stats"
30+
"go.etcd.io/etcd/pkg/fileutil"
31+
"go.etcd.io/etcd/pkg/types"
32+
"go.etcd.io/etcd/raft"
33+
"go.etcd.io/etcd/raft/raftpb"
34+
"go.etcd.io/etcd/wal"
35+
"go.etcd.io/etcd/wal/walpb"
3636

3737
"go.uber.org/zap"
3838
)

‎contrib/raftexample/raftexample_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
"github.com/coreos/etcd/raft/raftpb"
22+
"go.etcd.io/etcd/raft/raftpb"
2323
)
2424

2525
type cluster struct {

‎contrib/recipes/barrier.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package recipe
1717
import (
1818
"context"
1919

20-
v3 "github.com/coreos/etcd/clientv3"
21-
"github.com/coreos/etcd/mvcc/mvccpb"
20+
v3 "go.etcd.io/etcd/clientv3"
21+
"go.etcd.io/etcd/mvcc/mvccpb"
2222
)
2323

2424
// Barrier creates a key in etcd to block processes, then deletes the key to

‎contrib/recipes/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"errors"
2020

21-
v3 "github.com/coreos/etcd/clientv3"
22-
spb "github.com/coreos/etcd/mvcc/mvccpb"
21+
v3 "go.etcd.io/etcd/clientv3"
22+
spb "go.etcd.io/etcd/mvcc/mvccpb"
2323
)
2424

2525
var (

‎contrib/recipes/double_barrier.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package recipe
1717
import (
1818
"context"
1919

20-
"github.com/coreos/etcd/clientv3"
21-
"github.com/coreos/etcd/clientv3/concurrency"
22-
"github.com/coreos/etcd/mvcc/mvccpb"
20+
"go.etcd.io/etcd/clientv3"
21+
"go.etcd.io/etcd/clientv3/concurrency"
22+
"go.etcd.io/etcd/mvcc/mvccpb"
2323
)
2424

2525
// DoubleBarrier blocks processes on Enter until an expected count enters, then

‎contrib/recipes/key.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"strings"
2121
"time"
2222

23-
v3 "github.com/coreos/etcd/clientv3"
24-
"github.com/coreos/etcd/clientv3/concurrency"
23+
v3 "go.etcd.io/etcd/clientv3"
24+
"go.etcd.io/etcd/clientv3/concurrency"
2525
)
2626

2727
// RemoteKV is a key/revision pair created by the client and stored on etcd

‎contrib/recipes/priority_queue.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"fmt"
2020

21-
v3 "github.com/coreos/etcd/clientv3"
22-
"github.com/coreos/etcd/mvcc/mvccpb"
21+
v3 "go.etcd.io/etcd/clientv3"
22+
"go.etcd.io/etcd/mvcc/mvccpb"
2323
)
2424

2525
// PriorityQueue implements a multi-reader, multi-writer distributed queue.

‎contrib/recipes/queue.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package recipe
1717
import (
1818
"context"
1919

20-
v3 "github.com/coreos/etcd/clientv3"
21-
"github.com/coreos/etcd/mvcc/mvccpb"
20+
v3 "go.etcd.io/etcd/clientv3"
21+
"go.etcd.io/etcd/mvcc/mvccpb"
2222
)
2323

2424
// Queue implements a multi-reader, multi-writer distributed queue.

‎contrib/recipes/rwmutex.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package recipe
1717
import (
1818
"context"
1919

20-
v3 "github.com/coreos/etcd/clientv3"
21-
"github.com/coreos/etcd/clientv3/concurrency"
22-
"github.com/coreos/etcd/mvcc/mvccpb"
20+
v3 "go.etcd.io/etcd/clientv3"
21+
"go.etcd.io/etcd/clientv3/concurrency"
22+
"go.etcd.io/etcd/mvcc/mvccpb"
2323
)
2424

2525
type RWMutex struct {

‎contrib/recipes/watch.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package recipe
1717
import (
1818
"context"
1919

20-
"github.com/coreos/etcd/clientv3"
21-
"github.com/coreos/etcd/mvcc/mvccpb"
20+
"go.etcd.io/etcd/clientv3"
21+
"go.etcd.io/etcd/mvcc/mvccpb"
2222
)
2323

2424
// WaitEvents waits on a key until it observes the given events and returns the final one.

‎embed/config.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/coreos/etcd/etcdserver"
31-
"github.com/coreos/etcd/etcdserver/api/v3compactor"
32-
"github.com/coreos/etcd/pkg/flags"
33-
"github.com/coreos/etcd/pkg/netutil"
34-
"github.com/coreos/etcd/pkg/srv"
35-
"github.com/coreos/etcd/pkg/tlsutil"
36-
"github.com/coreos/etcd/pkg/transport"
37-
"github.com/coreos/etcd/pkg/types"
30+
"go.etcd.io/etcd/etcdserver"
31+
"go.etcd.io/etcd/etcdserver/api/v3compactor"
32+
"go.etcd.io/etcd/pkg/flags"
33+
"go.etcd.io/etcd/pkg/netutil"
34+
"go.etcd.io/etcd/pkg/srv"
35+
"go.etcd.io/etcd/pkg/tlsutil"
36+
"go.etcd.io/etcd/pkg/transport"
37+
"go.etcd.io/etcd/pkg/types"
3838

3939
"github.com/ghodss/yaml"
4040
"go.uber.org/zap"
@@ -162,7 +162,7 @@ type Config struct {
162162
//
163163
// If single-node, it advances ticks regardless.
164164
//
165-
// See https://github.com/coreos/etcd/issues/9333 for more detail.
165+
// See https://go.etcd.io/etcd/issues/9333 for more detail.
166166
InitialElectionTickAdvance bool `json:"initial-election-tick-advance"`
167167

168168
QuotaBackendBytes int64 `json:"quota-backend-bytes"`
@@ -246,7 +246,7 @@ type Config struct {
246246
// CVE-2018-5702 reference:
247247
// - https://bugs.chromium.org/p/project-zero/issues/detail?id=1447#c2
248248
// - https://github.com/transmission/transmission/pull/468
249-
// - https://github.com/coreos/etcd/issues/9353
249+
// - https://go.etcd.io/etcd/issues/9353
250250
HostWhitelist map[string]struct{}
251251

252252
// UserHandlers is for registering users handlers and only used for

‎embed/config_logging.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sort"
2525
"sync"
2626

27-
"github.com/coreos/etcd/pkg/logutil"
27+
"go.etcd.io/etcd/pkg/logutil"
2828

2929
"github.com/coreos/pkg/capnslog"
3030
"go.uber.org/zap"
@@ -93,7 +93,7 @@ func (cfg *Config) setupLogging() error {
9393

9494
// TODO: deprecate with "capnslog"
9595
if cfg.LogPkgLevels != "" {
96-
repoLog := capnslog.MustRepoLogger("github.com/coreos/etcd")
96+
repoLog := capnslog.MustRepoLogger("go.etcd.io/etcd")
9797
settings, err := repoLog.ParseLogLevelConfig(cfg.LogPkgLevels)
9898
if err != nil {
9999
plog.Warningf("couldn't parse log level string: %s, continuing with default levels", err.Error())

‎embed/config_logging_journal_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/coreos/etcd/pkg/logutil"
23+
"go.etcd.io/etcd/pkg/logutil"
2424

2525
"go.uber.org/zap/zapcore"
2626
)

‎embed/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222
"testing"
2323

24-
"github.com/coreos/etcd/pkg/transport"
24+
"go.etcd.io/etcd/pkg/transport"
2525

2626
"github.com/ghodss/yaml"
2727
)

‎embed/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults:
2121
"log"
2222
"time"
2323
24-
"github.com/coreos/etcd/embed"
24+
"go.etcd.io/etcd/embed"
2525
)
2626
2727
func main() {

‎embed/etcd.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ import (
2929
"sync"
3030
"time"
3131

32-
"github.com/coreos/etcd/etcdserver"
33-
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
34-
"github.com/coreos/etcd/etcdserver/api/rafthttp"
35-
"github.com/coreos/etcd/etcdserver/api/v2http"
36-
"github.com/coreos/etcd/etcdserver/api/v2v3"
37-
"github.com/coreos/etcd/etcdserver/api/v3client"
38-
"github.com/coreos/etcd/etcdserver/api/v3rpc"
39-
"github.com/coreos/etcd/pkg/debugutil"
40-
runtimeutil "github.com/coreos/etcd/pkg/runtime"
41-
"github.com/coreos/etcd/pkg/transport"
42-
"github.com/coreos/etcd/pkg/types"
43-
"github.com/coreos/etcd/version"
32+
"go.etcd.io/etcd/etcdserver"
33+
"go.etcd.io/etcd/etcdserver/api/etcdhttp"
34+
"go.etcd.io/etcd/etcdserver/api/rafthttp"
35+
"go.etcd.io/etcd/etcdserver/api/v2http"
36+
"go.etcd.io/etcd/etcdserver/api/v2v3"
37+
"go.etcd.io/etcd/etcdserver/api/v3client"
38+
"go.etcd.io/etcd/etcdserver/api/v3rpc"
39+
"go.etcd.io/etcd/pkg/debugutil"
40+
runtimeutil "go.etcd.io/etcd/pkg/runtime"
41+
"go.etcd.io/etcd/pkg/transport"
42+
"go.etcd.io/etcd/pkg/types"
43+
"go.etcd.io/etcd/version"
4444

4545
"github.com/coreos/pkg/capnslog"
4646
"github.com/grpc-ecosystem/go-grpc-prometheus"
@@ -50,7 +50,7 @@ import (
5050
"google.golang.org/grpc/keepalive"
5151
)
5252

53-
var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed")
53+
var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed")
5454

5555
const (
5656
// internal fd usage includes disk usage and transport usage.
@@ -412,7 +412,7 @@ func stopServers(ctx context.Context, ss *servers) {
412412

413413
// do not grpc.Server.GracefulStop with TLS enabled etcd server
414414
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
415-
// and https://github.com/coreos/etcd/issues/8916
415+
// and https://go.etcd.io/etcd/issues/8916
416416
if ss.secure {
417417
shutdownNow()
418418
return

0 commit comments

Comments
 (0)