diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5d21a258f..d9ea155ee 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,2 +1,2 @@ -Please read https://github.com/coreos/etcd/blob/master/Documentation/reporting_bugs.md. +Please read https://github.com/etcd-io/etcd/blob/master/Documentation/reporting_bugs.md. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3b3d90979..e7c3faab4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,2 +1,2 @@ -Please read https://github.com/coreos/etcd/blob/master/CONTRIBUTING.md#contribution-flow. +Please read https://github.com/etcd-io/etcd/blob/master/CONTRIBUTING.md#contribution-flow. diff --git a/.travis.yml b/.travis.yml index c6036ff3e..85138136e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/coreos/etcd +go_import_path: go.etcd.io/etcd sudo: required @@ -74,37 +74,37 @@ script: case "${TARGET}" in linux-amd64-fmt) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test" ;; linux-amd64-integration-1-cpu) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test" ;; linux-amd64-integration-2-cpu) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test" ;; linux-amd64-integration-4-cpu) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test" ;; linux-amd64-functional) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test" ;; linux-amd64-unit) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test" ;; all-build) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \ && GOARCH=386 PASSES='build' ./test \ && GO_BUILD_FLAGS='-v' GOOS=darwin GOARCH=amd64 ./build \ @@ -124,7 +124,7 @@ script: ;; linux-386-unit) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ + --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ /bin/bash -c "GOARCH=386 PASSES='unit' ./test" ;; esac diff --git a/Documentation/dl_build.md b/Documentation/dl_build.md index b59eafd2f..e6610be73 100644 --- a/Documentation/dl_build.md +++ b/Documentation/dl_build.md @@ -26,7 +26,7 @@ To build a vendored `etcd` from the `master` branch via `go get`: # GOPATH should be set $ echo $GOPATH /Users/example/go -$ go get -v github.com/coreos/etcd +$ go get -v go.etcd.io/etcd ``` ## Test the installation diff --git a/MAINTAINERS b/MAINTAINERS index b6dc16832..07c9cf726 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14,4 +14,4 @@ Hitoshi Mitake (@mitake) pkg:* Joe Betz (@jpbetz) pkg:* Xiang Li (@xiang90) pkg:* -Ben Darnell (@bdarnell) pkg:github.com/coreos/etcd/raft +Ben Darnell (@bdarnell) pkg:go.etcd.io/etcd/raft diff --git a/Makefile b/Makefile index 17c1b7283..eefab125d 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ compile-with-docker-test: $(info GO_VERSION: $(GO_VERSION)) docker run \ --rm \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/go.etcd.io/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ /bin/bash -c "GO_BUILD_FLAGS=-v ./build && ./bin/etcd --version" @@ -158,7 +158,7 @@ docker-test: docker run \ --rm \ $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/go.etcd.io/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ /bin/bash -c "$(TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log" ! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test-$(TEST_SUFFIX).log @@ -172,7 +172,7 @@ docker-test-coverage: docker run \ --rm \ $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/go.etcd.io/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1" ! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 docker-test-coverage-$(TEST_SUFFIX).log diff --git a/ROADMAP.md b/ROADMAP.md index 0b628f353..a19d8610b 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -4,7 +4,7 @@ This document defines a high level roadmap for etcd development. -The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/coreos/etcd/milestones) represent the most up-to-date and issue-for-issue plans. +The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/etcd-io/etcd/milestones) represent the most up-to-date and issue-for-issue plans. etcd 3.3 is our current stable branch. The roadmap below outlines new features that will be added to etcd, and while subject to change, define what future stable will look like. diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 6baa18673..8de2d175c 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,9 +15,9 @@ package auth import ( - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go index 854971bf7..de15c57c7 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,8 +17,8 @@ package auth import ( "testing" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/pkg/adt" "go.uber.org/zap" ) diff --git a/auth/store.go b/auth/store.go index eda884f9f..b3e346b92 100644 --- a/auth/store.go +++ b/auth/store.go @@ -24,10 +24,10 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -48,7 +48,7 @@ var ( authUsersBucketName = []byte("authUsers") authRolesBucketName = []byte("authRoles") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "auth") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "auth") ErrRootUserNotExist = errors.New("auth: root user does not exist") ErrRootRoleNotExist = errors.New("auth: root user does not have root role") diff --git a/auth/store_test.go b/auth/store_test.go index 05d2c03a8..0620f8de8 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/bill-of-materials.json b/bill-of-materials.json index acf91d4ea..daa00454a 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -26,15 +26,6 @@ } ] }, - { - "project": "github.com/coreos/etcd", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, { "project": "github.com/coreos/go-semver/semver", "licenses": [ @@ -314,6 +305,15 @@ } ] }, + { + "project": "go.etcd.io/etcd", + "licenses": [ + { + "type": "Apache License 2.0", + "confidence": 1 + } + ] + }, { "project": "go.uber.org/atomic", "licenses": [ diff --git a/build b/build index a7f8ba86d..38cafc6e2 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/usr/bin/env bash # set some environment variables -ORG_PATH="github.com/coreos" +ORG_PATH="go.etcd.io" REPO_PATH="${ORG_PATH}/etcd" GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound") @@ -34,10 +34,10 @@ etcd_setup_gopath() { GOPATH=":$GOPATH" fi rm -rf "${etcdGOPATH:?}/" - mkdir -p "${etcdGOPATH}/vendor" "${etcdGOPATH}/etcd_src/src/github.com/coreos" + mkdir -p "${etcdGOPATH}/vendor" "${etcdGOPATH}/etcd_src/src/go.etcd.io" export GOPATH=${etcdGOPATH}/vendor:${etcdGOPATH}/etcd_src${GOPATH} ln -s "${CDIR}/vendor" "${etcdGOPATH}/vendor/src" - ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/github.com/coreos/etcd" + ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/go.etcd.io/etcd" } toggle_failpoints_default() { diff --git a/build.ps1 b/build.ps1 index b0970ecd4..d1c36ee64 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,4 +1,4 @@ -$ORG_PATH="github.com/coreos" +$ORG_PATH="go.etcd.io" $REPO_PATH="$ORG_PATH/etcd" $PWD = $((Get-Item -Path ".\" -Verbose).FullName) $FSROOT = $((Get-Location).Drive.Name+":") diff --git a/client/client.go b/client/client.go index e68745056..6f1270f8a 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index d8e14b0bd..c66d3b77b 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "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 { diff --git a/client/discover.go b/client/discover.go index 442e35fe5..30473148b 100644 --- a/client/discover.go +++ b/client/discover.go @@ -15,7 +15,7 @@ package client import ( - "github.com/coreos/etcd/pkg/srv" + "go.etcd.io/etcd/pkg/srv" ) // Discoverer is an interface that wraps the Discover method. diff --git a/client/doc.go b/client/doc.go index ad4eca4e1..abe5199c3 100644 --- a/client/doc.go +++ b/client/doc.go @@ -21,7 +21,7 @@ Create a Config and exchange it for a Client: "net/http" "context" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) cfg := client.Config{ diff --git a/client/example_keys_test.go b/client/example_keys_test.go index 66063571d..84cbbe791 100644 --- a/client/example_keys_test.go +++ b/client/example_keys_test.go @@ -20,7 +20,7 @@ import ( "log" "sort" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) func ExampleKeysAPI_directory() { diff --git a/client/integration/client_test.go b/client/integration/client_test.go index 19c9ede76..546b28f24 100644 --- a/client/integration/client_test.go +++ b/client/integration/client_test.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "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. diff --git a/client/integration/main_test.go b/client/integration/main_test.go index 2913ce511..c7362dde4 100644 --- a/client/integration/main_test.go +++ b/client/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/client/keys.go b/client/keys.go index 8b9fd3f87..228746241 100644 --- a/client/keys.go +++ b/client/keys.go @@ -27,8 +27,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/pathutil" "github.com/ugorji/go/codec" + "go.etcd.io/etcd/pkg/pathutil" ) const ( diff --git a/client/main_test.go b/client/main_test.go index 1f2f3f306..1fec862e0 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -23,9 +23,9 @@ import ( "testing" "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 diff --git a/client/members.go b/client/members.go index aafa3d1b8..657131ab0 100644 --- a/client/members.go +++ b/client/members.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/client/members_test.go b/client/members_test.go index 706b6aeb8..9be03ae54 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMembersAPIActionList(t *testing.T) { diff --git a/clientv3/auth.go b/clientv3/auth.go index bedbd132c..921f50f5e 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/auth/authpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/auth/authpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/balancer/balancer.go b/clientv3/balancer/balancer.go index 6ecc5b5f8..25dc2b7e7 100644 --- a/clientv3/balancer/balancer.go +++ b/clientv3/balancer/balancer.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index 592eda102..c31ddbe45 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/balancer/picker" - "github.com/coreos/etcd/clientv3/balancer/resolver/endpoint" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/mock/mockserver" + "go.etcd.io/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/resolver/endpoint" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/mock/mockserver" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/balancer/config.go b/clientv3/balancer/config.go index 2156984df..0339a84d0 100644 --- a/clientv3/balancer/config.go +++ b/clientv3/balancer/config.go @@ -15,7 +15,7 @@ package balancer import ( - "github.com/coreos/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/picker" "go.uber.org/zap" ) diff --git a/clientv3/balancer/grpc1.7-health_test.go b/clientv3/balancer/grpc1.7-health_test.go index 1671f5338..6ea7e0d6a 100644 --- a/clientv3/balancer/grpc1.7-health_test.go +++ b/clientv3/balancer/grpc1.7-health_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) @@ -191,7 +191,7 @@ func TestOldHealthBalancerGraylist(t *testing.T) { // TestBalancerDoNotBlockOnClose ensures that balancer and grpc don't deadlock each other // due to rapid open/close conn. The deadlock causes balancer.Close() to block forever. -// See issue: https://github.com/coreos/etcd/issues/7283 for more detail. +// See issue: https://go.etcd.io/etcd/issues/7283 for more detail. func TestOldHealthBalancerDoNotBlockOnClose(t *testing.T) { defer testutil.AfterTest(t) diff --git a/clientv3/client.go b/clientv3/client.go index bc5390245..57af96c2a 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -27,11 +27,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3/balancer" - "github.com/coreos/etcd/clientv3/balancer/picker" - "github.com/coreos/etcd/clientv3/balancer/resolver/endpoint" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils" + "go.etcd.io/etcd/clientv3/balancer" + "go.etcd.io/etcd/clientv3/balancer/picker" + "go.etcd.io/etcd/clientv3/balancer/resolver/endpoint" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/client_test.go b/clientv3/client_test.go index 2f94fa62b..47544a0da 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/clientv3util/example_key_test.go b/clientv3/clientv3util/example_key_test.go index 48b20c732..a3506e90c 100644 --- a/clientv3/clientv3util/example_key_test.go +++ b/clientv3/clientv3util/example_key_test.go @@ -18,8 +18,8 @@ import ( "context" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/clientv3util" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/clientv3util" ) func ExampleKeyMissing() { diff --git a/clientv3/clientv3util/util.go b/clientv3/clientv3util/util.go index 3b296343e..8153f66f8 100644 --- a/clientv3/clientv3util/util.go +++ b/clientv3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) // KeyExists returns a comparison operation that evaluates to true iff the given diff --git a/clientv3/cluster.go b/clientv3/cluster.go index 785672be8..d497c0578 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "google.golang.org/grpc" ) diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go index 41e80c1da..5779713d3 100644 --- a/clientv3/compact_op.go +++ b/clientv3/compact_op.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // CompactOp represents a compact operation. diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go index 6c91d3ab0..991e47a15 100644 --- a/clientv3/compact_op_test.go +++ b/clientv3/compact_op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestCompactOp(t *testing.T) { diff --git a/clientv3/compare.go b/clientv3/compare.go index b5f0a2552..01ed68e94 100644 --- a/clientv3/compare.go +++ b/clientv3/compare.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type CompareTarget int diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go index e18a0ed4a..2be782106 100644 --- a/clientv3/concurrency/election.go +++ b/clientv3/concurrency/election.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) var ( diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go index 5cce9f490..2514490fd 100644 --- a/clientv3/concurrency/example_election_test.go +++ b/clientv3/concurrency/example_election_test.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) func ExampleElection_Campaign() { diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go index c9a878806..a0463d5b5 100644 --- a/clientv3/concurrency/example_mutex_test.go +++ b/clientv3/concurrency/example_mutex_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) func ExampleMutex_Lock() { diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go index 9eca53009..e0e946f12 100644 --- a/clientv3/concurrency/example_stm_test.go +++ b/clientv3/concurrency/example_stm_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // ExampleSTM_apply shows how to use STM with a transactional diff --git a/clientv3/concurrency/key.go b/clientv3/concurrency/key.go index 4b6e399bd..e4cf77517 100644 --- a/clientv3/concurrency/key.go +++ b/clientv3/concurrency/key.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error { diff --git a/clientv3/concurrency/main_test.go b/clientv3/concurrency/main_test.go index 797fe9bd1..0d8b3a41f 100644 --- a/clientv3/concurrency/main_test.go +++ b/clientv3/concurrency/main_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) var endpoints []string diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index dac9ba5a2..162e70364 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -19,8 +19,8 @@ import ( "fmt" "sync" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // Mutex implements the sync Locker interface with etcd diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go index c399d64a6..598ec0e4f 100644 --- a/clientv3/concurrency/session.go +++ b/clientv3/concurrency/session.go @@ -18,7 +18,7 @@ import ( "context" "time" - v3 "github.com/coreos/etcd/clientv3" + v3 "go.etcd.io/etcd/clientv3" ) const defaultSessionTTL = 60 diff --git a/clientv3/concurrency/stm.go b/clientv3/concurrency/stm.go index d11023ebe..ee1151079 100644 --- a/clientv3/concurrency/stm.go +++ b/clientv3/concurrency/stm.go @@ -18,7 +18,7 @@ import ( "context" "math" - v3 "github.com/coreos/etcd/clientv3" + v3 "go.etcd.io/etcd/clientv3" ) // STM is an interface for software transactional memory. diff --git a/clientv3/doc.go b/clientv3/doc.go index 5beaaddd6..af06c40f1 100644 --- a/clientv3/doc.go +++ b/clientv3/doc.go @@ -61,7 +61,7 @@ // // 1. context error: canceled or deadline exceeded. // 2. gRPC status error: e.g. when clock drifts in server-side before client's context deadline exceeded. -// 3. gRPC error: see https://github.com/coreos/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go +// 3. gRPC error: see https://go.etcd.io/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go // // Here is the example code to handle client errors: // diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go index 8200df998..cabdeed60 100644 --- a/clientv3/example_auth_test.go +++ b/clientv3/example_auth_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleAuth() { diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go index 5aa03fd65..279ea64ac 100644 --- a/clientv3/example_cluster_test.go +++ b/clientv3/example_cluster_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleCluster_memberList() { diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go index e2476e3e7..ae552583a 100644 --- a/clientv3/example_kv_test.go +++ b/clientv3/example_kv_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) func ExampleKV_put() { diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go index 98db148b9..c065b7def 100644 --- a/clientv3/example_lease_test.go +++ b/clientv3/example_lease_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleLease_grant() { diff --git a/clientv3/example_maintenence_test.go b/clientv3/example_maintenence_test.go index a66a23abc..58b10d0b6 100644 --- a/clientv3/example_maintenence_test.go +++ b/clientv3/example_maintenence_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleMaintenance_status() { diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go index 802a2af1f..5bee0c200 100644 --- a/clientv3/example_metrics_test.go +++ b/clientv3/example_metrics_test.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/example_test.go b/clientv3/example_test.go index e486981e5..453f8c916 100644 --- a/clientv3/example_test.go +++ b/clientv3/example_test.go @@ -20,8 +20,8 @@ import ( "os" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go index 08c199b38..313514fbd 100644 --- a/clientv3/example_watch_test.go +++ b/clientv3/example_watch_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func ExampleWatcher_watch() { diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go index 151187e14..0ff3f73f1 100644 --- a/clientv3/integration/black_hole_test.go +++ b/clientv3/integration/black_hole_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/cluster_test.go b/clientv3/integration/cluster_test.go index 4a81b89c8..ce629488b 100644 --- a/clientv3/integration/cluster_test.go +++ b/clientv3/integration/cluster_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" ) func TestMemberList(t *testing.T) { diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index 61a2a398b..5814afbd0 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" ) diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index 1c7724acd..525c1ab2e 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index c5d6d06c5..ff11f0f47 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go index 7c3dcc3f1..a824726f0 100644 --- a/clientv3/integration/leasing_test.go +++ b/clientv3/integration/leasing_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/clientv3/leasing" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/leasing" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestLeasingPutGet(t *testing.T) { diff --git a/clientv3/integration/logger_test.go b/clientv3/integration/logger_test.go index 48da6e8bd..f36664ec7 100644 --- a/clientv3/integration/logger_test.go +++ b/clientv3/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/integration/main_test.go b/clientv3/integration/main_test.go index 2913ce511..c7362dde4 100644 --- a/clientv3/integration/main_test.go +++ b/clientv3/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index af05b22c3..4fecaf812 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -27,13 +27,13 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/testutil" ) func TestMaintenanceHashKV(t *testing.T) { diff --git a/clientv3/integration/metrics_test.go b/clientv3/integration/metrics_test.go index b1e795b76..1b73af9d7 100644 --- a/clientv3/integration/metrics_test.go +++ b/clientv3/integration/metrics_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index 01bfef10a..46b312ff9 100644 --- a/clientv3/integration/mirror_test.go +++ b/clientv3/integration/mirror_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/mirror" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3/mirror" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMirrorSync(t *testing.T) { diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go index b952d333d..3f4344d22 100644 --- a/clientv3/integration/namespace_test.go +++ b/clientv3/integration/namespace_test.go @@ -19,11 +19,11 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestNamespacePutGet(t *testing.T) { diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index f65807430..637d94d22 100644 --- a/clientv3/integration/network_partition_test.go +++ b/clientv3/integration/network_partition_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go index 5b4fad43c..cc779575a 100644 --- a/clientv3/integration/role_test.go +++ b/clientv3/integration/role_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestRoleError(t *testing.T) { diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go index 1ab643eb1..f7ce58c36 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/integration/txn_test.go b/clientv3/integration/txn_test.go index ca49ec075..af994adbe 100644 --- a/clientv3/integration/txn_test.go +++ b/clientv3/integration/txn_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestTxnError(t *testing.T) { diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go index da341d660..cf32fc228 100644 --- a/clientv3/integration/user_test.go +++ b/clientv3/integration/user_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/util.go b/clientv3/integration/util.go index db26feb60..939c7884e 100644 --- a/clientv3/integration/util.go +++ b/clientv3/integration/util.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint). diff --git a/clientv3/integration/watch_fragment_test.go b/clientv3/integration/watch_fragment_test.go index dd6a8448f..e22540d9e 100644 --- a/clientv3/integration/watch_fragment_test.go +++ b/clientv3/integration/watch_fragment_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestWatchFragmentDisable ensures that large watch diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go index 233e9a695..3482f31bd 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 5a7469bd4..2b7864ad8 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,7 +17,7 @@ package clientv3 import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/lease.go b/clientv3/lease.go index 00e0b918e..6e92fa3ba 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" @@ -133,7 +133,7 @@ type Lease interface { // is returned. Otherwise, it retries. // // TODO(v4.0): post errors to last keep alive message before closing - // (see https://github.com/coreos/etcd/pull/7866) + // (see https://go.etcd.io/etcd/pull/7866) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAliveResponse, error) // KeepAliveOnce renews the lease once. The response corresponds to the diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index 77a1d06c8..f4870c1fb 100644 --- a/clientv3/leasing/cache.go +++ b/clientv3/leasing/cache.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) const revokeBackoff = 2 * time.Second diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go index 051a8fceb..ecfaedfc2 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,11 +20,11 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go index 76e4f3693..96703ecc6 100644 --- a/clientv3/leasing/txn.go +++ b/clientv3/leasing/txn.go @@ -18,8 +18,8 @@ import ( "context" "strings" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type txnLeasing struct { diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go index 61f6e8c33..f4f9a372e 100644 --- a/clientv3/leasing/util.go +++ b/clientv3/leasing/util.go @@ -17,8 +17,8 @@ package leasing import ( "bytes" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "go.etcd.io/etcd/clientv3" + v3pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func compareInt64(a, b int64) int { diff --git a/clientv3/logger.go b/clientv3/logger.go index 3276372ad..f5ae0109d 100644 --- a/clientv3/logger.go +++ b/clientv3/logger.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "sync" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index a0a21d275..972abff1f 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) // TestMain sets up an etcd cluster if running the examples. diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go index 6db6c0e96..744455a3b 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go index b82093322..e00af70ee 100644 --- a/clientv3/mirror/syncer.go +++ b/clientv3/mirror/syncer.go @@ -18,7 +18,7 @@ package mirror import ( "context" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) const ( diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go index 13dd83a24..aadeb6fd7 100644 --- a/clientv3/namespace/kv.go +++ b/clientv3/namespace/kv.go @@ -17,9 +17,9 @@ package namespace import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type kvPrefix struct { diff --git a/clientv3/namespace/lease.go b/clientv3/namespace/lease.go index f092106cb..fa210ee16 100644 --- a/clientv3/namespace/lease.go +++ b/clientv3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) type leasePrefix struct { diff --git a/clientv3/namespace/watch.go b/clientv3/namespace/watch.go index 5a9596df5..d5dfef54c 100644 --- a/clientv3/namespace/watch.go +++ b/clientv3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) type watcherPrefix struct { diff --git a/clientv3/naming/doc.go b/clientv3/naming/doc.go index 71608cc73..f274fca09 100644 --- a/clientv3/naming/doc.go +++ b/clientv3/naming/doc.go @@ -17,8 +17,8 @@ // To use, first import the packages: // // import ( -// "github.com/coreos/etcd/clientv3" -// etcdnaming "github.com/coreos/etcd/clientv3/naming" +// "go.etcd.io/etcd/clientv3" +// etcdnaming "go.etcd.io/etcd/clientv3/naming" // // "google.golang.org/grpc" // "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go index 3c0e8e664..c74659df2 100644 --- a/clientv3/naming/grpc.go +++ b/clientv3/naming/grpc.go @@ -19,7 +19,7 @@ import ( "encoding/json" "fmt" - etcd "github.com/coreos/etcd/clientv3" + etcd "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index d0157f132..66a1feae0 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - etcd "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + etcd "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/naming" ) diff --git a/clientv3/op.go b/clientv3/op.go index 0be90a54b..a3e7d3e77 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -14,7 +14,7 @@ package clientv3 -import pb "github.com/coreos/etcd/etcdserver/etcdserverpb" +import pb "go.etcd.io/etcd/etcdserver/etcdserverpb" type opType int diff --git a/clientv3/op_test.go b/clientv3/op_test.go index de533f954..468893dd4 100644 --- a/clientv3/op_test.go +++ b/clientv3/op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified, diff --git a/clientv3/ordering/kv.go b/clientv3/ordering/kv.go index dc9926ec6..951bd10ab 100644 --- a/clientv3/ordering/kv.go +++ b/clientv3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) // kvOrdering ensures that serialized requests do not return diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go index ebe802334..01a80fc52 100644 --- a/clientv3/ordering/kv_test.go +++ b/clientv3/ordering/kv_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestDetectKvOrderViolation(t *testing.T) { diff --git a/clientv3/ordering/logger_test.go b/clientv3/ordering/logger_test.go index 798172ec2..6ee25f004 100644 --- a/clientv3/ordering/logger_test.go +++ b/clientv3/ordering/logger_test.go @@ -17,7 +17,7 @@ package ordering import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/ordering/util.go b/clientv3/ordering/util.go index 124aebf41..f08740cb4 100644 --- a/clientv3/ordering/util.go +++ b/clientv3/ordering/util.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error diff --git a/clientv3/ordering/util_test.go b/clientv3/ordering/util_test.go index a370e0d07..f903baae8 100644 --- a/clientv3/ordering/util_test.go +++ b/clientv3/ordering/util_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" ) func TestEndpointSwitchResolvesViolation(t *testing.T) { diff --git a/clientv3/retry.go b/clientv3/retry.go index 6118aa55a..38ad00ac9 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index af38998af..f8ebe44e4 100644 --- a/clientv3/retry_interceptor.go +++ b/clientv3/retry_interceptor.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/snapshot/member_test.go b/clientv3/snapshot/member_test.go index 713297a97..a42066a56 100644 --- a/clientv3/snapshot/member_test.go +++ b/clientv3/snapshot/member_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/pkg/testutil" ) // TestSnapshotV3RestoreMultiMemberAdd ensures that multiple members diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index 10bfd00da..a3b02adf3 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -27,21 +27,21 @@ import ( "reflect" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "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/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "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" bolt "github.com/coreos/bbolt" "go.uber.org/zap" diff --git a/clientv3/snapshot/v3_snapshot_test.go b/clientv3/snapshot/v3_snapshot_test.go index dc1c892ec..cd63cdfb0 100644 --- a/clientv3/snapshot/v3_snapshot_test.go +++ b/clientv3/snapshot/v3_snapshot_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/clientv3/txn.go b/clientv3/txn.go index c3c2d2485..c19715da4 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,7 +18,7 @@ import ( "context" "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go index d48151612..46a4971ff 100644 --- a/clientv3/txn_test.go +++ b/clientv3/txn_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestTxnPanics(t *testing.T) { diff --git a/clientv3/watch.go b/clientv3/watch.go index a224ddc3b..c8d7e664a 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3rpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -67,7 +67,7 @@ type Watcher interface { // TODO: explicitly set context error in the last "WatchResponse" message and close channel? // Currently, client contexts are overwritten with "valCtx" that never closes. // TODO(v3.4): configure watch retry policy, limit maximum retry number - // (see https://github.com/coreos/etcd/issues/8980) + // (see https://go.etcd.io/etcd/issues/8980) Watch(ctx context.Context, key string, opts ...OpOption) WatchChan // RequestProgress requests a progress notify response be sent in all watch channels. diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go index 8d3380522..a22858bc7 100644 --- a/clientv3/watch_test.go +++ b/clientv3/watch_test.go @@ -17,7 +17,7 @@ package clientv3 import ( "testing" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func TestEvent(t *testing.T) { diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go index 4f5c0fde1..35bd84fb5 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -22,8 +22,8 @@ import ( "github.com/ghodss/yaml" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/tlsutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/tlsutil" ) type yamlConfig struct { diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go index 10d3a5d9b..86d27d397 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // Handler for a http based key-value store backed by raft diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index 988e22935..f780acc59 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "github.com/coreos/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 582692469..6b6f064a3 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index a57305746..9a270eac7 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,15 +24,15 @@ import ( "strconv" "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" ) diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index 16b5a4e77..f452efae8 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) type cluster struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 666c7424c..5ab4817c7 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "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 diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go index 111b0b40c..e0c02e67d 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "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 ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 93cc61b4f..90189ba7c 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -17,9 +17,9 @@ package recipe import ( "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 diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go index 2d5a32f84..891ff7d69 100644 --- a/contrib/recipes/key.go +++ b/contrib/recipes/key.go @@ -20,8 +20,8 @@ import ( "strings" "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 diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index 2378ce2f8..4116a8702 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -18,8 +18,8 @@ import ( "context" "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. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index 5d0423a42..e374f000d 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "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. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 1213b7e42..97a24c749 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "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 { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 536787227..025d73c5a 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "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. diff --git a/contrib/systemd/etcd2-backup-coreos/.gitignore b/contrib/systemd/etcd2-backup-coreos/.gitignore deleted file mode 100644 index 3f3c6fba3..000000000 --- a/contrib/systemd/etcd2-backup-coreos/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -rclone.conf -bin -etcd2-backup.tgz -*~ diff --git a/contrib/systemd/etcd2-backup-coreos/30-etcd2-backup-restore.conf b/contrib/systemd/etcd2-backup-coreos/30-etcd2-backup-restore.conf deleted file mode 100644 index 1bba94aec..000000000 --- a/contrib/systemd/etcd2-backup-coreos/30-etcd2-backup-restore.conf +++ /dev/null @@ -1,9 +0,0 @@ -[Service] -Environment="ETCD_RESTORE_MASTER_ADV_PEER_URLS=http://172.17.4.51:2379" -Environment="RCLONE_ENDPOINT=s3-chom-testing-backups:chom-testing-backups/mytest" -Environment="RCLONE_CONFIG_PATH=/etc/rclone.conf" -Environment="ETCD_DATA_DIR=/var/lib/etcd2" -Environment="ETCD_BACKUP_DIR=/var/lib/etcd2-backup" -Environment="ETCD_RESTORE_DIR=/var/lib/etcd2-restore" -Environment="RCLONE_CHECKSUM=true" - diff --git a/contrib/systemd/etcd2-backup-coreos/README.md b/contrib/systemd/etcd2-backup-coreos/README.md deleted file mode 100644 index 75f5c7d2d..000000000 --- a/contrib/systemd/etcd2-backup-coreos/README.md +++ /dev/null @@ -1,251 +0,0 @@ -# etcd2-backup-coreos - -Remote backup and multi-node restore services for etcd2 clusters on CoreOS Linux. - -**Warning:** This package is only intended for use on CoreOS Linux. - -## Terminology - -**Founding member** : The node which is the first member of the new recovered cluster. It is this node's rclone backup data (only) that will be used to restore the cluster. The rest of the nodes will join the cluster with no data, and simply catch up with the **founding member**. - -## Configuration - -Before installing etcd2-backup, configure `30-etcd2-backup-restore.conf`: - -``` -[Service] -Environment="ETCD_RESTORE_MASTER_ADV_PEER_URLS=" -Environment="RCLONE_ENDPOINT=remote-name:path/to/backups" -``` - -Assuming a deployment to CoreOS with etcd2, only change: - -* `ETCD_RESTORE_MASTER_ADV_PEER_URLS` - This is the new advertised peer url of the new etcd2 node that will be the founding member of the new restored cluster. We will call this node the **founding member**. - -* `RCLONE_ENDPOINT` - The rclone endpoint to which backups will be stored. - - Feel free to point any number of machines at the same RCLONE_ENDPOINT, path and all. Backups for each machine are stored in a sub-folder named with the machine ID (%m in systemd parlance) - -* `./rclone.conf` - The rclone configuration file which will be installed. Must list a `[section]` which matches `RCLONE_ENDPOINT`'s remote-name component. - - An easy way to generate this config file is to [install rclone](http://rclone.org/install/) on a local machine. Then follow the [configuration instructions](http://rclone.org/docs/) to generate an `rclone.conf` file. - -To adjust backup frequency, edit `./etcd2-backup.timer` - -## Installation - -Once those things are configured, run `./build`. - -The `build` script generates a tarball for copying to CoreOS instances. The tarball contains the `etcd2-backup-install` script. - -After extracting the contents of the tar file and running the install script, three new systemd services are added. One service, `etcd2-backup`, performs periodic etcd backups, while the other two services, `etcd2-restore` and `etcd2-join`, handle restore procedures. - -* `etcd2-backup.service` - A oneshot service which calls `etcdctl backup` and syncs the backups to the rclone endpoint (using an rclone container, of course). `etcd2-backup.timer` is responsible for periodically running this service. - -* `etcd2-restore.service` - A oneshot service which wipes all etcd2 data and restores a single-node cluster from the rclone backup. This is for restoring the **founding member** only. - -* `etcd2-join.service` - A oneshot service which wipes all etcd2 data and re-joins the new cluster. This is for adding members **after** the **founding member** has successfully established the new cluster via `etcd2-restore.service` - -## Recovery - -This assumes that the cluster has lost quorum and is not recoverable. Otherwise try to heal the cluster first. - -### Backup Freshness - -Two factors contribute to the relative freshness or staleness of a backup. The `etcd2-backup.timer` takes a backup every 30 seconds by default, and the etcd `snapshot-count` option controls how many transactions are committed between each write of the snapshot to permanent storage. Given those parameters, we can compute the upper bound on the outdatedness of a backup. -Assumptions: -* transaction rate is a constant `1000 transactions / second` -* `etcd2-backup.timer` is configured for a 30 second interval -* `etcd2 snapshot-count=10000` - -``` -max-missed-seconds= (10000 transactions / (1000 transactions / second)) + 30 seconds = 40 seconds -``` - -### Recovery Procedure - -1. Make sure `etcd2.service` and `etcd2-backup.timer` are stopped on all nodes in the cluster - -2. Restore the **founding member** by starting `etcd2-restore.service` and then, if successful, `etcd2.service` - -3. Restore the rest of the cluster **one at a time**. Start `etcd2-join.service`, and then, if successful, `etcd2.service`. Please verify with `etcdctl cluster-health` that the expected set of nodes is present and healthy after each node joins. - -4. Verify that the data is sane (enough). If so, kick off `etcd2-backup.timer` on all nodes and, hopefully, go back to bed. - -## Retroactively change the founding member - -It is necessary to change the cluster's founding member in order to restore a cluster from any other node's data. - -Change the value of `ETCD_RESTORE_MASTER_ADV_PEER_URLS` in `30-etcd2-backup-restore.conf` to the advertised peer url of the new founding member. Repeat the install process above on all nodes in the cluster, then proceed with the [recovery procedure](README.md#recovery-procedure). - -## Example - -Let's pretend that we have an initial 3 node CoreOS cluster that we want to back up to S3. - - -| ETCD_NAME | ETCD_ADVERTISED_PEER_URL | -| ------------- |:-------------:| -| e1 | http://172.17.4.51:2379 | -| e2 | http://172.17.4.52:2379 | -| e3 | http://172.17.4.53:2379 | - -In the event that the cluster fails, we want to restore from `e1`'s backup - -## Configuration - -``` -[Service] -Environment="ETCD_RESTORE_MASTER_ADV_PEER_URLS=http://172.17.4.51:2379" -Environment="RCLONE_ENDPOINT=s3-testing-conf:s3://etcd2-backup-bucket/backups" -``` - -The `./rclone.conf` file must contain a `[section]` matching `RCLONE_ENDPOINTS`'s remote-name component. - -``` -[s3-testing-conf] -type = s3 -access_key_id = xxxxxxxx -secret_access_key = xxxxxx -region = us-west-1 -endpoint = -location_constraint = -``` - -## Installation - -```sh -cd etcd2-backup -./build -scp etcd2-backup.tgz core@e1:~/ -ssh core@e1 -e1 $ mkdir -p ~/etcd2-backup -e1 $ mv etcd2-backup.tgz etcd2-backup/ -e1 $ cd etcd2-backup -e1 $ tar zxvf ~/etcd2-backup.tgz -e1 $ ./etcd2-backup-install -# Only do the following two commands if this node should generate backups -e1 $ sudo systemctl enable etcd2-backup.timer -e1 $ sudo systemctl start etcd2-backup.timer - -e1 $ exit -``` - -Now `e1`'s etcd data will be backed up to `s3://etcd2-backup-bucket/backups//` according to the schedule described in `etcd2-backup.timer`. - -Repeat the process for `e2` and `e3`. To stop a node from generating backups, omit enabling and starting `etcd2-backup.timer`. - -## Restore the cluster - -Let's assume that a mischievous friend decided it would be a good idea to corrupt the etcd2 data-dir on ALL of the nodes (`e1`,`e2`,`e3`). Simply restore the cluster from `e1`'s backup. - -Here's how to recover: - -```sh -# First, ENSURE etcd2 and etcd2-backup are not running on any nodes -for node in e{1..3};do - ssh core@$node "sudo systemctl stop etcd2.service etcd2-backup.{timer,service}" -done - -ssh core@e1 "sudo systemctl start etcd2-restore.service && sudo systemctl start etcd2.service" - -for node in e{2..3};do - ssh core@$node "sudo systemctl start etcd2-join.service && sudo systemctl start etcd2.service" - sleep 10 -done -``` - -After e2 and e3 finish catching up, the cluster should be back to normal. - -## Migrate the cluster - -The same friend who corrupted the etcd2 data-dirs decided that to have more fun. This time, the friend dumps coffee on the machines hosting `e1`, `e2` and `e3`. There is a horrible smell, and the machines are dead. - -Luckily, there's a new 3-node etcd2 cluster ready to go, along with the S3 backup for `e1` from the old cluster. - -The new cluster configuration looks like this. Assume that etcd2-backup is not installed. (If it is, make sure it's not running on any nodes) - -| ETCD_NAME | ETCD_ADVERTISED_PEER_URL | -| ------------- |:-------------:| -| q1 | http://172.17.8.201:2379 | -| q2 | http://172.17.8.202:2379 | -| q3 | http://172.17.8.203:2379 | - -We will assume `q1` is the chosen founding member, though picking any node is fine. - -## Migrate the remote backup - -First, copy the backup from `e1`'s backup folder to `q1`'s backup folder. I will show the S3 example. - -```sh -# Make sure to remove q1's backup directory, if it exists already -aws s3 rm --recursive s3://etcd2-backup-bucket/backups/ -aws s3 cp --recursive s3://etcd2-backup-bucket/backups/ s3://etcd2-backup-bucket/backups/ -``` - -## Configure the New Cluster - -``` -[Service] -Environment="ETCD_RESTORE_MASTER_ADV_PEER_URLS=http://172.17.8.201:2379" -Environment="RCLONE_ENDPOINT=s3-testing-conf:s3://etcd2-backup-bucket/backups" -``` - -Since this is a new cluster, each new node will have a new `machine-id` and will not clobber the backups from the old cluster, even though `RCLONE_ENDPOINT` is the same for both the old `e` cluster and the new `q` cluster. - -## Installation - -We first want to install the configured etcd2-backup package on all nodes, but not start any services yet. - -```sh -cd etcd2-backup -./build -for node in q{1..3};do - scp etcd2-backup.tgz core@$node:~/ - ssh core@$node "mkdir -p ~/etcd2-backup" - ssh core@$node "mv etcd2-backup.tgz etcd2-backup/" - ssh core@$node " cd etcd2-backup" - ssh core@$node " tar zxvf ~/etcd2-backup.tgz" - ssh core@$node " ./etcd2-backup-install" -done -``` - -## Migrate the Cluster - -With `q1` as the founding member. - -```sh -# First, make SURE etcd2 and etcd2-backup are not running on any nodes - -for node in q{1..3};do - ssh core@$node "sudo systemctl stop etcd2.service" -done - -ssh core@q1 "sudo systemctl start etcd2-restore.service && sudo systemctl start etcd2.service" - -for node in q{2..3};do - ssh core@$node "sudo systemctl start etcd2-join.service && sudo systemctl start etcd2.service" - sleep 10 -done -``` - -After confirming the cluster has migrated properly, start and enable `etcd2-backup.timer` on at least one node. - -```sh -ssh core@q1 "sudo systemctl enable etcd2-backup.service && sudo systemctl start etcd2-backup.service" -``` - -There should now be periodic backups going to: `s3://etcd2-backup-bucket/backups/` - -## Words of caution - -1. Notice the `sleep 10` commands that follow starting `etcd2-join.service` and then `etcd2.service`. This sleep is there to allow the member that joined to cluster time to catch up on the cluster state before we attempt to add the next member. This involves sending the entire snapshot over the network. If the dataset is large, the network between nodes is slow, disks are already bogged down, or the system is otherwise overutilized, try increasing the sleep. - - In the case of large data sets, it is recommended to copy the data directory produced by `etcd2-restore` on the founding member to the other nodes before running `etcd2-join` on them. This will avoid etcd transferring the entire snapshot to every node after it joins the cluster. - -2. It is not recommended clients be allowed to access the etcd2 cluster **until** all members have been added and finished catching up. diff --git a/contrib/systemd/etcd2-backup-coreos/build b/contrib/systemd/etcd2-backup-coreos/build deleted file mode 100755 index 144f9bdd8..000000000 --- a/contrib/systemd/etcd2-backup-coreos/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd "${SCRIPT_DIR}" - -if [ ! -f "./rclone.conf" ];then - echo "Could not find $(pwd)/rclone.conf" - exit 1 -fi - -mkdir -p ./bin - -GOPATH=$(pwd) go build -o ./bin/etcd2-restore etcd2-restore.go - -tar cfz ./etcd2-backup.tgz \ - *.{service,timer,conf} \ - etcd2-join \ - bin/etcd2-restore \ - rclone.conf \ - etcd2-backup-install - -printf "Install package saved at\n\t -> $(pwd)/etcd2-backup.tgz\n\n" - -printf "Copy to target machine and deploy.\n $> tar zxvf etcd2-backup.tgz && ./etcd2-backup-install\n\n" -echo "WARNING: this tarball contains your rclone secrets. Be careful!" diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-backup-install b/contrib/systemd/etcd2-backup-coreos/etcd2-backup-install deleted file mode 100755 index 50afbf5f7..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-backup-install +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -e - -if [ ! -f /etc/os-release ];then - echo "Could not find /etc/os-release. This is not CoreOS Linux" - exit 1 -fi -. /etc/os-release -if [ ! "$ID" == "coreos" ];then - echo "os-release error: Detected ID=$ID: this is not CoreOS Linux" - exit 1 -fi - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd "${SCRIPT_DIR}" - -sudo cp ./rclone.conf /etc/ - -sudo mkdir -p /opt/bin - -sudo mv etcd2-join bin/etcd2-restore /opt/bin -sudo mv *.{service,timer} /etc/systemd/system - -sudo systemctl daemon-reload - -for jobtype in restore backup join;do - sudo mkdir -p /var/run/systemd/system/etcd2-${jobtype}.service.d - sudo cp 30-etcd2-backup-restore.conf /var/run/systemd/system/etcd2-${jobtype}.service.d/ - sudo ln -sf /var/run/systemd/system/etcd2{,-${jobtype}}.service.d/20-cloudinit.conf -done - -sudo systemctl daemon-reload - -echo "etcd2-backup install complete!" diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-backup.service b/contrib/systemd/etcd2-backup-coreos/etcd2-backup.service deleted file mode 100644 index 2aa2b5f23..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-backup.service +++ /dev/null @@ -1,29 +0,0 @@ -[Unit] -Description=rclone powered etcd2 backup service -After=etcd2.service - -[Service] -Type=oneshot - -ExecStartPre=/usr/bin/rm -rf ${ETCD_BACKUP_DIR} -ExecStartPre=/usr/bin/mkdir -p ${ETCD_BACKUP_DIR}/member/snap -ExecStartPre=/usr/bin/echo ETCD_DATA_DIR: ${ETCD_DATA_DIR} -ExecStartPre=/usr/bin/echo ETCD_BACKUP_DIR: ${ETCD_BACKUP_DIR} -ExecStartPre=/usr/bin/etcdctl backup --data-dir=${ETCD_DATA_DIR} --backup-dir=${ETCD_BACKUP_DIR} -ExecStartPre=/usr/bin/touch ${ETCD_BACKUP_DIR}/member/snap/iamhere.txt - -# Copy the last backup, in case the new upload gets corrupted -ExecStartPre=-/usr/bin/docker run --rm \ - -v ${RCLONE_CONFIG_PATH}:/etc/rclone.conf \ - quay.io/coreos/rclone:latest --config /etc/rclone.conf --checksum=${RCLONE_CHECKSUM} \ - copy ${RCLONE_ENDPOINT}/%m ${RCLONE_ENDPOINT}/%m_backup - -# Upload new backup -ExecStart=/usr/bin/docker run --rm \ - -v ${ETCD_BACKUP_DIR}:/etcd2backup \ - -v ${RCLONE_CONFIG_PATH}:/etc/rclone.conf \ - quay.io/coreos/rclone:latest --config ${RCLONE_CONFIG_PATH} --checksum=${RCLONE_CHECKSUM} \ - copy /etcd2backup/ ${RCLONE_ENDPOINT}/%m/ - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-backup.timer b/contrib/systemd/etcd2-backup-coreos/etcd2-backup.timer deleted file mode 100644 index 8d2feff9f..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-backup.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=etcd2-backup service timer - -[Timer] -OnBootSec=1min -OnUnitActiveSec=30sec - -[Install] -WantedBy=timers.target diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-join b/contrib/systemd/etcd2-backup-coreos/etcd2-join deleted file mode 100755 index 7773f2cda..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-join +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e - -# Copyright 2015 CoreOS, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http:#www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [ $# -lt 3 ];then - echo "USAGE: $0 " - exit 1 -fi - -function convertDropin { - sed -e 's/^Added.*$/[Service]/g' -e 's/="/=/g' -e 's/^ETCD_/Environment="ETCD_/g' -} -masterAdvUrl=$1 -targetName=$2 -targetUrl=$3 - -cmd="etcdctl --peers ${masterAdvUrl} member add ${targetName} ${targetUrl}" - -ENV_VARS=`$cmd` -echo "${ENV_VARS}" | convertDropin > 40-boostrap-cluster.conf - -sudo mv 40-boostrap-cluster.conf /var/run/systemd/system/etcd2.service.d/ -sudo systemctl daemon-reload -sudo systemctl cat etcd2.service -echo "You can now start etcd2" - - diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-join.service b/contrib/systemd/etcd2-backup-coreos/etcd2-join.service deleted file mode 100644 index ba4450654..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-join.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Add etcd2 node to existing cluster -Conflicts=etcd2.service etcd2-backup.service -Before=etcd2.service etcd2-backup.service - -[Service] -Type=oneshot -ExecStartPre=/usr/bin/rm -rf ${ETCD_DATA_DIR}/member -ExecStartPre=/usr/bin/chown -R etcd:etcd ${ETCD_DATA_DIR} -ExecStart=/opt/bin/etcd2-join ${ETCD_RESTORE_MASTER_ADV_PEER_URLS} ${ETCD_NAME} ${ETCD_INITIAL_ADVERTISE_PEER_URLS} - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-restore.go b/contrib/systemd/etcd2-backup-coreos/etcd2-restore.go deleted file mode 100644 index d4916a505..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-restore.go +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright 2015 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package main - -import ( - "flag" - "fmt" - "os" - "os/exec" - "path" - "regexp" - "time" -) - -var ( - etcdctlPath string - etcdPath string - etcdRestoreDir string - etcdName string - etcdPeerUrls string -) - -func main() { - flag.StringVar(&etcdctlPath, "etcdctl-path", "/usr/bin/etcdctl", "absolute path to etcdctl executable") - flag.StringVar(&etcdPath, "etcd-path", "/usr/bin/etcd2", "absolute path to etcd2 executable") - flag.StringVar(&etcdRestoreDir, "etcd-restore-dir", "/var/lib/etcd2-restore", "absolute path to etcd2 restore dir") - flag.StringVar(&etcdName, "etcd-name", "default", "name of etcd2 node") - flag.StringVar(&etcdPeerUrls, "etcd-peer-urls", "", "advertise peer urls") - - flag.Parse() - - if etcdPeerUrls == "" { - panic("must set -etcd-peer-urls") - } - - if finfo, err := os.Stat(etcdRestoreDir); err != nil { - panic(err) - } else { - if !finfo.IsDir() { - panic(fmt.Errorf("%s is not a directory", etcdRestoreDir)) - } - } - - if !path.IsAbs(etcdctlPath) { - panic(fmt.Sprintf("etcdctl-path %s is not absolute", etcdctlPath)) - } - - if !path.IsAbs(etcdPath) { - panic(fmt.Sprintf("etcd-path %s is not absolute", etcdPath)) - } - - if err := restoreEtcd(); err != nil { - panic(err) - } -} - -func restoreEtcd() error { - etcdCmd := exec.Command(etcdPath, "--force-new-cluster", "--data-dir", etcdRestoreDir) - - etcdCmd.Stdout = os.Stdout - etcdCmd.Stderr = os.Stderr - - if err := etcdCmd.Start(); err != nil { - return fmt.Errorf("Could not start etcd2: %s", err) - } - defer etcdCmd.Wait() - defer etcdCmd.Process.Kill() - - return runCommands(10, 2*time.Second) -} - -var ( - clusterHealthRegex = regexp.MustCompile(".*cluster is healthy.*") - lineSplit = regexp.MustCompile("\n+") - colonSplit = regexp.MustCompile(`\:`) -) - -func runCommands(maxRetry int, interval time.Duration) error { - var retryCnt int - for retryCnt = 1; retryCnt <= maxRetry; retryCnt++ { - out, err := exec.Command(etcdctlPath, "cluster-health").CombinedOutput() - if err == nil && clusterHealthRegex.Match(out) { - break - } - fmt.Printf("Error: %s: %s\n", err, string(out)) - time.Sleep(interval) - } - - if retryCnt > maxRetry { - return fmt.Errorf("Timed out waiting for healthy cluster\n") - } - - var ( - memberID string - out []byte - err error - ) - if out, err = exec.Command(etcdctlPath, "member", "list").CombinedOutput(); err != nil { - return fmt.Errorf("Error calling member list: %s", err) - } - members := lineSplit.Split(string(out), 2) - if len(members) < 1 { - return fmt.Errorf("Could not find a cluster member from: \"%s\"", members) - } - parts := colonSplit.Split(members[0], 2) - if len(parts) < 2 { - return fmt.Errorf("Could not parse member id from: \"%s\"", members[0]) - } - memberID = parts[0] - - out, err = exec.Command(etcdctlPath, "member", "update", memberID, etcdPeerUrls).CombinedOutput() - fmt.Printf("member update result: %s\n", string(out)) - return err -} diff --git a/contrib/systemd/etcd2-backup-coreos/etcd2-restore.service b/contrib/systemd/etcd2-backup-coreos/etcd2-restore.service deleted file mode 100644 index a591f7838..000000000 --- a/contrib/systemd/etcd2-backup-coreos/etcd2-restore.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Restore single-node etcd2 node from rclone endpoint -Conflicts=etcd2.service etcd2-backup.service -Before=etcd2.service etcd2-backup.service - -[Service] -Type=oneshot -ExecStartPre=/usr/bin/rm -rf ${ETCD_DATA_DIR}/member -ExecStartPre=/usr/bin/mkdir -p ${ETCD_RESTORE_DIR} -ExecStartPre=/usr/bin/rm -rf ${ETCD_RESTORE_DIR}/member - -# Copy the last backup from rclone endpoint -ExecStartPre=/usr/bin/docker run --rm \ - -v ${RCLONE_CONFIG_PATH}:/etc/rclone.conf \ - -v ${ETCD_RESTORE_DIR}:/etcd2backup \ - quay.io/coreos/rclone:latest \ - --config /etc/rclone.conf --checksum=${RCLONE_CHECKSUM} \ - copy ${RCLONE_ENDPOINT}/%m /etcd2backup - -ExecStartPre=/usr/bin/ls -R ${ETCD_RESTORE_DIR} -ExecStartPre=/opt/bin/etcd2-restore -etcd-name ${ETCD_NAME} -etcd-peer-urls ${ETCD_INITIAL_ADVERTISE_PEER_URLS} -ExecStartPre=/usr/bin/cp -r ${ETCD_RESTORE_DIR}/member ${ETCD_DATA_DIR}/member -ExecStart=/usr/bin/chown -R etcd:etcd ${ETCD_DATA_DIR}/member - -[Install] -WantedBy=multi-user.target diff --git a/embed/config.go b/embed/config.go index 0fccc74bf..00e59ea18 100644 --- a/embed/config.go +++ b/embed/config.go @@ -27,14 +27,14 @@ import ( "sync" "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" "go.uber.org/zap" @@ -162,7 +162,7 @@ type Config struct { // // 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"` QuotaBackendBytes int64 `json:"quota-backend-bytes"` @@ -246,7 +246,7 @@ type Config struct { // CVE-2018-5702 reference: // - https://bugs.chromium.org/p/project-zero/issues/detail?id=1447#c2 // - 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{} // UserHandlers is for registering users handlers and only used for diff --git a/embed/config_logging.go b/embed/config_logging.go index 3cd92ce6d..0c927743d 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -24,7 +24,7 @@ import ( "sort" "sync" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -93,7 +93,7 @@ func (cfg *Config) setupLogging() error { // TODO: deprecate with "capnslog" if cfg.LogPkgLevels != "" { - repoLog := capnslog.MustRepoLogger("github.com/coreos/etcd") + repoLog := capnslog.MustRepoLogger("go.etcd.io/etcd") settings, err := repoLog.ParseLogLevelConfig(cfg.LogPkgLevels) if err != nil { plog.Warningf("couldn't parse log level string: %s, continuing with default levels", err.Error()) diff --git a/embed/config_logging_journal_unix.go b/embed/config_logging_journal_unix.go index ff9ddd055..44a51d677 100644 --- a/embed/config_logging_journal_unix.go +++ b/embed/config_logging_journal_unix.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "go.uber.org/zap/zapcore" ) diff --git a/embed/config_test.go b/embed/config_test.go index 3202b2e63..3eb411b3a 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/ghodss/yaml" ) diff --git a/embed/doc.go b/embed/doc.go index c555aa58e..4811bb634 100644 --- a/embed/doc.go +++ b/embed/doc.go @@ -21,7 +21,7 @@ Launch an embedded etcd server using the configuration defaults: "log" "time" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" ) func main() { diff --git a/embed/etcd.go b/embed/etcd.go index 5a79f0bee..88086d2ae 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,18 +29,18 @@ import ( "sync" "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/grpc-ecosystem/go-grpc-prometheus" @@ -50,7 +50,7 @@ import ( "google.golang.org/grpc/keepalive" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed") const ( // 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 // 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 { shutdownNow() return diff --git a/embed/serve.go b/embed/serve.go index 4b283568d..1399a62f3 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,19 +23,19 @@ import ( "net/http" "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" "github.com/soheilhy/cmux" diff --git a/embed/serve_test.go b/embed/serve_test.go index d46631fcf..388564567 100644 --- a/embed/serve_test.go +++ b/embed/serve_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/auth" + "go.etcd.io/etcd/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/embed/util.go b/embed/util.go index d76b596ee..40f3ce9d5 100644 --- a/embed/util.go +++ b/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go index 96a17738f..75823b203 100644 --- a/etcdctl/ctlv2/command/auth_commands.go +++ b/etcdctl/ctlv2/command/auth_commands.go @@ -19,8 +19,8 @@ import ( "os" "strings" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) func NewAuthCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 7e423fe82..fbedb40a3 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,15 +23,15 @@ import ( "regexp" "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" "github.com/urfave/cli" diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index ec0bb241d..bfe8d698f 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -24,7 +24,7 @@ import ( "os/signal" "time" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go index e673fa39c..ca4f1e9b8 100644 --- a/etcdctl/ctlv2/command/error.go +++ b/etcdctl/ctlv2/command/error.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) const ( diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go index cc3478cc3..4cc859820 100644 --- a/etcdctl/ctlv2/command/exec_watch_command.go +++ b/etcdctl/ctlv2/command/exec_watch_command.go @@ -22,7 +22,7 @@ import ( "os/exec" "os/signal" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/command/format.go b/etcdctl/ctlv2/command/format.go index 4a5d4a6a4..5e15554a1 100644 --- a/etcdctl/ctlv2/command/format.go +++ b/etcdctl/ctlv2/command/format.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) // printResponseKey only supports to print key correctly. diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go index 7f1fc4db1..fa87498ce 100644 --- a/etcdctl/ctlv2/command/get_command.go +++ b/etcdctl/ctlv2/command/get_command.go @@ -19,8 +19,8 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewGetCommand returns the CLI command for "get". diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go index b2e94fb93..f81bcbf8a 100644 --- a/etcdctl/ctlv2/command/ls_command.go +++ b/etcdctl/ctlv2/command/ls_command.go @@ -17,8 +17,8 @@ package command import ( "fmt" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) func NewLsCommand() cli.Command { diff --git a/etcdctl/ctlv2/command/member_commands.go b/etcdctl/ctlv2/command/member_commands.go index 84747873b..4ed78cc8d 100644 --- a/etcdctl/ctlv2/command/member_commands.go +++ b/etcdctl/ctlv2/command/member_commands.go @@ -164,7 +164,7 @@ func actionMemberRemove(c *cli.Context) error { if m.Name == removalID { // 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, "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 { diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go index f62415350..74d21c9f7 100644 --- a/etcdctl/ctlv2/command/mk_command.go +++ b/etcdctl/ctlv2/command/mk_command.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewMakeCommand returns the CLI command for "mk". diff --git a/etcdctl/ctlv2/command/mkdir_command.go b/etcdctl/ctlv2/command/mkdir_command.go index 1d17b7b91..04178a025 100644 --- a/etcdctl/ctlv2/command/mkdir_command.go +++ b/etcdctl/ctlv2/command/mkdir_command.go @@ -18,8 +18,8 @@ import ( "errors" "time" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewMakeDirCommand returns the CLI command for "mkdir". diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go index c6f173be7..86ade29f0 100644 --- a/etcdctl/ctlv2/command/rm_command.go +++ b/etcdctl/ctlv2/command/rm_command.go @@ -17,8 +17,8 @@ package command import ( "errors" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewRemoveCommand returns the CLI command for "rm". diff --git a/etcdctl/ctlv2/command/rmdir_command.go b/etcdctl/ctlv2/command/rmdir_command.go index cb3089548..5565bf1fe 100644 --- a/etcdctl/ctlv2/command/rmdir_command.go +++ b/etcdctl/ctlv2/command/rmdir_command.go @@ -17,8 +17,8 @@ package command import ( "errors" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewRemoveDirCommand returns the CLI command for "rmdir". diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go index 838b04062..0a008a9e5 100644 --- a/etcdctl/ctlv2/command/role_commands.go +++ b/etcdctl/ctlv2/command/role_commands.go @@ -20,9 +20,9 @@ import ( "reflect" "strings" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/pathutil" "github.com/urfave/cli" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/pathutil" ) func NewRoleCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go index f7bb6bd53..7eb5ae6a5 100644 --- a/etcdctl/ctlv2/command/set_command.go +++ b/etcdctl/ctlv2/command/set_command.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewSetCommand returns the CLI command for "set". diff --git a/etcdctl/ctlv2/command/set_dir_command.go b/etcdctl/ctlv2/command/set_dir_command.go index aba66b089..a65f92230 100644 --- a/etcdctl/ctlv2/command/set_dir_command.go +++ b/etcdctl/ctlv2/command/set_dir_command.go @@ -15,8 +15,8 @@ package command import ( - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewSetDirCommand returns the CLI command for "setDir". diff --git a/etcdctl/ctlv2/command/update_command.go b/etcdctl/ctlv2/command/update_command.go index ed4224892..7c20fcb88 100644 --- a/etcdctl/ctlv2/command/update_command.go +++ b/etcdctl/ctlv2/command/update_command.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewUpdateCommand returns the CLI command for "update". diff --git a/etcdctl/ctlv2/command/update_dir_command.go b/etcdctl/ctlv2/command/update_dir_command.go index 72411dfba..3783d919d 100644 --- a/etcdctl/ctlv2/command/update_dir_command.go +++ b/etcdctl/ctlv2/command/update_dir_command.go @@ -18,8 +18,8 @@ import ( "errors" "time" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) // NewUpdateDirCommand returns the CLI command for "updatedir". diff --git a/etcdctl/ctlv2/command/user_commands.go b/etcdctl/ctlv2/command/user_commands.go index c0fb900b2..73ebb4d50 100644 --- a/etcdctl/ctlv2/command/user_commands.go +++ b/etcdctl/ctlv2/command/user_commands.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/bgentry/speakeasy" - "github.com/coreos/etcd/client" "github.com/urfave/cli" + "go.etcd.io/etcd/client" ) func NewUserCommands() cli.Command { diff --git a/etcdctl/ctlv2/command/util.go b/etcdctl/ctlv2/command/util.go index 133b4000e..4ac8481e8 100644 --- a/etcdctl/ctlv2/command/util.go +++ b/etcdctl/ctlv2/command/util.go @@ -28,8 +28,8 @@ import ( "syscall" "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/urfave/cli" diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index eac63b040..dc0fe2d11 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -21,7 +21,7 @@ import ( "os" "os/signal" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index e99ba59e1..9cbf0c55a 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,8 +20,8 @@ import ( "os" "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" ) diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go index 2befbc2aa..42b85bb29 100644 --- a/etcdctl/ctlv3/command/alarm_command.go +++ b/etcdctl/ctlv3/command/alarm_command.go @@ -17,8 +17,8 @@ package command import ( "fmt" - v3 "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + v3 "go.etcd.io/etcd/clientv3" ) // NewAlarmCommand returns the cobra command for "alarm". diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go index f9a909049..57025a052 100644 --- a/etcdctl/ctlv3/command/auth_command.go +++ b/etcdctl/ctlv3/command/auth_command.go @@ -17,8 +17,8 @@ package command import ( "fmt" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/spf13/cobra" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) // NewAuthCommand returns the cobra command for "auth". diff --git a/etcdctl/ctlv3/command/check.go b/etcdctl/ctlv3/command/check.go index c15914117..859311536 100644 --- a/etcdctl/ctlv3/command/check.go +++ b/etcdctl/ctlv3/command/check.go @@ -25,8 +25,8 @@ import ( "sync" "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" "golang.org/x/time/rate" diff --git a/etcdctl/ctlv3/command/compaction_command.go b/etcdctl/ctlv3/command/compaction_command.go index 59e8990fb..83b12b680 100644 --- a/etcdctl/ctlv3/command/compaction_command.go +++ b/etcdctl/ctlv3/command/compaction_command.go @@ -18,8 +18,8 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var compactPhysical bool diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go index d393afa74..5bbb39dd7 100644 --- a/etcdctl/ctlv3/command/defrag_command.go +++ b/etcdctl/ctlv3/command/defrag_command.go @@ -20,8 +20,8 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/mvcc/backend" "github.com/spf13/cobra" + "go.etcd.io/etcd/mvcc/backend" ) var ( diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 00c93bf5b..19066a594 100644 --- a/etcdctl/ctlv3/command/del_command.go +++ b/etcdctl/ctlv3/command/del_command.go @@ -17,8 +17,8 @@ package command import ( "fmt" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/elect_command.go b/etcdctl/ctlv3/command/elect_command.go index ace4f1197..db05c12e8 100644 --- a/etcdctl/ctlv3/command/elect_command.go +++ b/etcdctl/ctlv3/command/elect_command.go @@ -21,8 +21,8 @@ import ( "os/signal" "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" ) diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index a45e24053..58c2c7e96 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,9 +20,9 @@ import ( "sync" "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" ) diff --git a/etcdctl/ctlv3/command/error.go b/etcdctl/ctlv3/command/error.go index 314b07f05..220d50b6d 100644 --- a/etcdctl/ctlv3/command/error.go +++ b/etcdctl/ctlv3/command/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go index 6de38c5ff..24bdaa9fb 100644 --- a/etcdctl/ctlv3/command/get_command.go +++ b/etcdctl/ctlv3/command/get_command.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go index 2eada07cd..4400420c1 100644 --- a/etcdctl/ctlv3/command/global.go +++ b/etcdctl/ctlv3/command/global.go @@ -25,10 +25,10 @@ import ( "time" "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/pflag" @@ -133,7 +133,7 @@ func clientConfigFromCmd(cmd *cobra.Command) *clientConfig { // WARNING logs contain important information like TLS misconfirugation, but spams // 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)) } diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go index ecfe3a6fb..f20c06ada 100644 --- a/etcdctl/ctlv3/command/lease_command.go +++ b/etcdctl/ctlv3/command/lease_command.go @@ -19,7 +19,7 @@ import ( "fmt" "strconv" - v3 "github.com/coreos/etcd/clientv3" + v3 "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/lock_command.go b/etcdctl/ctlv3/command/lock_command.go index 74ebac81e..6f58d61f6 100644 --- a/etcdctl/ctlv3/command/lock_command.go +++ b/etcdctl/ctlv3/command/lock_command.go @@ -23,8 +23,8 @@ import ( "os/signal" "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" ) diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index 8afa479d4..1e3231616 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "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" ) diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index d609a6ad2..bef384fbf 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,22 +24,22 @@ import ( "path/filepath" "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/spf13/cobra" diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go index 5fdecf95a..7c8010c96 100644 --- a/etcdctl/ctlv3/command/move_leader_command.go +++ b/etcdctl/ctlv3/command/move_leader_command.go @@ -18,8 +18,8 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) // NewMoveLeaderCommand returns the cobra command for "move-leader". diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 1579f249a..cd87811e4 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,9 +19,9 @@ import ( "fmt" "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" ) diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index c21440334..7f2d4e589 100644 --- a/etcdctl/ctlv3/command/printer_fields.go +++ b/etcdctl/ctlv3/command/printer_fields.go @@ -17,10 +17,10 @@ package command import ( "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 } diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go index a6e46c63a..95b2a7f4e 100644 --- a/etcdctl/ctlv3/command/printer_json.go +++ b/etcdctl/ctlv3/command/printer_json.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" ) type jsonPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index c5109c5c2..909fffe58 100644 --- a/etcdctl/ctlv3/command/printer_protobuf.go +++ b/etcdctl/ctlv3/command/printer_protobuf.go @@ -18,9 +18,9 @@ import ( "fmt" "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 } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index 5b749cc59..93aa79412 100644 --- a/etcdctl/ctlv3/command/printer_simple.go +++ b/etcdctl/ctlv3/command/printer_simple.go @@ -19,10 +19,10 @@ import ( "os" "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 { diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go index bb7584f2a..4a84b7472 100644 --- a/etcdctl/ctlv3/command/printer_table.go +++ b/etcdctl/ctlv3/command/printer_table.go @@ -17,8 +17,8 @@ package command import ( "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" ) diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go index 21db69bda..0237dd38f 100644 --- a/etcdctl/ctlv3/command/put_command.go +++ b/etcdctl/ctlv3/command/put_command.go @@ -19,8 +19,8 @@ import ( "os" "strconv" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 39c52d313..ff4ba02b3 100644 --- a/etcdctl/ctlv3/command/role_command.go +++ b/etcdctl/ctlv3/command/role_command.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/coreos/etcd/clientv3" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var ( diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index e83bfcf73..175ada489 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/etcd/clientv3/snapshot" + "go.etcd.io/etcd/clientv3/snapshot" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index e18a7e9bd..dcc504e58 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,8 +22,8 @@ import ( "strconv" "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" ) diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index 92256bd59..f536b2e5f 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,8 +25,8 @@ import ( "strings" "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" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index 89d82a39b..77c21fecb 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go index 240f46b0f..cadfa0a80 100644 --- a/etcdctl/ctlv3/command/watch_command.go +++ b/etcdctl/ctlv3/command/watch_command.go @@ -23,7 +23,7 @@ import ( "os/exec" "strings" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 4a9233b79..bf64f8b9e 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/etcdctl/ctlv3/ctl.go @@ -18,7 +18,7 @@ package ctlv3 import ( "time" - "github.com/coreos/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go index 6908113a7..b5b0c42c3 100644 --- a/etcdctl/ctlv3/ctl_cov.go +++ b/etcdctl/ctlv3/ctl_cov.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/coreos/etcd/etcdctl/ctlv3/command" + "go.etcd.io/etcd/etcdctl/ctlv3/command" ) func Start() { diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go index 52751feec..e9567a398 100644 --- a/etcdctl/ctlv3/ctl_nocov.go +++ b/etcdctl/ctlv3/ctl_nocov.go @@ -16,7 +16,7 @@ package ctlv3 -import "github.com/coreos/etcd/etcdctl/ctlv3/command" +import "go.etcd.io/etcd/etcdctl/ctlv3/command" func Start() { rootCmd.SetUsageFunc(usageFunc) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index c91fd71de..3b9691150 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdctl/main.go b/etcdctl/main.go index bba065fbe..8bb4fc096 100644 --- a/etcdctl/main.go +++ b/etcdctl/main.go @@ -19,8 +19,8 @@ import ( "fmt" "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 ( diff --git a/etcdmain/config.go b/etcdmain/config.go index dcbbbc994..6d86e5710 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -27,10 +27,10 @@ import ( "sort" "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" "go.uber.org/zap" diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index 56d3f60dc..6c01184be 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/coreos/etcd/embed" "github.com/ghodss/yaml" + "go.etcd.io/etcd/embed" ) func TestConfigParsingMemberFlags(t *testing.T) { diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index a5edc1b5c..0a2adee8e 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,17 +26,17 @@ import ( "strings" "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" "go.uber.org/zap" @@ -45,7 +45,7 @@ import ( type dirType string -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdmain") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdmain") var ( dirMember = dirType("member") diff --git a/etcdmain/gateway.go b/etcdmain/gateway.go index e107476ff..201878081 100644 --- a/etcdmain/gateway.go +++ b/etcdmain/gateway.go @@ -21,7 +21,7 @@ import ( "os" "time" - "github.com/coreos/etcd/proxy/tcpproxy" + "go.etcd.io/etcd/proxy/tcpproxy" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index bc0a5dbf9..588094bfe 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -27,18 +27,18 @@ import ( "path/filepath" "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" "github.com/soheilhy/cmux" diff --git a/etcdmain/help.go b/etcdmain/help.go index 3c4cb3fdc..6ce1f06e2 100644 --- a/etcdmain/help.go +++ b/etcdmain/help.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" "golang.org/x/crypto/bcrypt" ) diff --git a/etcdmain/util.go b/etcdmain/util.go index c8872ad46..15c686ab6 100644 --- a/etcdmain/util.go +++ b/etcdmain/util.go @@ -18,8 +18,8 @@ import ( "fmt" "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" ) diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index 7cdd0dfd4..ec0d600e8 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,7 +17,7 @@ package api import ( "sync" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "go.uber.org/zap" "github.com/coreos/go-semver/semver" @@ -32,7 +32,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api") // capabilityMaps is a static map of version to capability map. capabilityMaps = map[string]map[Capability]bool{ diff --git a/etcdserver/api/cluster.go b/etcdserver/api/cluster.go index 770883b43..901be9d85 100644 --- a/etcdserver/api/cluster.go +++ b/etcdserver/api/cluster.go @@ -15,8 +15,8 @@ package api import ( - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index 6597703bb..c9df62ea8 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -21,19 +21,19 @@ import ( "net/http" "strings" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/version" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/etcdhttp") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/etcdhttp") mlog = logutil.NewMergeLogger(plog) ) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index f374adcaa..bec5e9e05 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/raft" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index c55f13b99..9f3eac352 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -18,10 +18,10 @@ import ( "encoding/json" "net/http" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/lease/leasehttp" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/lease/leasehttp" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index a3b6feb70..095aa5da8 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -25,11 +25,11 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" ) type fakeCluster struct { diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index fea165950..c60907072 100644 --- a/etcdserver/api/etcdhttp/version_test.go +++ b/etcdserver/api/etcdhttp/version_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index a0b6be412..e0f3caacc 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/netutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" @@ -516,7 +516,7 @@ func (c *RaftCluster) IsReadyToAddNewMember() bool { if nstarted == 1 && nmembers == 2 { // a case of adding a new node to 1-member cluster for restoring cluster data - // https://github.com/coreos/etcd/blob/master/Documentation/v2/admin_guide.md#restoring-the-cluster + // https://go.etcd.io/etcd/blob/master/Documentation/v2/admin_guide.md#restoring-the-cluster if c.lg != nil { c.lg.Debug("number of started member is 1; can accept add member request") } else { diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index f8ddc243d..7aed5aec2 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/mock/mockstore" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/membership/errors.go b/etcdserver/api/membership/errors.go index 9bdfa1b68..ee5777383 100644 --- a/etcdserver/api/membership/errors.go +++ b/etcdserver/api/membership/errors.go @@ -17,7 +17,7 @@ package membership import ( "errors" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) var ( diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go index c25fbf292..6a3e79305 100644 --- a/etcdserver/api/membership/member.go +++ b/etcdserver/api/membership/member.go @@ -22,12 +22,12 @@ import ( "sort" "time" - "github.com/coreos/etcd/pkg/types" "github.com/coreos/pkg/capnslog" + "go.etcd.io/etcd/pkg/types" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/membership") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/membership") ) // RaftAttributes represents the raft related attributes of an etcd member. diff --git a/etcdserver/api/membership/member_test.go b/etcdserver/api/membership/member_test.go index 36015fd1b..bbbb88986 100644 --- a/etcdserver/api/membership/member_test.go +++ b/etcdserver/api/membership/member_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func timeParse(value string) *time.Time { diff --git a/etcdserver/api/membership/store.go b/etcdserver/api/membership/store.go index c023c920f..14ab1190e 100644 --- a/etcdserver/api/membership/store.go +++ b/etcdserver/api/membership/store.go @@ -19,9 +19,9 @@ import ( "fmt" "path" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go index 86ede972e..12c3e4424 100644 --- a/etcdserver/api/rafthttp/coder.go +++ b/etcdserver/api/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "github.com/coreos/etcd/raft/raftpb" +import "go.etcd.io/etcd/raft/raftpb" type encoder interface { // encode encodes the given message to an output stream. diff --git a/etcdserver/api/rafthttp/functional_test.go b/etcdserver/api/rafthttp/functional_test.go index 87ac5f042..83de44478 100644 --- a/etcdserver/api/rafthttp/functional_test.go +++ b/etcdserver/api/rafthttp/functional_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func TestSendMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 4eaf8ad9d..480b96d7d 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/snap" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index dc48fefef..fd5e24563 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go index ef59bc888..2417d222e 100644 --- a/etcdserver/api/rafthttp/msg_codec.go +++ b/etcdserver/api/rafthttp/msg_codec.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" ) // messageEncoder is a encoder that can encode all kinds of messages. diff --git a/etcdserver/api/rafthttp/msg_codec_test.go b/etcdserver/api/rafthttp/msg_codec_test.go index 6e9277132..883fc8ef8 100644 --- a/etcdserver/api/rafthttp/msg_codec_test.go +++ b/etcdserver/api/rafthttp/msg_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go index 18ff16b70..1fa36deb3 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/etcdserver/api/rafthttp/msgappv2_codec.go @@ -20,10 +20,10 @@ import ( "io" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) const ( diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go index dff412b04..48fd28992 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go index d3342fd1a..8130c4a96 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/etcdserver/api/rafthttp/peer_status.go b/etcdserver/api/rafthttp/peer_status.go index a0c1d560e..66149ff67 100644 --- a/etcdserver/api/rafthttp/peer_status.go +++ b/etcdserver/api/rafthttp/peer_status.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go index 00e00853b..29ef70fc6 100644 --- a/etcdserver/api/rafthttp/peer_test.go +++ b/etcdserver/api/rafthttp/peer_test.go @@ -17,7 +17,7 @@ package rafthttp import ( "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go index 6e6704f58..e2ce3c289 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -22,11 +22,11 @@ import ( "sync" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index 4370887f6..231c768db 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go index 02acd2826..1ef2493ed 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -15,8 +15,8 @@ package rafthttp import ( - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go index fec6238e6..85abaeaa4 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/httputil" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/httputil" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 902d17e98..504a8ff64 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index b8795bff0..dcb2223ca 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,12 +25,12 @@ import ( "sync" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/httputil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/httputil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index 90986b8fd..56b3e7fe0 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index d7aef130c..e52acfceb 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -20,13 +20,13 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "github.com/xiang90/probing" @@ -34,7 +34,7 @@ import ( "golang.org/x/time/rate" ) -var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "rafthttp")) +var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("go.etcd.io/etcd", "rafthttp")) type Raft interface { Process(ctx context.Context, m raftpb.Message) error diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index f34e72465..9e6aabd4f 100644 --- a/etcdserver/api/rafthttp/transport_bench_test.go +++ b/etcdserver/api/rafthttp/transport_bench_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index a59e97cdc..9a58ce74f 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/xiang90/probing" ) diff --git a/etcdserver/api/rafthttp/urlpick.go b/etcdserver/api/rafthttp/urlpick.go index 61839deeb..61ef46864 100644 --- a/etcdserver/api/rafthttp/urlpick.go +++ b/etcdserver/api/rafthttp/urlpick.go @@ -18,7 +18,7 @@ import ( "net/url" "sync" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type urlPicker struct { diff --git a/etcdserver/api/rafthttp/urlpick_test.go b/etcdserver/api/rafthttp/urlpick_test.go index 70ebbd326..230730de5 100644 --- a/etcdserver/api/rafthttp/urlpick_test.go +++ b/etcdserver/api/rafthttp/urlpick_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // TestURLPickerPickTwice tests that pick returns a possible url, diff --git a/etcdserver/api/rafthttp/util.go b/etcdserver/api/rafthttp/util.go index bc521c46d..20938647c 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index bc55226ee..17a385ed1 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/snap/db.go b/etcdserver/api/snap/db.go index be0933541..3002ccdcc 100644 --- a/etcdserver/api/snap/db.go +++ b/etcdserver/api/snap/db.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index d73713ff1..c1151e27e 100644 --- a/etcdserver/api/snap/message.go +++ b/etcdserver/api/snap/message.go @@ -17,8 +17,8 @@ package snap import ( "io" - "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/raft/raftpb" ) // Message is a struct that contains a raft Message and a ReadCloser. The type diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go index 75edadbff..feb420b14 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -25,11 +25,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap/snappb" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap/snappb" + pioutil "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -38,7 +38,7 @@ import ( const snapSuffix = ".snap" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "snap") ErrNoSnapshot = errors.New("snap: no available snapshot") ErrEmptySnapshot = errors.New("snap: empty snapshot") diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go index fea99449b..00e3e21dc 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go index c828323c4..bee089374 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -48,7 +48,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/auth") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/auth") ) var rootRole = Role{ diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index fb47866b7..21369860c 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,9 +19,9 @@ import ( "encoding/json" "path" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go index 43bce1a9c..5c1564b25 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go index ff44f2f2f..cf770b378 100644 --- a/etcdserver/api/v2discovery/discovery.go +++ b/etcdserver/api/v2discovery/discovery.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" @@ -39,7 +39,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "discovery") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "discovery") ErrInvalidURL = errors.New("discovery: invalid URL") ErrBadSizeKey = errors.New("discovery: size key is bad") diff --git a/etcdserver/api/v2discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go index 8d97b08a7..c1eff8823 100644 --- a/etcdserver/api/v2discovery/discovery_test.go +++ b/etcdserver/api/v2discovery/discovery_test.go @@ -28,7 +28,7 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index ab484bc6b..ed6c456d0 100644 --- a/etcdserver/api/v2http/capability.go +++ b/etcdserver/api/v2http/capability.go @@ -18,8 +18,8 @@ import ( "fmt" "net/http" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" ) func authCapabilityHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc { diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 58de1be95..b0e01c98a 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,17 +27,17 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index 539e91ce4..d8d6a883a 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go index f4fc2fbdf..22dfafa8f 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index fa8e1a270..4a8c37f05 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,16 +29,16 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index 892d202ba..c6956893e 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v2auth" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2auth" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -35,7 +35,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v2http") mlog = logutil.NewMergeLogger(plog) ) diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index 266c28ed1..0e42c26ca 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,12 +22,12 @@ import ( "sort" "testing" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2http/httptypes/errors.go b/etcdserver/api/v2http/httptypes/errors.go index 0657604ca..245c0899e 100644 --- a/etcdserver/api/v2http/httptypes/errors.go +++ b/etcdserver/api/v2http/httptypes/errors.go @@ -22,7 +22,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http/httptypes") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v2http/httptypes") ) type HTTPError struct { diff --git a/etcdserver/api/v2http/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go index 738d74432..95fd443ff 100644 --- a/etcdserver/api/v2http/httptypes/member.go +++ b/etcdserver/api/v2http/httptypes/member.go @@ -19,7 +19,7 @@ package httptypes import ( "encoding/json" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) type Member struct { diff --git a/etcdserver/api/v2http/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go index ab6045e0e..a13efbc14 100644 --- a/etcdserver/api/v2http/httptypes/member_test.go +++ b/etcdserver/api/v2http/httptypes/member_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) func TestMemberUnmarshal(t *testing.T) { diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 88e329934..14f7da0fe 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go index f80136907..c4accc735 100644 --- a/etcdserver/api/v2stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" ) // ServerStats encapsulates various statistics about an EtcdServer and its diff --git a/etcdserver/api/v2stats/stats.go b/etcdserver/api/v2stats/stats.go index 326f03e87..c50a20076 100644 --- a/etcdserver/api/v2stats/stats.go +++ b/etcdserver/api/v2stats/stats.go @@ -17,7 +17,7 @@ package v2stats import "github.com/coreos/pkg/capnslog" -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/stats") type Stats interface { // SelfStats returns the struct representing statistics of this server diff --git a/etcdserver/api/v2store/event_history.go b/etcdserver/api/v2store/event_history.go index 6948233d6..6bf7c0f5d 100644 --- a/etcdserver/api/v2store/event_history.go +++ b/etcdserver/api/v2store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/etcdserver/api/v2store/event_test.go b/etcdserver/api/v2store/event_test.go index e9c3ceb71..7de87035c 100644 --- a/etcdserver/api/v2store/event_test.go +++ b/etcdserver/api/v2store/event_test.go @@ -17,7 +17,7 @@ package v2store import ( "testing" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/etcdserver/api/v2store/node.go b/etcdserver/api/v2store/node.go index 490564404..b51ecf0aa 100644 --- a/etcdserver/api/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go index a594e1795..df7e725f3 100644 --- a/etcdserver/api/v2store/node_extern_test.go +++ b/etcdserver/api/v2store/node_extern_test.go @@ -20,7 +20,7 @@ import ( "time" "unsafe" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNodeExternClone(t *testing.T) { diff --git a/etcdserver/api/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go index 293aae411..65dbf3622 100644 --- a/etcdserver/api/v2store/stats_test.go +++ b/etcdserver/api/v2store/stats_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) // Ensure that a successful Get is recorded in the stats. diff --git a/etcdserver/api/v2store/store.go b/etcdserver/api/v2store/store.go index 65cc8559c..ce940436e 100644 --- a/etcdserver/api/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/types" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go index b8de68615..451d9bec6 100644 --- a/etcdserver/api/v2store/store_test.go +++ b/etcdserver/api/v2store/store_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) type StoreCloser interface { diff --git a/etcdserver/api/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go index 45c0e3648..94c7493f0 100644 --- a/etcdserver/api/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go index 18d598acf..d327fd32d 100644 --- a/etcdserver/api/v2store/store_v2_test.go +++ b/etcdserver/api/v2store/store_v2_test.go @@ -19,8 +19,8 @@ package v2store_test import ( "testing" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) type v2TestStore struct { diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go index 12ad2b2c9..d0350393a 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/api/v2v3" - "github.com/coreos/etcd/integration" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v2v3" + "go.etcd.io/etcd/integration" "google.golang.org/grpc/grpclog" ) diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go index aa4088016..17652c2f3 100644 --- a/etcdserver/api/v2store/watcher_hub.go +++ b/etcdserver/api/v2store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/etcdserver/api/v2v3/cluster.go b/etcdserver/api/v2v3/cluster.go index 2563f411f..a22e4afad 100644 --- a/etcdserver/api/v2v3/cluster.go +++ b/etcdserver/api/v2v3/cluster.go @@ -15,8 +15,8 @@ package v2v3 import ( - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index f8d193080..448ba35d7 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,12 +19,12 @@ import ( "net/http" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index 3d78e7b90..c7934d562 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/mvcc/mvccpb" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index c8858e84f..e8a3557c1 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -18,9 +18,9 @@ import ( "context" "strings" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v2error" - "github.com/coreos/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v2error" + "go.etcd.io/etcd/etcdserver/api/v2store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) { diff --git a/etcdserver/api/v3alarm/alarms.go b/etcdserver/api/v3alarm/alarms.go index 502c71967..2b085a8e7 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,16 +18,16 @@ package v3alarm import ( "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/types" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) var ( alarmBucketName = []byte("alarm") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "alarm") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "alarm") ) type BackendGetter interface { diff --git a/etcdserver/api/v3client/doc.go b/etcdserver/api/v3client/doc.go index 310715f5c..47922c433 100644 --- a/etcdserver/api/v3client/doc.go +++ b/etcdserver/api/v3client/doc.go @@ -19,8 +19,8 @@ // import ( // "context" // -// "github.com/coreos/etcd/embed" -// "github.com/coreos/etcd/etcdserver/api/v3client" +// "go.etcd.io/etcd/embed" +// "go.etcd.io/etcd/etcdserver/api/v3client" // ) // // ... diff --git a/etcdserver/api/v3client/v3client.go b/etcdserver/api/v3client/v3client.go index ab48ea75b..d2031213c 100644 --- a/etcdserver/api/v3client/v3client.go +++ b/etcdserver/api/v3client/v3client.go @@ -18,10 +18,10 @@ import ( "context" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) // New creates a clientv3 client that wraps an in-process EtcdServer. Instead diff --git a/etcdserver/api/v3compactor/compactor.go b/etcdserver/api/v3compactor/compactor.go index 0c44ae9c4..73a96842d 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" "github.com/jonboulle/clockwork" @@ -27,7 +27,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "compactor") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "compactor") ) const ( diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go index 697324287..76a11aeaf 100644 --- a/etcdserver/api/v3compactor/compactor_test.go +++ b/etcdserver/api/v3compactor/compactor_test.go @@ -18,8 +18,8 @@ import ( "context" "sync/atomic" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) type fakeCompactable struct { diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go index 3401aad6b..ab64cb706 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index e6c53598d..b9d49afa6 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index 7807baead..cf8ac4301 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index 5ae5494be..fcd01066f 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3election/election.go b/etcdserver/api/v3election/election.go index c66d7a382..f5a3be3b2 100644 --- a/etcdserver/api/v3election/election.go +++ b/etcdserver/api/v3election/election.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) // ErrMissingLeaderKey is returned when election API request diff --git a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go index b11c29175..23551b54b 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 7822a9e3a..1fc1bce44 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -29,9 +29,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3lock/lock.go b/etcdserver/api/v3lock/lock.go index a5efcbab5..5a17c86fc 100644 --- a/etcdserver/api/v3lock/lock.go +++ b/etcdserver/api/v3lock/lock.go @@ -17,9 +17,9 @@ package v3lock import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockServer struct { diff --git a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go index 746ccdeaf..1eeeff185 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index 23c44e044..36ebdd90f 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -24,7 +24,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index ca8e53ad0..62ce757be 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -17,8 +17,8 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthServer struct { diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index c97e74662..957c81895 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,8 +18,8 @@ import ( "crypto/tls" "math" - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index c46418db1..f23b6a738 100644 --- a/etcdserver/api/v3rpc/header.go +++ b/etcdserver/api/v3rpc/header.go @@ -15,8 +15,8 @@ package v3rpc import ( - "github.com/coreos/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type header struct { diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index cc095ef9c..aca4d3589 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,14 +19,14 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go index 9781bddda..fdb002e0d 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,16 +18,16 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v3rpc") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/v3rpc") ) type kvServer struct { diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index d8a8c6e3c..7441beedf 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,10 +18,10 @@ import ( "context" "io" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 7f51f4f85..002d1c7fa 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,14 +19,14 @@ import ( "crypto/sha256" "io" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index 81a7dc282..49baa76ee 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -18,12 +18,12 @@ import ( "context" "time" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type ClusterServer struct { diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go index 4d78d3e7d..a145b8b09 100644 --- a/etcdserver/api/v3rpc/quota.go +++ b/etcdserver/api/v3rpc/quota.go @@ -17,10 +17,10 @@ package v3rpc import ( "context" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" ) type quotaKVServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index d7812af97..62c6c12bb 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,12 +18,12 @@ import ( "context" "strings" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/util_test.go b/etcdserver/api/v3rpc/util_test.go index 8890b1d4f..e83144b96 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,8 +19,8 @@ import ( "errors" "testing" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index 023cc8e16..7848cdd04 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go index 15850ab41..66f584a06 100644 --- a/etcdserver/api/v3rpc/watch_test.go +++ b/etcdserver/api/v3rpc/watch_test.go @@ -19,8 +19,8 @@ import ( "math" "testing" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) func TestSendFragment(t *testing.T) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 1c03995ea..1f06ad0dd 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -21,12 +21,12 @@ import ( "sort" "time" - "github.com/coreos/etcd/auth" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/types" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 5aa79cb95..4b094ad5d 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -17,10 +17,10 @@ package etcdserver import ( "sync" - "github.com/coreos/etcd/auth" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" + "go.etcd.io/etcd/auth" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" ) type authApplierV3 struct { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index ab0e854c8..5b5376509 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -19,10 +19,10 @@ import ( "path" "time" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/pbutil" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/pbutil" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/backend.go b/etcdserver/backend.go index 6a0ea7e82..f22147c6c 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,11 +19,11 @@ import ( "os" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index 0fc9bd682..6166ac261 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -22,9 +22,9 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 4e7123e1d..8a36a548b 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/config.go b/etcdserver/config.go index 6d945b342..143488bbe 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/netutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/netutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -96,7 +96,7 @@ type ServerConfig struct { // // 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 BootstrapTimeout time.Duration diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go index 31c35f719..aa9582bc2 100644 --- a/etcdserver/config_test.go +++ b/etcdserver/config_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index d4cd9f2e6..32678a7c5 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -19,11 +19,11 @@ import ( "fmt" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go index 5a557d52e..babe21305 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" "io" "net/http" diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index ddf72d6a8..3e15079e6 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" - authpb "github.com/coreos/etcd/auth/authpb" + authpb "go.etcd.io/etcd/auth/authpb" context "golang.org/x/net/context" diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index c17224a0b..99dbea96f 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,8 +18,8 @@ import ( goruntime "runtime" "time" - "github.com/coreos/etcd/pkg/runtime" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/version" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/etcdserver/quota.go b/etcdserver/quota.go index 143cb35a2..6d70430e7 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,7 +17,7 @@ package etcdserver import ( "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index d53bf2efd..0285a12a6 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -22,17 +22,17 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/contention" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/pbutil" - "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/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/contention" + "go.etcd.io/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/pbutil" + "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" ) diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 56712406a..0ed7ad00b 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/pkg/mock/mockstorage" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 7b569f20c..50e845923 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,33 +29,33 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2discovery" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - stats "github.com/coreos/etcd/etcdserver/api/v2stats" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/etcdserver/api/v3alarm" - "github.com/coreos/etcd/etcdserver/api/v3compactor" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasehttp" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/idutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/runtime" - "github.com/coreos/etcd/pkg/schedule" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/pkg/wait" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2discovery" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" + stats "go.etcd.io/etcd/etcdserver/api/v2stats" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/etcdserver/api/v3alarm" + "go.etcd.io/etcd/etcdserver/api/v3compactor" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/runtime" + "go.etcd.io/etcd/pkg/schedule" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/version" + "go.etcd.io/etcd/wal" "github.com/coreos/go-semver/semver" "github.com/coreos/pkg/capnslog" @@ -100,7 +100,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver") storeMemberAttributeRegexp = regexp.MustCompile(path.Join(membership.StoreMembersPrefix, "[[:xdigit:]]{1,16}", "attributes")) ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 66d041c1e..3daad4896 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -30,25 +30,25 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/api/v2store" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/idutil" - "github.com/coreos/etcd/pkg/mock/mockstorage" - "github.com/coreos/etcd/pkg/mock/mockstore" - "github.com/coreos/etcd/pkg/mock/mockwait" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/pkg/wait" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/idutil" + "go.etcd.io/etcd/pkg/mock/mockstorage" + "go.etcd.io/etcd/pkg/mock/mockstore" + "go.etcd.io/etcd/pkg/mock/mockwait" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/pkg/wait" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) // TestDoLocalAction tests requests which do not need to go through raft to be applied, diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index 1cccd81c7..417776813 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 2be027c51..d57b6f9a5 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,13 +17,13 @@ package etcdserver import ( "io" - "github.com/coreos/etcd/etcdserver/api/snap" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "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/etcdserver/api/snap" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "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" "go.uber.org/zap" ) diff --git a/etcdserver/util.go b/etcdserver/util.go index 4e547120c..fe5024ef0 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -20,11 +20,11 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" "github.com/golang/protobuf/proto" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index c2ea0d7c0..6ec87bc89 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -21,11 +21,11 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/etcdserver/api/membership" - "github.com/coreos/etcd/etcdserver/api/rafthttp" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/etcdserver/api/membership" + "go.etcd.io/etcd/etcdserver/api/rafthttp" + "go.etcd.io/etcd/etcdserver/api/snap" + "go.etcd.io/etcd/pkg/types" + "go.etcd.io/etcd/raft/raftpb" ) func TestLongestConnected(t *testing.T) { diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index 3a6468cd8..9238b2dc5 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/api/v2store" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type RequestV2 pb.Request diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 092b918b9..6fa89969c 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,13 +20,13 @@ import ( "encoding/binary" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/etcdserver/api/membership" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasehttp" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/auth" + "go.etcd.io/etcd/etcdserver/api/membership" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasehttp" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/raft" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/functional/agent/handler.go b/functional/agent/handler.go index 525c21006..f1000624b 100644 --- a/functional/agent/handler.go +++ b/functional/agent/handler.go @@ -25,10 +25,10 @@ import ( "syscall" "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" ) diff --git a/functional/agent/server.go b/functional/agent/server.go index 7f8ec98b5..8bba63792 100644 --- a/functional/agent/server.go +++ b/functional/agent/server.go @@ -21,9 +21,9 @@ import ( "os/exec" "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" "google.golang.org/grpc" diff --git a/functional/agent/utils.go b/functional/agent/utils.go index 67a837ff3..c0dd92fc5 100644 --- a/functional/agent/utils.go +++ b/functional/agent/utils.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // TODO: support separate WAL directory diff --git a/functional/cmd/etcd-agent/main.go b/functional/cmd/etcd-agent/main.go index e3f217693..87ab6ee7d 100644 --- a/functional/cmd/etcd-agent/main.go +++ b/functional/cmd/etcd-agent/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/coreos/etcd/functional/agent" + "go.etcd.io/etcd/functional/agent" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-proxy/main.go b/functional/cmd/etcd-proxy/main.go index 80074d7a4..56ca78eef 100644 --- a/functional/cmd/etcd-proxy/main.go +++ b/functional/cmd/etcd-proxy/main.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/coreos/etcd/pkg/proxy" + "go.etcd.io/etcd/pkg/proxy" "go.uber.org/zap" ) diff --git a/functional/cmd/etcd-runner/main.go b/functional/cmd/etcd-runner/main.go index 6e3cb16ce..f9e82766d 100644 --- a/functional/cmd/etcd-runner/main.go +++ b/functional/cmd/etcd-runner/main.go @@ -16,7 +16,7 @@ // against a fault injected cluster. package main -import "github.com/coreos/etcd/functional/runner" +import "go.etcd.io/etcd/functional/runner" func main() { runner.Start() diff --git a/functional/cmd/etcd-tester/main.go b/functional/cmd/etcd-tester/main.go index a0e6eda68..fdf391fe8 100644 --- a/functional/cmd/etcd-tester/main.go +++ b/functional/cmd/etcd-tester/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/coreos/etcd/functional/tester" + "go.etcd.io/etcd/functional/tester" "go.uber.org/zap" ) diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go index bc3f8b34b..feec424a8 100644 --- a/functional/rpcpb/etcd_config.go +++ b/functional/rpcpb/etcd_config.go @@ -19,9 +19,9 @@ import ( "reflect" "strings" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) var etcdFields = []string{ diff --git a/functional/rpcpb/etcd_config_test.go b/functional/rpcpb/etcd_config_test.go index 480098e41..a96b81f34 100644 --- a/functional/rpcpb/etcd_config_test.go +++ b/functional/rpcpb/etcd_config_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/embed" + "go.etcd.io/etcd/pkg/types" ) func TestEtcd(t *testing.T) { diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 5d0ad32fc..5b400bdc9 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,10 +22,10 @@ import ( "os" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/snapshot" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/snapshot" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/transport" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/functional/runner/election_command.go b/functional/runner/election_command.go index b2bc99a16..0ced37546 100644 --- a/functional/runner/election_command.go +++ b/functional/runner/election_command.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/error.go b/functional/runner/error.go index 335e85cb7..403990539 100644 --- a/functional/runner/error.go +++ b/functional/runner/error.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/client" + "go.etcd.io/etcd/client" ) const ( diff --git a/functional/runner/global.go b/functional/runner/global.go index 13f1906c3..f2f0dacea 100644 --- a/functional/runner/global.go +++ b/functional/runner/global.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/runner/help.go b/functional/runner/help.go index 63e9815ab..394cec840 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/functional/runner/lease_renewer_command.go b/functional/runner/lease_renewer_command.go index a57c53f27..78a65729d 100644 --- a/functional/runner/lease_renewer_command.go +++ b/functional/runner/lease_renewer_command.go @@ -21,7 +21,7 @@ import ( "log" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "github.com/spf13/cobra" "google.golang.org/grpc/codes" diff --git a/functional/runner/lock_racer_command.go b/functional/runner/lock_racer_command.go index 18b10e403..cb98668cc 100644 --- a/functional/runner/lock_racer_command.go +++ b/functional/runner/lock_racer_command.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/concurrency" "github.com/spf13/cobra" ) diff --git a/functional/runner/watch_command.go b/functional/runner/watch_command.go index 646092ad0..cd3f202af 100644 --- a/functional/runner/watch_command.go +++ b/functional/runner/watch_command.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/stringutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/stringutil" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/functional/tester/case.go b/functional/tester/case.go index d584541f7..ce3e00f12 100644 --- a/functional/tester/case.go +++ b/functional/tester/case.go @@ -19,7 +19,7 @@ import ( "math/rand" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_external.go b/functional/tester/case_external.go index 79d2a3717..8b22197ad 100644 --- a/functional/tester/case_external.go +++ b/functional/tester/case_external.go @@ -18,7 +18,7 @@ import ( "fmt" "os/exec" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type caseExternal struct { diff --git a/functional/tester/case_failpoints.go b/functional/tester/case_failpoints.go index 4d26c8a8d..084630840 100644 --- a/functional/tester/case_failpoints.go +++ b/functional/tester/case_failpoints.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" ) type failpointStats struct { diff --git a/functional/tester/case_network_blackhole.go b/functional/tester/case_network_blackhole.go index 0d496eade..feee3b27a 100644 --- a/functional/tester/case_network_blackhole.go +++ b/functional/tester/case_network_blackhole.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX) diff --git a/functional/tester/case_network_delay.go b/functional/tester/case_network_delay.go index 39a471702..ec4e9ccca 100644 --- a/functional/tester/case_network_delay.go +++ b/functional/tester/case_network_delay.go @@ -17,7 +17,7 @@ package tester import ( "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) @@ -26,7 +26,7 @@ const ( // Wait more when it recovers from slow network, because network layer // needs extra time to propagate traffic control (tc command) change. // Otherwise, we get different hash values from the previous revision. - // For more detail, please see https://github.com/coreos/etcd/issues/5121. + // For more detail, please see https://go.etcd.io/etcd/issues/5121. waitRecover = 5 * time.Second ) diff --git a/functional/tester/case_no_fail.go b/functional/tester/case_no_fail.go index e85bef93c..f78fee85a 100644 --- a/functional/tester/case_no_fail.go +++ b/functional/tester/case_no_fail.go @@ -17,7 +17,7 @@ package tester import ( "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove.go b/functional/tester/case_sigquit_remove.go index 13fe68f4e..6c3a79515 100644 --- a/functional/tester/case_sigquit_remove.go +++ b/functional/tester/case_sigquit_remove.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigquit_remove_quorum.go b/functional/tester/case_sigquit_remove_quorum.go index 9653de10d..5fc78cdd3 100644 --- a/functional/tester/case_sigquit_remove_quorum.go +++ b/functional/tester/case_sigquit_remove_quorum.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/case_sigterm.go b/functional/tester/case_sigterm.go index f5d472afc..a8c99bc85 100644 --- a/functional/tester/case_sigterm.go +++ b/functional/tester/case_sigterm.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" func inject_SIGTERM_ETCD(clus *Cluster, idx int) error { return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD) diff --git a/functional/tester/checker.go b/functional/tester/checker.go index 48e98cb0d..7515bc93a 100644 --- a/functional/tester/checker.go +++ b/functional/tester/checker.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" // Checker checks cluster consistency. type Checker interface { diff --git a/functional/tester/checker_kv_hash.go b/functional/tester/checker_kv_hash.go index 586ad89bd..698367d25 100644 --- a/functional/tester/checker_kv_hash.go +++ b/functional/tester/checker_kv_hash.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go index a89742128..9a19e327b 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/functional/tester/checker_no_check.go b/functional/tester/checker_no_check.go index d36702319..aa0a4dcb8 100644 --- a/functional/tester/checker_no_check.go +++ b/functional/tester/checker_no_check.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type noCheck struct{} diff --git a/functional/tester/checker_runner.go b/functional/tester/checker_runner.go index a5b7ff4d1..ea966540c 100644 --- a/functional/tester/checker_runner.go +++ b/functional/tester/checker_runner.go @@ -14,7 +14,7 @@ package tester -import "github.com/coreos/etcd/functional/rpcpb" +import "go.etcd.io/etcd/functional/rpcpb" type runnerChecker struct { ctype rpcpb.Checker diff --git a/functional/tester/cluster.go b/functional/tester/cluster.go index f198be943..fe52e355d 100644 --- a/functional/tester/cluster.go +++ b/functional/tester/cluster.go @@ -29,9 +29,9 @@ import ( "sync" "time" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/debugutil" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/debugutil" + "go.etcd.io/etcd/pkg/fileutil" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" @@ -593,7 +593,7 @@ func (clus *Cluster) WaitHealth() error { // wait 60s to check cluster health. // TODO: set it to a reasonable value. It is set that high because // follower may use long time to catch up the leader when reboot under - // reasonable workload (https://github.com/coreos/etcd/issues/2698) + // reasonable workload (https://go.etcd.io/etcd/issues/2698) for i := 0; i < 60; i++ { for _, m := range clus.Members { if err = m.WriteHealthKey(); err != nil { diff --git a/functional/tester/cluster_read_config.go b/functional/tester/cluster_read_config.go index 186278b22..4ce9d076e 100644 --- a/functional/tester/cluster_read_config.go +++ b/functional/tester/cluster_read_config.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" yaml "gopkg.in/yaml.v2" diff --git a/functional/tester/cluster_run.go b/functional/tester/cluster_run.go index 6dd002106..f4091e0d8 100644 --- a/functional/tester/cluster_run.go +++ b/functional/tester/cluster_run.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go index 5d0a66ed0..7c7b25f2a 100644 --- a/functional/tester/cluster_test.go +++ b/functional/tester/cluster_test.go @@ -19,7 +19,7 @@ import ( "sort" "testing" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser.go b/functional/tester/stresser.go index 5f4fdea34..9a65eaa8b 100644 --- a/functional/tester/stresser.go +++ b/functional/tester/stresser.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" ) diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go index b3e46cc0e..7feec4637 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index 673634e10..e54d9f5f1 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/functional/tester/stresser_runner.go b/functional/tester/stresser_runner.go index efcdfb6a7..e8e2bd1f8 100644 --- a/functional/tester/stresser_runner.go +++ b/functional/tester/stresser_runner.go @@ -20,7 +20,7 @@ import ( "os/exec" "syscall" - "github.com/coreos/etcd/functional/rpcpb" + "go.etcd.io/etcd/functional/rpcpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/hack/patch/README.md b/hack/patch/README.md index 4f8282e6a..07c22e62b 100644 --- a/hack/patch/README.md +++ b/hack/patch/README.md @@ -5,7 +5,7 @@ Handles cherry-picks of PR(s) from etcd master to a stable etcd release branch a ## Setup Set the `UPSTREAM_REMOTE` and `FORK_REMOTE` environment variables. -`UPSTREAM_REMOTE` should be set to git remote name of `github.com/coreos/etcd`, +`UPSTREAM_REMOTE` should be set to git remote name of `github.com/etcd-io/etcd`, and `FORK_REMOTE` should be set to the git remote name of the forked etcd repo (`github.com/${github-username}/etcd`). Use `git remotes -v` to look up the git remote names. If etcd has not been forked, create diff --git a/hack/patch/cherrypick.sh b/hack/patch/cherrypick.sh index 4faf3efa2..ad143514f 100755 --- a/hack/patch/cherrypick.sh +++ b/hack/patch/cherrypick.sh @@ -136,7 +136,7 @@ cleanbranch="${NEWBRANCHUNIQ}" gitamcleanup=true for pull in "${PULLS[@]}"; do echo "+++ Downloading patch to /tmp/${pull}.patch (in case you need to do this again)" - curl -o "/tmp/${pull}.patch" -sSL "http://github.com/coreos/etcd/pull/${pull}.patch" + curl -o "/tmp/${pull}.patch" -sSL "http://github.com/etcd-io/etcd/pull/${pull}.patch" echo echo "+++ About to attempt cherry pick of PR. To reattempt:" echo " $ git am -3 /tmp/${pull}.patch" diff --git a/hack/tls-setup/README.md b/hack/tls-setup/README.md index 9f6873959..146187935 100644 --- a/hack/tls-setup/README.md +++ b/hack/tls-setup/README.md @@ -5,7 +5,7 @@ Defaults generate an ECDSA-384 root and leaf certificates for `localhost`. etcd **Instructions** 1. Install git, go, and make -2. Amend https://github.com/coreos/etcd/blob/master/hack/tls-setup/config/req-csr.json - IP's currently in the config should be replaced/added with IP addresses of each cluster node, please note 127.0.0.1 is always required for loopback purposes: +2. Amend https://github.com/etcd-io/etcd/blob/master/hack/tls-setup/config/req-csr.json - IP's currently in the config should be replaced/added with IP addresses of each cluster node, please note 127.0.0.1 is always required for loopback purposes: ```json Example: { diff --git a/integration/bridge.go b/integration/bridge.go index a61c1b4cc..483ee5829 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -21,7 +21,7 @@ import ( "net" "sync" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // bridge creates a unix socket bridge to another unix socket, making it possible diff --git a/integration/cluster.go b/integration/cluster.go index 3d842b9cd..c1149de85 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,24 +33,24 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "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/v3client" - "github.com/coreos/etcd/etcdserver/api/v3election" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/tlsutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" + "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/v3client" + "go.etcd.io/etcd/etcdserver/api/v3election" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "github.com/soheilhy/cmux" "go.uber.org/zap" diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index ff97e6146..8dd4d0370 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func toGRPC(c *clientv3.Client) grpcAPI { diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 1e8d8b572..055a73883 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -19,10 +19,10 @@ package integration import ( "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/proxy/grpcproxy" - "github.com/coreos/etcd/proxy/grpcproxy/adapter" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/namespace" + "go.etcd.io/etcd/proxy/grpcproxy" + "go.etcd.io/etcd/proxy/grpcproxy/adapter" ) var ( diff --git a/integration/cluster_test.go b/integration/cluster_test.go index 2e68c3286..113e2262d 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/pkg/testutil" ) func init() { @@ -450,7 +450,7 @@ func TestRejectUnhealthyRemove(t *testing.T) { // TestRestartRemoved ensures that restarting removed member must exit // if 'initial-cluster-state' is set 'new' and old data directory still exists -// (see https://github.com/coreos/etcd/issues/7512 for more). +// (see https://go.etcd.io/etcd/issues/7512 for more). func TestRestartRemoved(t *testing.T) { defer testutil.AfterTest(t) diff --git a/integration/embed_test.go b/integration/embed_test.go index 27c56303d..c95d78d35 100644 --- a/integration/embed_test.go +++ b/integration/embed_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" ) func TestEmbedEtcd(t *testing.T) { diff --git a/integration/logger_test.go b/integration/logger_test.go index 48da6e8bd..f36664ec7 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/integration/main_test.go b/integration/main_test.go index 2913ce511..c7362dde4 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/integration/member_test.go b/integration/member_test.go index 97c84bb13..87a70dda0 100644 --- a/integration/member_test.go +++ b/integration/member_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/client" + "go.etcd.io/etcd/pkg/testutil" ) func TestPauseMember(t *testing.T) { diff --git a/integration/metrics_test.go b/integration/metrics_test.go index 087e6db45..70dcf7b03 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestMetricDbSizeBoot checks that the db size metric is set on boot. diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go index db542943d..e815d6842 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { diff --git a/integration/util_test.go b/integration/util_test.go index 188941980..616988e5e 100644 --- a/integration/util_test.go +++ b/integration/util_test.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" ) // copyTLSFiles clones certs files to dst directory. diff --git a/integration/v2_http_kv_test.go b/integration/v2_http_kv_test.go index 4b8444479..c42e5a873 100644 --- a/integration/v2_http_kv_test.go +++ b/integration/v2_http_kv_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" ) func TestV2Set(t *testing.T) { diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index e66cf0bab..0763c9b02 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index bec4f8ae4..76c73b0ec 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error. diff --git a/integration/v3_barrier_test.go b/integration/v3_barrier_test.go index f86999c47..54fa3be66 100644 --- a/integration/v3_barrier_test.go +++ b/integration/v3_barrier_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/pkg/testutil" ) func TestBarrierSingleNode(t *testing.T) { diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index da520967d..dc5acd84c 100644 --- a/integration/v3_double_barrier_test.go +++ b/integration/v3_double_barrier_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" ) func TestDoubleBarrier(t *testing.T) { diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 341430df5..ea6d8ae99 100644 --- a/integration/v3_election_test.go +++ b/integration/v3_election_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" ) // TestElectionWait tests if followers can correctly wait for elections. @@ -201,7 +201,7 @@ func TestElectionSessionRecampaign(t *testing.T) { // TestElectionOnPrefixOfExistingKey checks that a single // candidate can be elected on a new key that is a prefix // of an existing key. To wit, check for regression -// of bug #6278. https://github.com/coreos/etcd/issues/6278 +// of bug #6278. https://go.etcd.io/etcd/issues/6278 // func TestElectionOnPrefixOfExistingKey(t *testing.T) { clus := NewClusterV3(t, &ClusterConfig{Size: 1}) diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go index 7b4d12a12..4b76513fa 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -60,7 +60,7 @@ func TestV3MaintenanceDefragmentInflightRange(t *testing.T) { // TestV3KVInflightRangeRequests ensures that inflight requests // (sent before server shutdown) are gracefully handled by server-side. // They are either finished or canceled, but never crash the backend. -// See https://github.com/coreos/etcd/issues/7322 for more detail. +// See https://go.etcd.io/etcd/issues/7322 for more detail. func TestV3KVInflightRangeRequests(t *testing.T) { defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 1}) diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index b193f661f..331f2bc60 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index 1636983cd..c5788fd12 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index 93c7f3ca6..1dcb98b67 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMoveLeader(t *testing.T) { testMoveLeader(t, true) } diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go index 4e47e6c0a..756407a37 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -337,14 +337,14 @@ func TestV3LeaseLeases(t *testing.T) { // TestV3LeaseRenewStress keeps creating lease and renewing it immediately to ensure the renewal goes through. // it was oberserved that the immediate lease renewal after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://go.etcd.io/etcd/issues/6978 func TestV3LeaseRenewStress(t *testing.T) { testLeaseStress(t, stressLeaseRenew) } // TestV3LeaseTimeToLiveStress keeps creating lease and retrieving it immediately to ensure the lease can be retrieved. // it was oberserved that the immediate lease retrieval after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://go.etcd.io/etcd/issues/6978 func TestV3LeaseTimeToLiveStress(t *testing.T) { testLeaseStress(t, stressLeaseTimeToLive) } @@ -437,7 +437,7 @@ func TestV3PutOnNonExistLease(t *testing.T) { } // TestV3GetNonExistLease ensures client retrieving nonexistent lease on a follower doesn't result node panic -// related issue https://github.com/coreos/etcd/issues/6537 +// related issue https://go.etcd.io/etcd/issues/6537 func TestV3GetNonExistLease(t *testing.T) { defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 3}) diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index 889a6ef1f..10b501eaf 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/contrib/recipes" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) func TestMutexSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index f7673f9b7..c7349fd84 100644 --- a/integration/v3_queue_test.go +++ b/integration/v3_queue_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/contrib/recipes" + "go.etcd.io/etcd/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index 7965b3c2c..25a1fd6c6 100644 --- a/integration/v3_stm_test.go +++ b/integration/v3_stm_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/pkg/testutil" + v3 "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/pkg/testutil" ) // TestSTMConflict tests that conflicts are retried. diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go index 07b7334cc..324ce49df 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go index 2b07a7161..c5dcb12c1 100644 --- a/integration/v3_watch_restore_test.go +++ b/integration/v3_watch_restore_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // TestV3WatchRestoreSnapshotUnsync tests whether slow follower can restore diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index c91f4df65..da255d569 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index 12a0908b7..d49ad24fc 100644 --- a/integration/v3election_grpc_test.go +++ b/integration/v3election_grpc_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index ccaf0a9cc..05276669f 100644 --- a/integration/v3lock_grpc_test.go +++ b/integration/v3lock_grpc_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" ) // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index aa713f28e..0f9c0c865 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/pkg/httputil" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/pkg/httputil" ) var ( diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go index 2159cff03..0802515d5 100644 --- a/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index ca7dd8560..16637ee7e 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -23,7 +23,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/etcdserver/etcdserverpb" io "io" ) diff --git a/lease/lessor.go b/lease/lessor.go index 4b81bd81a..4312fe176 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -24,9 +24,9 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_bench_test.go b/lease/lessor_bench_test.go index dd779b43c..4f14654a5 100644 --- a/lease/lessor_bench_test.go +++ b/lease/lessor_bench_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/lease/lessor_test.go b/lease/lessor_test.go index b034ca0a1..7f2d8f68b 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/main.go b/main.go index 0b7357376..c03c49d1e 100644 --- a/main.go +++ b/main.go @@ -13,16 +13,16 @@ // limitations under the License. // Package main is a simple wrapper of the real etcd entrypoint package -// (located at github.com/coreos/etcd/etcdmain) to ensure that etcd is still -// "go getable"; e.g. `go get github.com/coreos/etcd` works as expected and +// (located at go.etcd.io/etcd/etcdmain) to ensure that etcd is still +// "go getable"; e.g. `go get go.etcd.io/etcd` works as expected and // builds a binary in $GOBIN/etcd // // This package should NOT be extended or modified in any way; to modify the -// etcd binary, work in the `github.com/coreos/etcd/etcdmain` package. +// etcd binary, work in the `go.etcd.io/etcd/etcdmain` package. // package main -import "github.com/coreos/etcd/etcdmain" +import "go.etcd.io/etcd/etcdmain" func main() { etcdmain.Main() diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go index 4ba8ec568..880a48dd4 100644 --- a/mvcc/backend/backend.go +++ b/mvcc/backend/backend.go @@ -42,7 +42,7 @@ var ( // This only works for linux. initialMmapSize = uint64(10 * 1024 * 1024 * 1024) - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "mvcc/backend") // minSnapshotWarningTimeout is the minimum threshold to trigger a long running snapshot warning. minSnapshotWarningTimeout = 30 * time.Second diff --git a/mvcc/kv.go b/mvcc/kv.go index 2dad3ad8e..8e898a5ad 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" ) type RangeOptions struct { diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 97d216311..2c02ec089 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index 1e869c25b..bd2e77729 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -14,7 +14,7 @@ package mvcc -import "github.com/coreos/etcd/lease" +import "go.etcd.io/etcd/lease" type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 9c7f5c3ad..183e720e2 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/schedule" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/schedule" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -47,7 +47,7 @@ var ( ErrCanceled = errors.New("mvcc: watcher is canceled") ErrClosed = errors.New("mvcc: closed") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "mvcc") ) const ( diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index 6d38cd74e..0467ee7b1 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -18,8 +18,8 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index 546578c5a..dde51db8a 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index f4d0fdfe3..267c01b44 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/schedule" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/schedule" + "go.etcd.io/etcd/pkg/testutil" "go.uber.org/zap" ) diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index b520f7887..e56c679c9 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index 6a96be764..b4a29bc95 100644 --- a/mvcc/metrics_txn.go +++ b/mvcc/metrics_txn.go @@ -14,7 +14,7 @@ package mvcc -import "github.com/coreos/etcd/lease" +import "go.etcd.io/etcd/lease" type metricsTxnWrite struct { TxnWrite diff --git a/mvcc/util.go b/mvcc/util.go index aeb2ea8cb..032621aed 100644 --- a/mvcc/util.go +++ b/mvcc/util.go @@ -18,8 +18,8 @@ import ( "encoding/binary" "fmt" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index f04fe9943..7ac0df6ba 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 08010d3ab..07b8f351a 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,8 +19,8 @@ import ( "os" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index a929e995c..167315f1c 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index bc8eb645a..3bcfa4d75 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -14,7 +14,7 @@ package mvcc -import "github.com/coreos/etcd/mvcc/mvccpb" +import "go.etcd.io/etcd/mvcc/mvccpb" func (tw *watchableStoreTxnWrite) End() { changes := tw.Changes() diff --git a/mvcc/watcher.go b/mvcc/watcher.go index 886b87d5a..2846d62a5 100644 --- a/mvcc/watcher.go +++ b/mvcc/watcher.go @@ -19,7 +19,7 @@ import ( "errors" "sync" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) // AutoWatchID is the watcher ID passed in WatchStream.Watch when no diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go index c8244f65b..8a2ba61df 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go index b65c7bc5e..07029335a 100644 --- a/mvcc/watcher_group.go +++ b/mvcc/watcher_group.go @@ -18,8 +18,8 @@ import ( "fmt" "math" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/pkg/adt" ) var ( diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index 259968ab2..cb4e13b18 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go index caa5317cd..e3edf225c 100644 --- a/pkg/adt/example_test.go +++ b/pkg/adt/example_test.go @@ -17,7 +17,7 @@ package adt_test import ( "fmt" - "github.com/coreos/etcd/pkg/adt" + "go.etcd.io/etcd/pkg/adt" ) func Example() { diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go index 82996b6fb..5d9fb5303 100644 --- a/pkg/fileutil/fileutil.go +++ b/pkg/fileutil/fileutil.go @@ -31,7 +31,7 @@ const ( PrivateDirMode = 0700 ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/fileutil") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/fileutil") // IsDirWriteable checks if dir is writable by writing and removing a file // to dir. It returns nil if dir is writable. diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 9f3c02aba..215902cf8 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/flags") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/flags") // SetFlagsFromEnv parses all registered flags in the given flagset, // and if they are not already set it attempts to set their values from diff --git a/pkg/flags/unique_urls.go b/pkg/flags/unique_urls.go index 5f0b1451a..9b4178c3a 100644 --- a/pkg/flags/unique_urls.go +++ b/pkg/flags/unique_urls.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // UniqueURLs contains unique URLs diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 180a8d6f4..ca90970c2 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) // URLsValue wraps "types.URLs". diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go index 192ad888c..6a6746e0b 100644 --- a/pkg/ioutil/util.go +++ b/pkg/ioutil/util.go @@ -18,7 +18,7 @@ import ( "io" "os" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library, diff --git a/pkg/logutil/logger_test.go b/pkg/logutil/logger_test.go index 1f2ef9b68..312066500 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/pkg/logutil/merge_logger_test.go b/pkg/logutil/merge_logger_test.go index 10d0e4372..9eb1d016d 100644 --- a/pkg/logutil/merge_logger_test.go +++ b/pkg/logutil/merge_logger_test.go @@ -28,7 +28,7 @@ func TestMergeLogger(t *testing.T) { txt = "hello" repeatN = 6 duration = 2049843762 * time.Nanosecond - mg = NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/logutil")) + mg = NewMergeLogger(capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/logutil")) ) // overwrite this for testing defaultMergePeriod = time.Minute diff --git a/pkg/logutil/package_logger.go b/pkg/logutil/package_logger.go index 378bee0e3..729cbdb57 100644 --- a/pkg/logutil/package_logger.go +++ b/pkg/logutil/package_logger.go @@ -27,7 +27,7 @@ var _ Logger = &packageLogger{} // For example: // // var defaultLogger Logger -// defaultLogger = NewPackageLogger("github.com/coreos/etcd", "snapshot") +// defaultLogger = NewPackageLogger("go.etcd.io/etcd", "snapshot") // func NewPackageLogger(repo, pkg string) Logger { return &packageLogger{p: capnslog.NewPackageLogger(repo, pkg)} diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go index b6ab0052b..fa9887126 100644 --- a/pkg/logutil/package_logger_test.go +++ b/pkg/logutil/package_logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "go.etcd.io/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" ) @@ -29,9 +29,9 @@ func TestPackageLogger(t *testing.T) { buf := new(bytes.Buffer) capnslog.SetFormatter(capnslog.NewDefaultFormatter(buf)) - l := logutil.NewPackageLogger("github.com/coreos/etcd", "logger") + l := logutil.NewPackageLogger("go.etcd.io/etcd", "logger") - r := capnslog.MustRepoLogger("github.com/coreos/etcd") + r := capnslog.MustRepoLogger("go.etcd.io/etcd") r.SetLogLevel(map[string]capnslog.LogLevel{"logger": capnslog.INFO}) l.Infof("hello world!") diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go index b1788bc83..fcd390381 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/systemd" + "go.etcd.io/etcd/pkg/systemd" "github.com/coreos/go-systemd/journal" "go.uber.org/zap/zapcore" diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index 5ee703dd2..e92cba04c 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,7 +17,7 @@ package logutil import ( "errors" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go index d72b40b45..59c543eaf 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go index 4ecab9831..d05413e62 100644 --- a/pkg/mock/mockstorage/storage_recorder.go +++ b/pkg/mock/mockstorage/storage_recorder.go @@ -15,9 +15,9 @@ package mockstorage import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) type storageRecorder struct { diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 031f31c0c..2f4bf45db 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,8 +17,8 @@ package mockstore import ( "time" - "github.com/coreos/etcd/etcdserver/api/v2store" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/etcdserver/api/v2store" + "go.etcd.io/etcd/pkg/testutil" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go index f9c820092..eff1a4766 100644 --- a/pkg/mock/mockwait/wait_recorder.go +++ b/pkg/mock/mockwait/wait_recorder.go @@ -15,8 +15,8 @@ package mockwait import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/wait" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/wait" ) type WaitRecorder struct { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 52373bd06..faef6466e 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go index 797baeb48..5118d3dac 100644 --- a/pkg/netutil/routes_linux.go +++ b/pkg/netutil/routes_linux.go @@ -24,7 +24,7 @@ import ( "sort" "syscall" - "github.com/coreos/etcd/pkg/cpuutil" + "go.etcd.io/etcd/pkg/cpuutil" ) var errNoDefaultRoute = fmt.Errorf("could not find default route") diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index ef38280e7..f5c63e5e0 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -23,7 +23,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/osutil") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/osutil") // support to override setting SIG_DFL so tests don't terminate early setDflSignal = dflSignal diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go index d70f98dd8..53167ffa5 100644 --- a/pkg/pbutil/pbutil.go +++ b/pkg/pbutil/pbutil.go @@ -18,7 +18,7 @@ package pbutil import "github.com/coreos/pkg/capnslog" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/pbutil") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "pkg/pbutil") ) type Marshaler interface { diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index aef5bc19a..911c1a5cd 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" @@ -289,8 +289,8 @@ func (s *server) To() string { // TODO: implement packet reordering from multiple TCP connections // buffer packets per connection for awhile, reorder before transmit -// - https://github.com/coreos/etcd/issues/5614 -// - https://github.com/coreos/etcd/pull/6918#issuecomment-264093034 +// - https://go.etcd.io/etcd/issues/5614 +// - https://go.etcd.io/etcd/pull/6918#issuecomment-264093034 func (s *server) listenAndServe() { defer s.closeWg.Done() diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index d9db223ef..1ca0b6878 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go index e1df5254f..9914104a7 100644 --- a/pkg/srv/srv.go +++ b/pkg/srv/srv.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/pkg/types" ) var ( diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go index fdc67bcb7..4ac2744ce 100644 --- a/pkg/srv/srv_test.go +++ b/pkg/srv/srv_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestSRVGetCluster(t *testing.T) { diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 2ebae1e6e..8a867b163 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -21,7 +21,7 @@ CheckLeakedGoroutine verifies tests do not leave any leaky goroutines. It returns true when there are goroutines still running(leaking) after all tests. - import "github.com/coreos/etcd/pkg/testutil" + import "go.etcd.io/etcd/pkg/testutil" func TestMain(m *testing.M) { v := m.Run() @@ -125,8 +125,8 @@ func interestingGoroutines() (gs []string) { strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "runtime.goexit") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/testutil.interestingGoroutines") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/logutil.(*MergeLogger).outputLoop") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/testutil.interestingGoroutines") || + strings.Contains(stack, "go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop") || strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") || strings.Contains(stack, "created by runtime.gc") || strings.Contains(stack, "runtime.MHeap_Scavenger") { diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 662a0e178..620b9e790 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/tlsutil" + "go.etcd.io/etcd/pkg/tlsutil" "go.uber.org/zap" ) diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go index b91d1a926..268cb8b16 100644 --- a/pkg/types/urls_test.go +++ b/pkg/types/urls_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestNewURLs(t *testing.T) { diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go index 6f58765c0..35f34ab7c 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,7 +15,7 @@ package types import ( - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" "reflect" "testing" ) diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index 33dc91f01..59dbe6b0e 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go index 6c0340998..248dffd64 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/election_client_adapter.go b/proxy/grpcproxy/adapter/election_client_adapter.go index a2ebf138f..4722be040 100644 --- a/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go index acd5673d0..b1a782099 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go index 84c48b591..a58408f9f 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lock_client_adapter.go b/proxy/grpcproxy/adapter/lock_client_adapter.go index 9ce7913a3..65b5641d3 100644 --- a/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go index 92d9dfd20..4a8781b13 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go index afe61e837..2f629cc15 100644 --- a/proxy/grpcproxy/adapter/watch_client_adapter.go +++ b/proxy/grpcproxy/adapter/watch_client_adapter.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index 0ed8d246d..e2c7f8c4b 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index 70715e499..af369fe69 100644 --- a/proxy/grpcproxy/cache/store.go +++ b/proxy/grpcproxy/cache/store.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/adt" "github.com/golang/groupcache/lru" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/adt" ) var ( diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index 6e8d3c85b..ebab4ba44 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -20,10 +20,10 @@ import ( "os" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index f2c0af3f0..778681744 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 4b4a4cc42..8a80809d2 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index e5e91f29b..4756cff2e 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -19,9 +19,9 @@ import ( "net/http" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" ) // HandleHealth registers health handler on '/health'. diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 1c9860f98..d3a350994 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,9 +17,9 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/proxy/grpcproxy/cache" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index 33fb597c0..a1d29e179 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index 2e01b466f..bba2b9703 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,7 +19,7 @@ import ( "math" "sync" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "golang.org/x/time/rate" ) diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index 65f68b0ea..a688d429a 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index ceef26f0a..9e1543d83 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/proxy/grpcproxy/logger.go b/proxy/grpcproxy/logger.go index c2d818043..187951a55 100644 --- a/proxy/grpcproxy/logger.go +++ b/proxy/grpcproxy/logger.go @@ -16,4 +16,4 @@ package grpcproxy import "github.com/coreos/pkg/capnslog" -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "grpcproxy") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "grpcproxy") diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index 291e8e308..5e1e75176 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index 598c71f07..ba628c3eb 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,9 +18,9 @@ import ( "encoding/json" "os" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/clientv3/naming" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3/naming" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go index 7679e0e7b..33b01547c 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,10 +18,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/naming" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" gnaming "google.golang.org/grpc/naming" ) diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index a6d0b40dc..266ae7d72 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index 603095f27..ee1ba4e9c 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +18,10 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver/api/v3rpc" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index 46e56c79a..f9d2b148a 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) // watchBroadcast broadcasts a server watcher to many client watchers. diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 1a497462f..0068a69e5 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/mvccpb" ) type watchRange struct { diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go index 2ecff3aae..edbeaaa97 100644 --- a/proxy/httpproxy/reverse.go +++ b/proxy/httpproxy/reverse.go @@ -27,12 +27,12 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" "github.com/coreos/pkg/capnslog" + "go.etcd.io/etcd/etcdserver/api/v2http/httptypes" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/httpproxy") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "proxy/httpproxy") // Hop-by-hop headers. These are removed when sent to the backend. // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html diff --git a/proxy/tcpproxy/userspace.go b/proxy/tcpproxy/userspace.go index 381f4b8d3..94575307a 100644 --- a/proxy/tcpproxy/userspace.go +++ b/proxy/tcpproxy/userspace.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/tcpproxy") +var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "proxy/tcpproxy") type remote struct { mu sync.Mutex diff --git a/raft/README.md b/raft/README.md index 6ae005c95..0ddf3f48f 100644 --- a/raft/README.md +++ b/raft/README.md @@ -13,7 +13,7 @@ To keep the codebase small as well as provide flexibility, the library only impl In order to easily test the Raft library, its behavior should be deterministic. To achieve this determinism, the library models Raft as a state machine. The state machine takes a `Message` as input. A message can either be a local timer update or a network message sent from a remote peer. The state machine's output is a 3-tuple `{[]Messages, []LogEntries, NextState}` consisting of an array of `Messages`, `log entries`, and `Raft state changes`. For state machines with the same state, the same state machine input should always generate the same state machine output. -A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: https://github.com/coreos/etcd/tree/master/contrib/raftexample +A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: https://github.com/etcd-io/etcd/tree/master/contrib/raftexample # Features @@ -21,7 +21,7 @@ This raft implementation is a full feature implementation of Raft protocol. Feat - Leader election - Log replication -- Log compaction +- Log compaction - Membership changes - Leadership transfer extension - Efficient linearizable read-only queries served by both the leader and followers @@ -40,13 +40,13 @@ This raft implementation also includes a few optional enhancements: - Batching log entries to reduce disk synchronized I/O - Writing to leader's disk in parallel - Internal proposal redirection from followers to leader -- Automatic stepping down when the leader loses quorum +- Automatic stepping down when the leader loses quorum ## Notable Users - [cockroachdb](https://github.com/cockroachdb/cockroach) A Scalable, Survivable, Strongly-Consistent SQL Database - [dgraph](https://github.com/dgraph-io/dgraph) A Scalable, Distributed, Low Latency, High Throughput Graph Database -- [etcd](https://github.com/coreos/etcd) A distributed reliable key-value store +- [etcd](https://github.com/etcd-io/etcd) A distributed reliable key-value store - [tikv](https://github.com/pingcap/tikv) A Distributed transactional key value database powered by Rust and Raft - [swarmkit](https://github.com/docker/swarmkit) A toolkit for orchestrating distributed systems at any scale. - [chain core](https://github.com/chain/chain) Software for operating permissioned, multi-asset blockchain networks @@ -166,7 +166,7 @@ To propose changes to the state machine from the node to take application data, n.Propose(ctx, data) ``` -If the proposal is committed, data will appear in committed entries with type raftpb.EntryNormal. There is no guarantee that a proposed command will be committed; the command may have to be reproposed after a timeout. +If the proposal is committed, data will appear in committed entries with type raftpb.EntryNormal. There is no guarantee that a proposed command will be committed; the command may have to be reproposed after a timeout. To add or remove node in a cluster, build ConfChange struct 'cc' and call: diff --git a/raft/doc.go b/raft/doc.go index b55c591ff..43e484bc7 100644 --- a/raft/doc.go +++ b/raft/doc.go @@ -23,7 +23,7 @@ For more details on Raft, see "In Search of an Understandable Consensus Algorith A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: -https://github.com/coreos/etcd/tree/master/contrib/raftexample +https://go.etcd.io/etcd/tree/master/contrib/raftexample Usage diff --git a/raft/example_test.go b/raft/example_test.go index 26a1e0249..b56d2a28f 100644 --- a/raft/example_test.go +++ b/raft/example_test.go @@ -15,7 +15,7 @@ package raft import ( - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func applyToStore(ents []pb.Entry) {} diff --git a/raft/log.go b/raft/log.go index a3be7d486..50f28f87b 100644 --- a/raft/log.go +++ b/raft/log.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type raftLog struct { diff --git a/raft/log_test.go b/raft/log_test.go index 8fa60db84..a9ee6ce06 100644 --- a/raft/log_test.go +++ b/raft/log_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestFindConflict(t *testing.T) { diff --git a/raft/log_unstable.go b/raft/log_unstable.go index a8a8f5ca1..1005bf65c 100644 --- a/raft/log_unstable.go +++ b/raft/log_unstable.go @@ -14,7 +14,7 @@ package raft -import pb "github.com/coreos/etcd/raft/raftpb" +import pb "go.etcd.io/etcd/raft/raftpb" // unstable.entries[i] has raft log position i+unstable.offset. // Note that unstable.offset may be less than the highest log diff --git a/raft/log_unstable_test.go b/raft/log_unstable_test.go index 52cb9a20d..2821a1e77 100644 --- a/raft/log_unstable_test.go +++ b/raft/log_unstable_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestUnstableMaybeFirstIndex(t *testing.T) { diff --git a/raft/node.go b/raft/node.go index 57a974fcf..7c5f329e4 100644 --- a/raft/node.go +++ b/raft/node.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type SnapshotStatus int diff --git a/raft/node_test.go b/raft/node_test.go index e2002208f..1a6501cb8 100644 --- a/raft/node_test.go +++ b/raft/node_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/raft/raftpb" ) // readyWithTimeout selects from n.Ready() with a 1-second timeout. It diff --git a/raft/raft.go b/raft/raft.go index 7de19f948..81bad3bec 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -25,7 +25,7 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // None is a placeholder node ID used when there is no leader. diff --git a/raft/raft_flow_control_test.go b/raft/raft_flow_control_test.go index c745050f8..db3d98d1e 100644 --- a/raft/raft_flow_control_test.go +++ b/raft/raft_flow_control_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // TestMsgAppFlowControlFull ensures: diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go index 3237b66f0..313f9e6e5 100644 --- a/raft/raft_paper_test.go +++ b/raft/raft_paper_test.go @@ -33,7 +33,7 @@ import ( "reflect" "sort" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestFollowerUpdateTermFromMessage(t *testing.T) { diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go index de7f689d5..a80ed4da8 100644 --- a/raft/raft_snap_test.go +++ b/raft/raft_snap_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) var ( diff --git a/raft/raft_test.go b/raft/raft_test.go index 46bdefbcf..8619692f3 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // nextEnts returns the appliable entries and updates the applied index @@ -1439,7 +1439,7 @@ func TestHandleHeartbeatResp(t *testing.T) { // TestRaftFreesReadOnlyMem ensures raft will free read request from // readOnly readIndexQueue and pendingReadIndex map. -// related issue: https://github.com/coreos/etcd/issues/7571 +// related issue: https://go.etcd.io/etcd/issues/7571 func TestRaftFreesReadOnlyMem(t *testing.T) { sm := newTestRaft(1, []uint64{1, 2}, 5, 1, NewMemoryStorage()) sm.becomeCandidate() diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go index d10530e83..ee30fc0c4 100644 --- a/raft/rafttest/network.go +++ b/raft/rafttest/network.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // a network interface diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go index 52cde4393..cbfae9605 100644 --- a/raft/rafttest/network_test.go +++ b/raft/rafttest/network_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func TestNetworkDrop(t *testing.T) { diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go index 0c47bb2f9..57ff9b262 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" ) type node struct { diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go index 77b5df1f4..f28744ae8 100644 --- a/raft/rafttest/node_bench_test.go +++ b/raft/rafttest/node_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" ) func BenchmarkProposal3Nodes(b *testing.B) { diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go index 00c54c6ff..455f56591 100644 --- a/raft/rafttest/node_test.go +++ b/raft/rafttest/node_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft" + "go.etcd.io/etcd/raft" ) func TestBasicProgress(t *testing.T) { diff --git a/raft/rawnode.go b/raft/rawnode.go index fbd7a49e8..a4cecfc8f 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // ErrStepLocalMsg is returned when try to step a local raft message diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index f034521be..8b8ccf5d3 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) // TestRawNodeStep ensures that RawNode.Step ignore local message. diff --git a/raft/read_only.go b/raft/read_only.go index ae746fa73..aecc6b291 100644 --- a/raft/read_only.go +++ b/raft/read_only.go @@ -14,7 +14,7 @@ package raft -import pb "github.com/coreos/etcd/raft/raftpb" +import pb "go.etcd.io/etcd/raft/raftpb" // ReadState provides state for read only query. // It's caller's responsibility to call ReadIndex first before getting diff --git a/raft/status.go b/raft/status.go index f4d3d86a4..6d4aa7ba5 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,7 +17,7 @@ package raft import ( "fmt" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) type Status struct { diff --git a/raft/storage.go b/raft/storage.go index 69c3a7d90..14ad68608 100644 --- a/raft/storage.go +++ b/raft/storage.go @@ -18,7 +18,7 @@ import ( "errors" "sync" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) // ErrCompacted is returned by Storage.Entries/Compact when a requested diff --git a/raft/storage_test.go b/raft/storage_test.go index 71d50b4c9..71f9ac9df 100644 --- a/raft/storage_test.go +++ b/raft/storage_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func TestStorageTerm(t *testing.T) { diff --git a/raft/util.go b/raft/util.go index f4141fe65..d744927c4 100644 --- a/raft/util.go +++ b/raft/util.go @@ -18,7 +18,7 @@ import ( "bytes" "fmt" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) func (st StateType) MarshalJSON() ([]byte, error) { diff --git a/raft/util_test.go b/raft/util_test.go index 9d7eeb07b..52853892f 100644 --- a/raft/util_test.go +++ b/raft/util_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "go.etcd.io/etcd/raft/raftpb" ) var testFormatter EntryFormatter = func(data []byte) string { diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 7798c5d08..1f4e732a5 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -28,15 +28,15 @@ export GOPATH=${PWD}/gopath.proto export GOBIN=${PWD}/bin export PATH="${GOBIN}:${PATH}" -COREOS_ROOT="${GOPATH}/src/github.com/coreos" -ETCD_ROOT="${COREOS_ROOT}/etcd" +ETCD_IO_ROOT="${GOPATH}/src/go.etcd.io" +ETCD_ROOT="${ETCD_IO_ROOT}/etcd" GOGOPROTO_ROOT="${GOPATH}/src/github.com/gogo/protobuf" SCHWAG_ROOT="${GOPATH}/src/github.com/hexfusion/schwag" GOGOPROTO_PATH="${GOGOPROTO_ROOT}:${GOGOPROTO_ROOT}/protobuf" GRPC_GATEWAY_ROOT="${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway" rm -f "${ETCD_ROOT}" -mkdir -p "${COREOS_ROOT}" +mkdir -p "${ETCD_IO_ROOT}" ln -s "${PWD}" "${ETCD_ROOT}" # Ensure we have the right version of protoc-gen-gogo by building it every time. @@ -58,17 +58,17 @@ popd for dir in ${DIRS}; do pushd "${dir}" - protoc --gofast_out=plugins=grpc,import_prefix=github.com/coreos/:. -I=".:${GOGOPROTO_PATH}:${COREOS_ROOT}:${GRPC_GATEWAY_ROOT}/third_party/googleapis" ./*.proto + protoc --gofast_out=plugins=grpc,import_prefix=go.etcd.io/:. -I=".:${GOGOPROTO_PATH}:${ETCD_IO_ROOT}:${GRPC_GATEWAY_ROOT}/third_party/googleapis" ./*.proto # shellcheck disable=SC1117 - sed -i.bak -E 's/github\.com\/coreos\/(gogoproto|github\.com|golang\.org|google\.golang\.org)/\1/g' ./*.pb.go + sed -i.bak -E 's/go\.etcd\.io\/(gogoproto|github\.com|golang\.org|google\.golang\.org)/\1/g' ./*.pb.go # shellcheck disable=SC1117 - sed -i.bak -E 's/github\.com\/coreos\/(errors|fmt|io)/\1/g' ./*.pb.go + sed -i.bak -E 's/go\.etcd\.io\/(errors|fmt|io)/\1/g' ./*.pb.go # shellcheck disable=SC1117 sed -i.bak -E 's/import _ \"gogoproto\"//g' ./*.pb.go # shellcheck disable=SC1117 sed -i.bak -E 's/import fmt \"fmt\"//g' ./*.pb.go # shellcheck disable=SC1117 - sed -i.bak -E 's/import _ \"github\.com\/coreos\/google\/api\"//g' ./*.pb.go + sed -i.bak -E 's/import _ \"go\.etcd\.io\/google\/api\"//g' ./*.pb.go # shellcheck disable=SC1117 sed -i.bak -E 's/import _ \"google\.golang\.org\/genproto\/googleapis\/api\/annotations\"//g' ./*.pb.go rm -f ./*.bak @@ -83,7 +83,7 @@ for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionp protoc -I. \ -I"${GRPC_GATEWAY_ROOT}"/third_party/googleapis \ -I"${GOGOPROTO_PATH}" \ - -I"${COREOS_ROOT}" \ + -I"${ETCD_IO_ROOT}" \ --grpc-gateway_out=logtostderr=true:. \ --swagger_out=logtostderr=true:./Documentation/dev-guide/apispec/swagger/. \ ${protobase}.proto @@ -100,7 +100,7 @@ for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionp sed -i.bak -E "s/New[A-Za-z]*Client/${pkg}.&/" ${gwfile} # darwin doesn't like newlines in sed... # shellcheck disable=SC1117 - sed -i.bak -E "s|import \(|& \"github.com/coreos/etcd/${pkgpath}\"|" ${gwfile} + sed -i.bak -E "s|import \(|& \"go.etcd.io/etcd/${pkgpath}\"|" ${gwfile} mkdir -p "${pkgpath}"/gw/ go fmt ${gwfile} mv ${gwfile} "${pkgpath}/gw/" @@ -120,16 +120,16 @@ popd schwag -input=Documentation/dev-guide/apispec/swagger/rpc.swagger.json # install protodoc -# go get -v -u github.com/coreos/protodoc +# go get -v -u go.etcd.io/protodoc # # run './scripts/genproto.sh --skip-protodoc' # to skip protodoc generation # if [ "$1" != "--skip-protodoc" ]; then echo "protodoc is auto-generating grpc API reference documentation..." - go get -v -u github.com/coreos/protodoc - SHA_PROTODOC="4372ee725035a208404e2d5465ba921469decc32" - PROTODOC_PATH="${GOPATH}/src/github.com/coreos/protodoc" + go get -v -u go.etcd.io/protodoc + SHA_PROTODOC="484ab544e116302a9a6021cc7c427d334132e94a" + PROTODOC_PATH="${GOPATH}/src/go.etcd.io/protodoc" pushd "${PROTODOC_PATH}" git reset --hard "${SHA_PROTODOC}" go install diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh index 82c9cc11d..7602725d5 100755 --- a/scripts/updatebom.sh +++ b/scripts/updatebom.sh @@ -13,6 +13,6 @@ go get -v -u github.com/coreos/license-bill-of-materials echo "generating bill-of-materials.json" license-bill-of-materials \ --override-file ./bill-of-materials.override.json \ - github.com/coreos/etcd github.com/coreos/etcd/etcdctl > bill-of-materials.json + go.etcd.io/etcd go.etcd.io/etcd/etcdctl > bill-of-materials.json echo "generated bill-of-materials.json" diff --git a/tests/Dockerfile b/tests/Dockerfile index 666e9760f..3012dd6be 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -39,8 +39,8 @@ RUN rm -rf ${GOROOT} \ && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ && go version -RUN mkdir -p ${GOPATH}/src/github.com/coreos/etcd -WORKDIR ${GOPATH}/src/github.com/coreos/etcd +RUN mkdir -p ${GOPATH}/src/go.etcd.io/etcd +WORKDIR ${GOPATH}/src/go.etcd.io/etcd ADD ./scripts/install-marker.sh /tmp/install-marker.sh diff --git a/tests/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go index b6c93f440..f9028ae2b 100644 --- a/tests/e2e/cluster_proxy_test.go +++ b/tests/e2e/cluster_proxy_test.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) type proxyEtcdProcess struct { diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index 4b32db189..901f7aa7d 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/coreos/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver" ) const etcdProcessBasePort = 20000 diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index 890262504..cbea2a3d8 100644 --- a/tests/e2e/ctl_v2_test.go +++ b/tests/e2e/ctl_v2_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV2Set(t *testing.T) { testCtlV2Set(t, &configNoTLS, false) } diff --git a/tests/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go index fa6d1bab6..a8bc38483 100644 --- a/tests/e2e/ctl_v3_alarm_test.go +++ b/tests/e2e/ctl_v3_alarm_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3Alarm(t *testing.T) { diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index 928687d84..6dbcd1039 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3AuthEnable(t *testing.T) { testCtl(t, authEnableTest) } diff --git a/tests/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go index 02c7090f7..354953138 100644 --- a/tests/e2e/ctl_v3_elect_test.go +++ b/tests/e2e/ctl_v3_elect_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Elect(t *testing.T) { diff --git a/tests/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go index 821e77bb7..23070ba88 100644 --- a/tests/e2e/ctl_v3_endpoint_test.go +++ b/tests/e2e/ctl_v3_endpoint_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) func TestCtlV3EndpointHealth(t *testing.T) { testCtl(t, endpointHealthTest, withQuorum()) } diff --git a/tests/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go index 3e1332976..e27ccdea7 100644 --- a/tests/e2e/ctl_v3_lock_test.go +++ b/tests/e2e/ctl_v3_lock_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func TestCtlV3Lock(t *testing.T) { diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go index d0dbc41cc..417f8672b 100644 --- a/tests/e2e/ctl_v3_member_test.go +++ b/tests/e2e/ctl_v3_member_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestCtlV3MemberList(t *testing.T) { testCtl(t, memberListTest) } diff --git a/tests/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go index 9f84907f8..1ecffe589 100644 --- a/tests/e2e/ctl_v3_migrate_test.go +++ b/tests/e2e/ctl_v3_migrate_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV3Migrate(t *testing.T) { diff --git a/tests/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go index da77ff2f7..f603ad34a 100644 --- a/tests/e2e/ctl_v3_move_leader_test.go +++ b/tests/e2e/ctl_v3_move_leader_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" ) func TestCtlV3MoveLeaderSecure(t *testing.T) { diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index f69089b97..94929c089 100644 --- a/tests/e2e/ctl_v3_snapshot_test.go +++ b/tests/e2e/ctl_v3_snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/snapshot" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/clientv3/snapshot" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/testutil" ) func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) } diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index 82bcfdac0..04f5a6570 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go index b90824b2e..68370104f 100644 --- a/tests/e2e/etcd_config_test.go +++ b/tests/e2e/etcd_config_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const exampleConfigFile = "../../etcd.conf.yml.sample" diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index d72d08792..72b1c65ba 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "github.com/coreos/bbolt" ) diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go index 3663d248a..d6cb9d5de 100644 --- a/tests/e2e/etcd_process.go +++ b/tests/e2e/etcd_process.go @@ -19,8 +19,8 @@ import ( "net/url" "os" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" ) var ( diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index 136b62fd1..bb8cb7853 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/tests/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go index f8805825c..cbdb2e66a 100644 --- a/tests/e2e/etcd_spawn_cov.go +++ b/tests/e2e/etcd_spawn_cov.go @@ -24,9 +24,9 @@ import ( "syscall" "time" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/flags" + "go.etcd.io/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/flags" ) const noOutputLineCount = 2 // cov-enabled binaries emit PASS and coverage count lines diff --git a/tests/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go index 49d41822e..33f49ffa4 100644 --- a/tests/e2e/etcd_spawn_nocov.go +++ b/tests/e2e/etcd_spawn_nocov.go @@ -19,7 +19,7 @@ package e2e import ( "os" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) const noOutputLineCount = 0 // regular binaries emit no extra lines diff --git a/tests/e2e/gateway_test.go b/tests/e2e/gateway_test.go index 46bdb8918..ee7c415b0 100644 --- a/tests/e2e/gateway_test.go +++ b/tests/e2e/gateway_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) var ( diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index fcb681b5a..889d2cebc 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) var ( diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index 8c548c920..24ca95e4d 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/util.go b/tests/e2e/util.go index acbee8ae3..ce7289ae9 100644 --- a/tests/e2e/util.go +++ b/tests/e2e/util.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/expect" + "go.etcd.io/etcd/pkg/expect" ) func waitReadyExpectProc(exproc *expect.ExpectProcess, readyStrs []string) error { diff --git a/tests/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go index 22ef3bdca..3cbfc53f2 100644 --- a/tests/e2e/v2_curl_test.go +++ b/tests/e2e/v2_curl_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/testutil" ) func TestV2CurlNoTLS(t *testing.T) { testCurlPutGet(t, &configNoTLS) } diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 56393e4b5..501dc28e1 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/version" + "go.etcd.io/etcd/version" ) func TestV3CurlCipherSuitesValid(t *testing.T) { testV3CurlCipherSuites(t, true) } diff --git a/tests/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go index fc96a6e04..47d150a7a 100644 --- a/tests/e2e/v3_curl_lease_test.go +++ b/tests/e2e/v3_curl_lease_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" ) func TestV3CurlLeaseGrantNoTLS(t *testing.T) { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 250ea61aa..cdc99b7a1 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/testutil" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go index 85bbb161d..8104390c9 100644 --- a/tools/benchmark/cmd/lease.go +++ b/tools/benchmark/cmd/lease.go @@ -19,8 +19,8 @@ import ( "fmt" "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" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 2bf482d1b..026693efe 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,8 +21,8 @@ import ( "runtime/pprof" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 0e85d4b41..742ffe9cf 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" + "go.etcd.io/etcd/lease" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" "github.com/spf13/cobra" ) diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go index 3d61fefa6..4f99d5c57 100644 --- a/tools/benchmark/cmd/put.go +++ b/tools/benchmark/cmd/put.go @@ -24,8 +24,8 @@ import ( "strings" "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/dustin/go-humanize" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go index 465dad6e5..a24cce318 100644 --- a/tools/benchmark/cmd/range.go +++ b/tools/benchmark/cmd/range.go @@ -21,8 +21,8 @@ import ( "os" "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" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go index cf54c8dfe..83d96f5d4 100644 --- a/tools/benchmark/cmd/root.go +++ b/tools/benchmark/cmd/root.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/spf13/cobra" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go index 0312056e1..f8df5398d 100644 --- a/tools/benchmark/cmd/stm.go +++ b/tools/benchmark/cmd/stm.go @@ -23,10 +23,10 @@ import ( "os" "time" - v3 "github.com/coreos/etcd/clientv3" - v3sync "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - "github.com/coreos/etcd/pkg/report" + v3 "go.etcd.io/etcd/clientv3" + v3sync "go.etcd.io/etcd/clientv3/concurrency" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/txn_put.go b/tools/benchmark/cmd/txn_put.go index 1626411f7..e042aacf6 100644 --- a/tools/benchmark/cmd/txn_put.go +++ b/tools/benchmark/cmd/txn_put.go @@ -22,8 +22,8 @@ import ( "os" "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" "golang.org/x/time/rate" diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go index 22ad83125..04944a317 100644 --- a/tools/benchmark/cmd/util.go +++ b/tools/benchmark/cmd/util.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/bgentry/speakeasy" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "google.golang.org/grpc/grpclog" ) diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go index 5b2f57fc9..d217a39c8 100644 --- a/tools/benchmark/cmd/watch.go +++ b/tools/benchmark/cmd/watch.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" @@ -35,14 +35,14 @@ import ( var watchCmd = &cobra.Command{ Use: "watch", Short: "Benchmark watch", - Long: `Benchmark watch tests the performance of processing watch requests and -sending events to watchers. It tests the sending performance by -changing the value of the watched keys with concurrent put + Long: `Benchmark watch tests the performance of processing watch requests and +sending events to watchers. It tests the sending performance by +changing the value of the watched keys with concurrent put requests. -During the test, each watcher watches (--total/--watchers) keys +During the test, each watcher watches (--total/--watchers) keys -(a watcher might watch on the same key multiple times if +(a watcher might watch on the same key multiple times if --watched-key-total is small). Each key is watched by (--total/--watched-key-total) watchers. diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go index bb6ee64c8..c6def95fb 100644 --- a/tools/benchmark/cmd/watch_get.go +++ b/tools/benchmark/cmd/watch_get.go @@ -20,8 +20,8 @@ import ( "sync" "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" "gopkg.in/cheggaaa/pb.v1" diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go index f00d29fb1..fc48ea2f3 100644 --- a/tools/benchmark/cmd/watch_latency.go +++ b/tools/benchmark/cmd/watch_latency.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/report" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/report" "github.com/spf13/cobra" "golang.org/x/time/rate" diff --git a/tools/benchmark/main.go b/tools/benchmark/main.go index 2b0396b2b..4e70b8125 100644 --- a/tools/benchmark/main.go +++ b/tools/benchmark/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/etcd/tools/benchmark/cmd" + "go.etcd.io/etcd/tools/benchmark/cmd" ) func main() { diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 3b3eb1e54..f1a6eb119 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -19,10 +19,10 @@ import ( "fmt" "path/filepath" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/lease/leasepb" + "go.etcd.io/etcd/mvcc" + "go.etcd.io/etcd/mvcc/backend" + "go.etcd.io/etcd/mvcc/mvccpb" bolt "github.com/coreos/bbolt" ) @@ -111,7 +111,7 @@ func iterateBucket(dbPath, bucket string, limit uint64, decode bool) (err error) // iterate in reverse order (use First() and Next() for ascending order) for k, v := c.Last(); k != nil; k, v = c.Prev() { // TODO: remove sensitive information - // (https://github.com/coreos/etcd/issues/7620) + // (https://go.etcd.io/etcd/issues/7620) if dec, ok := decoders[bucket]; decode && ok { dec(k, v) } else { diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index ef0d49f2b..f1b6b631c 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal" + "go.etcd.io/etcd/auth/authpb" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 9c9b5e5ba..6bb589296 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,13 +28,13 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/snap" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "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/etcdserver/api/snap" + "go.etcd.io/etcd/etcdserver/etcdserverpb" + "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" "go.uber.org/zap" ) @@ -46,8 +46,8 @@ func main() { ConfigChange, Normal, Request, InternalRaftRequest, IRRRange, IRRPut, IRRDeleteRange, IRRTxn, IRRCompaction, IRRLeaseGrant, IRRLeaseRevoke, IRRLeaseCheckpoint`) - streamdecoder := flag.String("stream-decoder", "", `The name of an executable decoding tool, the executable must process - hex encoded lines of binary input (from etcd-dump-logs) + streamdecoder := flag.String("stream-decoder", "", `The name of an executable decoding tool, the executable must process + hex encoded lines of binary input (from etcd-dump-logs) and output a hex encoded line of binary for each input line`) flag.Parse() diff --git a/tools/etcd-dump-metrics/etcd.go b/tools/etcd-dump-metrics/etcd.go index 32aefa96a..2939b60c2 100644 --- a/tools/etcd-dump-metrics/etcd.go +++ b/tools/etcd-dump-metrics/etcd.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/install_darwin.go b/tools/etcd-dump-metrics/install_darwin.go index 33394e24b..4d545b240 100644 --- a/tools/etcd-dump-metrics/install_darwin.go +++ b/tools/etcd-dump-metrics/install_darwin.go @@ -24,7 +24,7 @@ import ( "os/exec" "path/filepath" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-darwin-amd64.zip` diff --git a/tools/etcd-dump-metrics/install_linux.go b/tools/etcd-dump-metrics/install_linux.go index 6faaa2325..0c6fc9707 100644 --- a/tools/etcd-dump-metrics/install_linux.go +++ b/tools/etcd-dump-metrics/install_linux.go @@ -23,7 +23,7 @@ import ( "os/exec" "path/filepath" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" ) const downloadURL = `https://storage.googleapis.com/etcd/%s/etcd-%s-linux-amd64.tar.gz` diff --git a/tools/etcd-dump-metrics/main.go b/tools/etcd-dump-metrics/main.go index 712be3c7d..a2ff77c31 100644 --- a/tools/etcd-dump-metrics/main.go +++ b/tools/etcd-dump-metrics/main.go @@ -24,7 +24,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/embed" + "go.etcd.io/etcd/embed" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-metrics/metrics.go b/tools/etcd-dump-metrics/metrics.go index dba687fbf..3840b20fb 100644 --- a/tools/etcd-dump-metrics/metrics.go +++ b/tools/etcd-dump-metrics/metrics.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/wal/decoder.go b/wal/decoder.go index 6a217f897..f2f01fd88 100644 --- a/wal/decoder.go +++ b/wal/decoder.go @@ -21,10 +21,10 @@ import ( "io" "sync" - "github.com/coreos/etcd/pkg/crc" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/pkg/crc" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" ) const minSectorSize = 512 diff --git a/wal/encoder.go b/wal/encoder.go index e8040b8df..d3877ed5c 100644 --- a/wal/encoder.go +++ b/wal/encoder.go @@ -21,9 +21,9 @@ import ( "os" "sync" - "github.com/coreos/etcd/pkg/crc" - "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/pkg/crc" + "go.etcd.io/etcd/pkg/ioutil" + "go.etcd.io/etcd/wal/walpb" ) // walPageBytes is the alignment for flushing records to the backing Writer. diff --git a/wal/file_pipeline.go b/wal/file_pipeline.go index 664649a15..e1e1c557b 100644 --- a/wal/file_pipeline.go +++ b/wal/file_pipeline.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/record_test.go b/wal/record_test.go index 2a6904a81..b725151a5 100644 --- a/wal/record_test.go +++ b/wal/record_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/wal/walpb" ) var ( diff --git a/wal/repair.go b/wal/repair.go index dd62ac0de..15afed017 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/repair_test.go b/wal/repair_test.go index c4b3593dc..b2a215bca 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/wal/util.go b/wal/util.go index 04096a41c..a3f314bb1 100644 --- a/wal/util.go +++ b/wal/util.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/fileutil" "go.uber.org/zap" ) diff --git a/wal/wal.go b/wal/wal.go index 7f653fbc2..7200ad088 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" @@ -54,7 +54,7 @@ var ( // so that tests can set a different segment size. SegmentSizeBytes int64 = 64 * 1000 * 1000 // 64MB - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal") + plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "wal") ErrMetadataConflict = errors.New("wal: conflicting metadata found") ErrFileNotFound = errors.New("wal: file not found") diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go index ae0142cee..20bed171d 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "github.com/coreos/etcd/raft/raftpb" + "go.etcd.io/etcd/raft/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/wal/wal_test.go b/wal/wal_test.go index 18b4c0cbb..8477a0402 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -24,10 +24,10 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "go.etcd.io/etcd/pkg/fileutil" + "go.etcd.io/etcd/pkg/pbutil" + "go.etcd.io/etcd/raft/raftpb" + "go.etcd.io/etcd/wal/walpb" "go.uber.org/zap" )