Proxy middleware refactor

Signed-off-by: Vishal Rana <vr@labstack.com>

middleware/body_dump.go

@@ -50,7 +50,7 @@ func BodyDump(handler BodyDumpHandler) echo.MiddlewareFunc {
 }
 
 // BodyDumpWithConfig returns a BodyDump middleware with config.
-// See: `BodyConfig()`.
+// See: `BodyDump()`.
 func BodyDumpWithConfig(config BodyDumpConfig) echo.MiddlewareFunc {
 	// Defaults
 	if config.Handler == nil {

middleware/proxy.go

@@ -53,6 +53,13 @@ type (
 	}
 )
 
+var (
+	// DefaultProxyConfig is the default Proxy middleware config.
+	DefaultProxyConfig = ProxyConfig{
+		Skipper: DefaultSkipper,
+	}
+)
+
 func proxyHTTP(t *ProxyTarget) http.Handler {
 	return httputil.NewSingleHostReverseProxy(t.URL)
 }
@@ -113,8 +120,18 @@ func (r *RoundRobinBalancer) Next() *ProxyTarget {
 	return t
 }
 
-// Proxy returns an HTTP/WebSocket reverse proxy middleware.
-func Proxy(config ProxyConfig) echo.MiddlewareFunc {
+// Proxy returns a Proxy middleware.
+//
+// Proxy middleware forwards a request to upstream server using a configured load balancing technique.
+func Proxy(balancer ProxyBalancer) echo.MiddlewareFunc {
+	c := DefaultProxyConfig
+	c.Balancer = balancer
+	return ProxyWithConfig(c)
+}
+
+// ProxyWithConfig returns a Proxy middleware with config.
+// See: `Proxy()`
+func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {
 	// Defaults
 	if config.Skipper == nil {
 		config.Skipper = DefaultLoggerConfig.Skipper

middleware/proxy_test.go

@@ -55,15 +55,13 @@ func TestProxy(t *testing.T) {
 			URL: url2,
 		},
 	}
-	config := ProxyConfig{
-		Balancer: &RandomBalancer{
-			Targets: targets,
-		},
+	rb := &RandomBalancer{
+		Targets: targets,
 	}
 
 	// Random
 	e := echo.New()
-	e.Use(Proxy(config))
+	e.Use(Proxy(rb))
 	req := httptest.NewRequest(echo.GET, "/", nil)
 	rec := newCloseNotifyRecorder()
 	e.ServeHTTP(rec, req)
@@ -77,11 +75,11 @@ func TestProxy(t *testing.T) {
 	})
 
 	// Round-robin
-	config.Balancer = &RoundRobinBalancer{
+	rrb := &RoundRobinBalancer{
 		Targets: targets,
 	}
 	e = echo.New()
-	e.Use(Proxy(config))
+	e.Use(Proxy(rrb))
 	rec = newCloseNotifyRecorder()
 	e.ServeHTTP(rec, req)
 	body = rec.Body.String()