Move handlerfunc.NewHandler to httphandler.New

Author: Emil Pirfält

handlerfunc/adapter.go

@@ -18,12 +18,6 @@ func New(handlerFunc http.HandlerFunc) *HandlerFuncAdapter {
 	}
 }
 
-func NewHandler(handler http.Handler) *HandlerFuncAdapter {
-	return &HandlerFuncAdapter{
-		handler: handler,
-	}
-}
-
 func (h *HandlerFuncAdapter) Proxy(event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	req, err := h.ProxyEventToHTTPRequest(event)
 	if err != nil {

handlerfunc/adapter_test.go

@@ -20,7 +20,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }
 
 var _ = Describe("HandlerFuncAdapter tests", func() {
-	Context("Simple ping request, HandlerFunc", func() {
+	Context("Simple ping request", func() {
 		It("Proxies the event correctly", func() {
 			log.Println("Starting test")
 
@@ -42,22 +42,4 @@ var _ = Describe("HandlerFuncAdapter tests", func() {
 			Expect(resp.StatusCode).To(Equal(200))
 		})
 	})
-
-	Context("Simple ping request, Handler", func() {
-		It("Proxies the event correctly", func() {
-			log.Println("Starting test")
-
-			adapter := handlerfunc.NewHandler(handler{})
-
-			req := events.APIGatewayProxyRequest{
-				Path:       "/ping",
-				HTTPMethod: "GET",
-			}
-
-			resp, err := adapter.Proxy(req)
-
-			Expect(err).To(BeNil())
-			Expect(resp.StatusCode).To(Equal(200))
-		})
-	})
 })

httpadapter/adapter.go

@@ -0,0 +1,36 @@
+package httpadapter
+
+import (
+	"net/http"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/awslabs/aws-lambda-go-api-proxy/core"
+)
+
+type HandlerAdapter struct {
+	core.RequestAccessor
+	handler http.Handler
+}
+
+func New(handler http.Handler) *HandlerAdapter {
+	return &HandlerAdapter{
+		handler: handler,
+	}
+}
+
+func (h *HandlerAdapter) Proxy(event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+	req, err := h.ProxyEventToHTTPRequest(event)
+	if err != nil {
+		return core.GatewayTimeout(), core.NewLoggedError("Could not convert proxy event to request: %v", err)
+	}
+
+	w := core.NewProxyResponseWriter()
+	h.handler.ServeHTTP(http.ResponseWriter(w), req)
+
+	resp, err := w.GetProxyResponse()
+	if err != nil {
+		return core.GatewayTimeout(), core.NewLoggedError("Error while generating proxy response: %v", err)
+	}
+
+	return resp, nil
+}

httpadapter/adapter_test.go

@@ -0,0 +1,45 @@
+package httpadapter_test
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/awslabs/aws-lambda-go-api-proxy/httpadapter"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+type handler struct{}
+
+func (h handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	w.Header().Add("unfortunately-required-header", "")
+	fmt.Fprintf(w, "Go Lambda!!")
+}
+
+var _ = Describe("HTTPAdapter tests", func() {
+	Context("Simple ping request", func() {
+		It("Proxies the event correctly", func() {
+			log.Println("Starting test")
+
+			var httpHandler http.Handler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+				w.Header().Add("unfortunately-required-header", "")
+				fmt.Fprintf(w, "Go Lambda!!")
+			})
+
+			adapter := httpadapter.New(httpHandler)
+
+			req := events.APIGatewayProxyRequest{
+				Path:       "/ping",
+				HTTPMethod: "GET",
+			}
+
+			resp, err := adapter.Proxy(req)
+
+			Expect(err).To(BeNil())
+			Expect(resp.StatusCode).To(Equal(200))
+		})
+	})
+})

httpadapter/handlerfunc_suite_test.go

@@ -0,0 +1,13 @@
+package httpadapter_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestHTTPAdapter(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "HttpAdapter Suite")
+}