diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index 8b0a4da85..c8708deff 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -22,7 +22,6 @@ import ( const ( keysPrefix = "/v2/keys" - membersPrefix = "/v2/members" deprecatedMachinesPrefix = "/v2/machines" raftPrefix = "/raft" @@ -49,7 +48,6 @@ func NewClientHandler(server *etcdserver.EtcdServer) http.Handler { // TODO: dynamic configuration may make this outdated. take care of it. // TODO: dynamic configuration may introduce race also. // TODO: add serveMembers - mux.HandleFunc(membersPrefix, sh.serveMachines) mux.HandleFunc(deprecatedMachinesPrefix, sh.serveMachines) mux.HandleFunc("/", http.NotFound) return mux diff --git a/etcdserver/etcdhttp/http_test.go b/etcdserver/etcdhttp/http_test.go index 339af8bd0..cb7647266 100644 --- a/etcdserver/etcdhttp/http_test.go +++ b/etcdserver/etcdhttp/http_test.go @@ -581,7 +581,7 @@ func (w *dummyWatcher) EventChan() chan *store.Event { func (w *dummyWatcher) StartIndex() uint64 { return w.sidx } func (w *dummyWatcher) Remove() {} -func TestV2MembersEndpoint(t *testing.T) { +func TestV2DeprecatedMachinesEndpoint(t *testing.T) { tests := []struct { method string wcode int @@ -596,7 +596,7 @@ func TestV2MembersEndpoint(t *testing.T) { defer s.Close() for _, tt := range tests { - req, err := http.NewRequest(tt.method, s.URL+membersPrefix, nil) + req, err := http.NewRequest(tt.method, s.URL+deprecatedMachinesPrefix, nil) if err != nil { t.Fatal(err) }