From 671f1c41a89c7241c447f965c5bae7ec6f2a3eeb Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 21 May 2018 09:49:48 -0700
Subject: [PATCH] etcdserver/api/v2discovery: move internal "discovery" package

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 etcdmain/etcd.go                                       | 10 +++++-----
 {discovery => etcdserver/api/v2discovery}/discovery.go |  6 +++---
 .../api/v2discovery}/discovery_test.go                 |  2 +-
 etcdserver/server.go                                   |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename {discovery => etcdserver/api/v2discovery}/discovery.go (98%)
 rename {discovery => etcdserver/api/v2discovery}/discovery_test.go (99%)

diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index 97dbba5f3..35f17a5fd 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/discovery"
 	"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"
@@ -170,7 +170,7 @@ func startEtcdOrProxyV2() {
 		shouldProxy := cfg.isProxy()
 		if !shouldProxy {
 			stopped, errc, err = startEtcd(&cfg.ec)
-			if derr, ok := err.(*etcdserver.DiscoveryError); ok && derr.Err == discovery.ErrFullCluster {
+			if derr, ok := err.(*etcdserver.DiscoveryError); ok && derr.Err == v2discovery.ErrFullCluster {
 				if cfg.shouldFallbackToProxy() {
 					if lg != nil {
 						lg.Warn(
@@ -197,7 +197,7 @@ func startEtcdOrProxyV2() {
 	if err != nil {
 		if derr, ok := err.(*etcdserver.DiscoveryError); ok {
 			switch derr.Err {
-			case discovery.ErrDuplicateID:
+			case v2discovery.ErrDuplicateID:
 				if lg != nil {
 					lg.Warn(
 						"member has been registered with discovery service",
@@ -218,7 +218,7 @@ func startEtcdOrProxyV2() {
 					plog.Infof("or use a new discovery token if the previous bootstrap failed.")
 				}
 
-			case discovery.ErrDuplicateName:
+			case v2discovery.ErrDuplicateName:
 				if lg != nil {
 					lg.Warn(
 						"member with duplicated name has already been registered",
@@ -426,7 +426,7 @@ func startProxy(cfg *config) error {
 
 		if cfg.ec.Durl != "" {
 			var s string
-			s, err = discovery.GetCluster(lg, cfg.ec.Durl, cfg.ec.Dproxy)
+			s, err = v2discovery.GetCluster(lg, cfg.ec.Durl, cfg.ec.Dproxy)
 			if err != nil {
 				return err
 			}
diff --git a/discovery/discovery.go b/etcdserver/api/v2discovery/discovery.go
similarity index 98%
rename from discovery/discovery.go
rename to etcdserver/api/v2discovery/discovery.go
index 5ff5f8e23..7f690b49e 100644
--- a/discovery/discovery.go
+++ b/etcdserver/api/v2discovery/discovery.go
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package discovery provides an implementation of the cluster discovery that
-// is used by etcd.
-package discovery
+// Package v2discovery provides an implementation of the cluster discovery that
+// is used by etcd with v2 client.
+package v2discovery
 
 import (
 	"context"
diff --git a/discovery/discovery_test.go b/etcdserver/api/v2discovery/discovery_test.go
similarity index 99%
rename from discovery/discovery_test.go
rename to etcdserver/api/v2discovery/discovery_test.go
index f448dc463..8d97b08a7 100644
--- a/discovery/discovery_test.go
+++ b/etcdserver/api/v2discovery/discovery_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery
+package v2discovery
 
 import (
 	"context"
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 5b172b6fb..5137c78be 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -32,9 +32,9 @@ import (
 	"github.com/coreos/etcd/alarm"
 	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/compactor"
-	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/etcdserver/api"
 	"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"
@@ -375,7 +375,7 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) {
 		}
 		if cfg.ShouldDiscover() {
 			var str string
-			str, err = discovery.JoinCluster(cfg.Logger, cfg.DiscoveryURL, cfg.DiscoveryProxy, m.ID, cfg.InitialPeerURLsMap.String())
+			str, err = v2discovery.JoinCluster(cfg.Logger, cfg.DiscoveryURL, cfg.DiscoveryProxy, m.ID, cfg.InitialPeerURLsMap.String())
 			if err != nil {
 				return nil, &DiscoveryError{Op: "join", Err: err}
 			}