Support V2 payloads for Echo

Author: AlexLast

echo/adapter.go

@@ -17,6 +17,7 @@ import (
 // creates a proxy response object from the http.ResponseWriter
 type EchoLambda struct {
 	core.RequestAccessor
+	v2 core.RequestAccessorV2
 
 	Echo *echo.Echo
 }
@@ -36,6 +37,12 @@ func (e *EchoLambda) Proxy(req events.APIGatewayProxyRequest) (events.APIGateway
 	return e.proxyInternal(echoRequest, err)
 }
 
+// ProxyV2 is the same as Proxy(), but for V2 payloads instead
+func (e *EchoLambda) ProxyV2(req events.APIGatewayV2HTTPRequest) (events.APIGatewayV2HTTPResponse, error) {
+	echoRequest, err := e.v2.ProxyEventToHTTPRequest(req)
+	return e.proxyInternalV2(echoRequest, err)
+}
+
 // ProxyWithContext receives context and an API Gateway proxy event,
 // transforms them into an http.Request object, and sends it to the echo.Echo for routing.
 // It returns a proxy response object generated from the http.ResponseWriter.
@@ -44,6 +51,12 @@ func (e *EchoLambda) ProxyWithContext(ctx context.Context, req events.APIGateway
 	return e.proxyInternal(echoRequest, err)
 }
 
+// ProxyWithContextV2 is the same as ProxyWithContext(), but for V2 payloads instead
+func (e *EchoLambda) ProxyWithContextV2(ctx context.Context, req events.APIGatewayV2HTTPRequest) (events.APIGatewayV2HTTPResponse, error) {
+	echoRequest, err := e.v2.EventToRequestWithContext(ctx, req)
+	return e.proxyInternalV2(echoRequest, err)
+}
+
 func (e *EchoLambda) proxyInternal(req *http.Request, err error) (events.APIGatewayProxyResponse, error) {
 
 	if err != nil {
@@ -60,3 +73,20 @@ func (e *EchoLambda) proxyInternal(req *http.Request, err error) (events.APIGate
 
 	return proxyResponse, nil
 }
+
+func (e *EchoLambda) proxyInternalV2(req *http.Request, err error) (events.APIGatewayV2HTTPResponse, error) {
+
+	if err != nil {
+		return core.GatewayTimeoutV2(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
+	}
+
+	respWriter := core.NewProxyResponseWriterV2()
+	e.Echo.ServeHTTP(http.ResponseWriter(respWriter), req)
+
+	proxyResponse, err := respWriter.GetProxyResponse()
+	if err != nil {
+		return core.GatewayTimeoutV2(), core.NewLoggedError("Error while generating proxy response: %v", err)
+	}
+
+	return proxyResponse, nil
+}