diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index d25c4e9ba..d0ac32647 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -26,7 +26,7 @@ import ( "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/testutil" diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index 0a9213b01..ce376cbe6 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -20,7 +20,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/lease/leasehttp" + "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/rafthttp" ) diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index 5b4f2b142..f872e860f 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -21,7 +21,7 @@ import ( "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" + "github.com/coreos/etcd/internal/lease" ) type LeaseServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index 328135b1e..79c3559ad 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -22,7 +22,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc" "google.golang.org/grpc/codes" diff --git a/etcdserver/apply.go b/etcdserver/apply.go index ce4bfbfbc..5cc1c6963 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -22,7 +22,7 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/types" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index ec9391435..b2ecc2221 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -19,7 +19,7 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc" ) diff --git a/etcdserver/backend.go b/etcdserver/backend.go index f3c35fd1b..2351b15ac 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,8 +19,8 @@ import ( "os" "time" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/raftsnap" - "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/raft/raftpb" diff --git a/etcdserver/server.go b/etcdserver/server.go index c3ad2d4ba..0f075eb7c 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -38,10 +38,10 @@ import ( "github.com/coreos/etcd/internal/alarm" "github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/internal/discovery" + "github.com/coreos/etcd/internal/lease" + "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" - "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" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 231feccdb..dc0bba891 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -28,9 +28,9 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" - "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/fileutil" diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 1f24f272f..059e5f6f9 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -23,8 +23,8 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasehttp" + "github.com/coreos/etcd/internal/lease" + "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/raft" diff --git a/lease/doc.go b/internal/lease/doc.go similarity index 100% rename from lease/doc.go rename to internal/lease/doc.go diff --git a/lease/leasehttp/doc.go b/internal/lease/leasehttp/doc.go similarity index 100% rename from lease/leasehttp/doc.go rename to internal/lease/leasehttp/doc.go diff --git a/lease/leasehttp/http.go b/internal/lease/leasehttp/http.go similarity index 98% rename from lease/leasehttp/http.go rename to internal/lease/leasehttp/http.go index aa713f28e..de561ab48 100644 --- a/lease/leasehttp/http.go +++ b/internal/lease/leasehttp/http.go @@ -24,8 +24,8 @@ import ( "time" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasepb" + "github.com/coreos/etcd/internal/lease" + "github.com/coreos/etcd/internal/lease/leasepb" "github.com/coreos/etcd/pkg/httputil" ) diff --git a/lease/leasehttp/http_test.go b/internal/lease/leasehttp/http_test.go similarity index 98% rename from lease/leasehttp/http_test.go rename to internal/lease/leasehttp/http_test.go index 367cd8e64..a83953989 100644 --- a/lease/leasehttp/http_test.go +++ b/internal/lease/leasehttp/http_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/lease/leasepb/lease.pb.go b/internal/lease/leasepb/lease.pb.go similarity index 100% rename from lease/leasepb/lease.pb.go rename to internal/lease/leasepb/lease.pb.go diff --git a/lease/leasepb/lease.proto b/internal/lease/leasepb/lease.proto similarity index 100% rename from lease/leasepb/lease.proto rename to internal/lease/leasepb/lease.proto diff --git a/lease/lessor.go b/internal/lease/lessor.go similarity index 99% rename from lease/lessor.go rename to internal/lease/lessor.go index 29a012416..513458997 100644 --- a/lease/lessor.go +++ b/internal/lease/lessor.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/lease/leasepb" + "github.com/coreos/etcd/internal/lease/leasepb" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/lease/lessor_test.go b/internal/lease/lessor_test.go similarity index 100% rename from lease/lessor_test.go rename to internal/lease/lessor_test.go diff --git a/mvcc/kv.go b/mvcc/kv.go index 2dad3ad8e..b149eb522 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 2d7dc01ff..07289741d 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/testutil" diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index f40ba8edc..8269a7273 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -14,9 +14,7 @@ package mvcc -import ( - "github.com/coreos/etcd/lease" -) +import "github.com/coreos/etcd/internal/lease" type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 486365a92..4c022d249 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -24,7 +24,7 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/schedule" diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index a64a3c5a5..af4310c1f 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -18,7 +18,7 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index b2ee570f9..fc04ef4ed 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index 9c84abc9c..f315282e5 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/schedule" diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 8896fb86d..7122d64ae 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index 911d64875..8f81f45e1 100644 --- a/mvcc/metrics_txn.go +++ b/mvcc/metrics_txn.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" ) type metricsTxnWrite struct { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index 2d8545942..ee0d86727 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 198fea6bb..bda6e8c6c 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index c36a541a5..16bbffc35 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go index 86cbea7df..a41781781 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" ) diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index ad5b54d7a..d9a11cb82 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index 0ed46c70f..26cb83a04 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -30,9 +30,9 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" - "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/fileutil" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index 2bf482d1b..ade9b3b47 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,7 +21,7 @@ import ( "runtime/pprof" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/pkg/report" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 446ffed5f..dac23a259 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -18,7 +18,7 @@ import ( "os" "time" - "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/spf13/cobra" diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index f610b4cd9..d40ce093a 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -20,7 +20,7 @@ import ( "path/filepath" bolt "github.com/coreos/bbolt" - "github.com/coreos/etcd/lease/leasepb" + "github.com/coreos/etcd/internal/lease/leasepb" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb"