From 0096d2ecdb2c753d7150e48681769583a937da7b Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 27 Jan 2022 14:14:54 +0100 Subject: [PATCH] server: Remove unused NewClientHandler --- server/etcdserver/api/etcdhttp/base.go | 2 +- .../httptypes => etcdhttp/types}/errors.go | 0 .../types}/errors_test.go | 0 server/etcdserver/api/v2http/client.go | 50 ------------------- server/etcdserver/server.go | 2 +- server/proxy/httpproxy/reverse.go | 2 +- tests/framework/integration/cluster.go | 10 ++-- 7 files changed, 7 insertions(+), 59 deletions(-) rename server/etcdserver/api/{v2http/httptypes => etcdhttp/types}/errors.go (100%) rename server/etcdserver/api/{v2http/httptypes => etcdhttp/types}/errors_test.go (100%) delete mode 100644 server/etcdserver/api/v2http/client.go diff --git a/server/etcdserver/api/etcdhttp/base.go b/server/etcdserver/api/etcdhttp/base.go index 06067cc44..9dc313fc1 100644 --- a/server/etcdserver/api/etcdhttp/base.go +++ b/server/etcdserver/api/etcdhttp/base.go @@ -23,8 +23,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types" "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v2http/httptypes/errors.go b/server/etcdserver/api/etcdhttp/types/errors.go similarity index 100% rename from server/etcdserver/api/v2http/httptypes/errors.go rename to server/etcdserver/api/etcdhttp/types/errors.go diff --git a/server/etcdserver/api/v2http/httptypes/errors_test.go b/server/etcdserver/api/etcdhttp/types/errors_test.go similarity index 100% rename from server/etcdserver/api/v2http/httptypes/errors_test.go rename to server/etcdserver/api/etcdhttp/types/errors_test.go diff --git a/server/etcdserver/api/v2http/client.go b/server/etcdserver/api/v2http/client.go deleted file mode 100644 index 7b56da357..000000000 --- a/server/etcdserver/api/v2http/client.go +++ /dev/null @@ -1,50 +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 v2http provides etcd client and server implementations. -package v2http - -import ( - "net/http" - "time" - - "go.etcd.io/etcd/server/v3/etcdserver" - "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" - "go.uber.org/zap" -) - -// NewClientHandler generates a muxed http.Handler with the given parameters to serve etcd client requests. -func NewClientHandler(lg *zap.Logger, server etcdserver.ServerPeer, timeout time.Duration) http.Handler { - if lg == nil { - lg = zap.NewNop() - } - mux := http.NewServeMux() - etcdhttp.HandleBasic(lg, mux, server) - etcdhttp.HandleMetricsHealth(lg, mux, server) - return requestLogger(lg, mux) -} - -func requestLogger(lg *zap.Logger, handler http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if lg != nil { - lg.Debug( - "handling HTTP request", - zap.String("method", r.Method), - zap.String("request-uri", r.RequestURI), - zap.String("remote-addr", r.RemoteAddr), - ) - } - handler.ServeHTTP(w, r) - }) -} diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go index 1c8fd317e..c79055feb 100644 --- a/server/etcdserver/server.go +++ b/server/etcdserver/server.go @@ -51,10 +51,10 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" - "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/api/v3alarm" diff --git a/server/proxy/httpproxy/reverse.go b/server/proxy/httpproxy/reverse.go index 95a7e653f..0db63f938 100644 --- a/server/proxy/httpproxy/reverse.go +++ b/server/proxy/httpproxy/reverse.go @@ -26,7 +26,7 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes" + "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types" "go.uber.org/zap" ) diff --git a/tests/framework/integration/cluster.go b/tests/framework/integration/cluster.go index 594aafa4a..26fe39daf 100644 --- a/tests/framework/integration/cluster.go +++ b/tests/framework/integration/cluster.go @@ -47,7 +47,6 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/server/v3/etcdserver/api/v2http" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.etcd.io/etcd/server/v3/etcdserver/api/v3election" epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" @@ -992,14 +991,13 @@ func (m *Member) Launch() error { m.ServerClosers = append(m.ServerClosers, closer) } for _, ln := range m.ClientListeners { + handler := http.NewServeMux() + etcdhttp.HandleBasic(m.Logger, handler, m.Server) + etcdhttp.HandleMetricsHealthForV3(m.Logger, handler, m.Server) hs := &httptest.Server{ Listener: ln, Config: &http.Server{ - Handler: v2http.NewClientHandler( - m.Logger, - m.Server, - m.ServerConfig.ReqTimeout(), - ), + Handler: handler, ErrorLog: log.New(io.Discard, "net/http", 0), }, }