first requested changes for the PR

Author: dave-malone

core/types.go

@@ -0,0 +1,19 @@
+package core
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/aws/aws-lambda-go/events"
+)
+
+// Returns a dafault Gateway Timeout (504) response
+func GatewayTimeout() events.APIGatewayProxyResponse {
+	return events.APIGatewayProxyResponse{StatusCode: http.StatusGatewayTimeout}
+}
+
+func NewLoggedError(format string, a ...interface{}) error {
+	err := fmt.Errorf(format, a...)
+	fmt.Println(err.Error())
+	return err
+}

gin/ginlambda.go renamed to gin/adapter.go

@@ -1,10 +1,9 @@
 // Packge ginlambda add Gin support for the aws-severless-go-api library.
 // Uses the core package behind the scenes and exposes the New method to
 // get a new instance and Proxy method to send request to the Gin engine.
-package ginlambda
+package ginadapter
 
 import (
-	"log"
 	"net/http"
 
 	"github.com/aws/aws-lambda-go/events"
@@ -35,25 +34,16 @@ func (g *GinLambda) Proxy(req events.APIGatewayProxyRequest) (events.APIGatewayP
 	ginRequest, err := g.ProxyEventToHTTPRequest(req)
 
 	if err != nil {
-		log.Println("Could not convert proxy event to request")
-		log.Println(err)
-		return gatewayTimeout(), err
+		return core.GatewayTimeout(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
 	}
 
 	respWriter := core.NewProxyResponseWriter()
-
 	g.ginEngine.ServeHTTP(http.ResponseWriter(respWriter), ginRequest)
 
 	proxyResponse, err := respWriter.GetProxyResponse()
 	if err != nil {
-		log.Println("Error while generating proxy response")
-		log.Println(err)
-		return gatewayTimeout(), err
+		return core.GatewayTimeout(), core.NewLoggedError("Error while generating proxy response: %v", err)
 	}
-	return proxyResponse, nil
-}
 
-// Returns a dafault Gateway Timeout (504) response
-func gatewayTimeout() events.APIGatewayProxyResponse {
-	return events.APIGatewayProxyResponse{StatusCode: http.StatusGatewayTimeout}
+	return proxyResponse, nil
 }

gin/gin_suite_test.go

@@ -1,4 +1,4 @@
-package ginlambda_test
+package ginadapter_test
 
 import (
 	"testing"

gin/ginlambda_test.go

@@ -1,4 +1,4 @@
-package ginlambda_test
+package ginadapter_test
 
 import (
 	"log"
@@ -23,14 +23,14 @@ var _ = Describe("GinLambda tests", func() {
 				})
 			})
 
-			lambdaGin := ginlambda.New(r)
+			adapter := ginadapter.New(r)
 
 			req := events.APIGatewayProxyRequest{
 				Path:       "/ping",
 				HTTPMethod: "GET",
 			}
 
-			resp, err := lambdaGin.Proxy(req)
+			resp, err := adapter.Proxy(req)
 
 			Expect(err).To(BeNil())
 			Expect(resp.StatusCode).To(Equal(200))

gorillamux/adapter.go

@@ -1,7 +1,6 @@
 package gorillamux
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/aws/aws-lambda-go/events"
@@ -20,30 +19,19 @@ func New(router *mux.Router) *GorillaMuxAdapter {
 	}
 }
 
-func newLoggedError(format string, a ...interface{}) error {
-	err := fmt.Errorf(format, a...)
-	fmt.Println(err.Error())
-	return err
-}
-
 func (h *GorillaMuxAdapter) Proxy(event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	req, err := h.ProxyEventToHTTPRequest(event)
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Could not convert proxy event to request: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
 	}
 
 	w := core.NewProxyResponseWriter()
 	h.router.ServeHTTP(http.ResponseWriter(w), req)
 
 	resp, err := w.GetProxyResponse()
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Error while generating proxy response: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Error while generating proxy response: %v", err)
 	}
 
 	return resp, nil
 }
-
-// Returns a dafault Gateway Timeout (504) response
-func gatewayTimeout() events.APIGatewayProxyResponse {
-	return events.APIGatewayProxyResponse{StatusCode: http.StatusGatewayTimeout}
-}

handlerfunc/adapter.go

@@ -1,7 +1,6 @@
 package handlerfunc
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/aws/aws-lambda-go/events"
@@ -19,30 +18,19 @@ func New(handlerFunc http.HandlerFunc) *HandlerFuncAdapter {
 	}
 }
 
-func newLoggedError(format string, a ...interface{}) error {
-	err := fmt.Errorf(format, a...)
-	fmt.Println(err.Error())
-	return err
-}
-
 func (h *HandlerFuncAdapter) Proxy(event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	req, err := h.ProxyEventToHTTPRequest(event)
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Could not convert proxy event to request: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
 	}
 
 	w := core.NewProxyResponseWriter()
 	h.handlerFunc.ServeHTTP(http.ResponseWriter(w), req)
 
 	resp, err := w.GetProxyResponse()
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Error while generating proxy response: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Error while generating proxy response: %v", err)
 	}
 
 	return resp, nil
 }
-
-// Returns a dafault Gateway Timeout (504) response
-func gatewayTimeout() events.APIGatewayProxyResponse {
-	return events.APIGatewayProxyResponse{StatusCode: http.StatusGatewayTimeout}
-}

negroni/adapter.go

@@ -1,7 +1,6 @@
 package negroniadapter
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/aws/aws-lambda-go/events"
@@ -20,30 +19,19 @@ func New(n *negroni.Negroni) *NegroniAdapter {
 	}
 }
 
-func newLoggedError(format string, a ...interface{}) error {
-	err := fmt.Errorf(format, a...)
-	fmt.Println(err.Error())
-	return err
-}
-
 func (h *NegroniAdapter) Proxy(event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	req, err := h.ProxyEventToHTTPRequest(event)
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Could not convert proxy event to request: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
 	}
 
 	w := core.NewProxyResponseWriter()
 	h.n.ServeHTTP(http.ResponseWriter(w), req)
 
 	resp, err := w.GetProxyResponse()
 	if err != nil {
-		return gatewayTimeout(), newLoggedError("Error while generating proxy response: %v", err)
+		return core.GatewayTimeout(), core.NewLoggedError("Error while generating proxy response: %v", err)
 	}
 
 	return resp, nil
 }
-
-// Returns a dafault Gateway Timeout (504) response
-func gatewayTimeout() events.APIGatewayProxyResponse {
-	return events.APIGatewayProxyResponse{StatusCode: http.StatusGatewayTimeout}
-}