Add support for 2.0 apigw request/response

gateway.go

@@ -3,6 +3,7 @@ package gateway
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 
 	"github.com/aws/aws-lambda-go/events"
@@ -18,16 +19,41 @@ func ListenAndServe(addr string, h http.Handler) error {
 		h = http.DefaultServeMux
 	}
 
-	lambda.Start(func(ctx context.Context, e events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
-		r, err := NewRequest(ctx, e)
-		if err != nil {
-			return events.APIGatewayProxyResponse{}, err
-		}
+	gw := NewGateway(h)
 
-		w := NewResponse()
-		h.ServeHTTP(w, r)
-		return w.End(), nil
-	})
+	lambda.StartHandler(gw)
 
 	return nil
 }
+
+// NewGateway creates a gateway using the provided http.Handler enabling use in existing aws-lambda-go
+// projects
+func NewGateway(h http.Handler) *Gateway {
+	return &Gateway{h: h}
+}
+
+// Gateway wrap a http handler to enable use as a lambda.Handler
+type Gateway struct {
+	h http.Handler
+}
+
+// Invoke Handler implementation
+func (gw *Gateway) Invoke(ctx context.Context, payload []byte) ([]byte, error) {
+	evt := events.APIGatewayProxyRequest{}
+
+	if err := json.Unmarshal(payload, &evt); err != nil {
+		return nil, err
+	}
+
+	r, err := NewRequest(ctx, evt)
+	if err != nil {
+		return nil, err
+	}
+
+	w := NewResponse()
+	gw.h.ServeHTTP(w, r)
+
+	resp := w.End()
+
+	return json.Marshal(&resp)
+}

gateway_test.go

@@ -1,11 +1,14 @@
 package gateway_test
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
+	"testing"
 
 	"github.com/apex/gateway"
+	"github.com/tj/assert"
 )
 
 func Example() {
@@ -16,3 +19,14 @@ func Example() {
 func hello(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintln(w, "Hello World from Go")
 }
+
+func TestGateway_Invoke(t *testing.T) {
+
+	e := []byte(`{"version": "1.0", "rawPath": "/pets/luna", "requestContext": {"http": {"method": "POST"}}}`)
+
+	gw := gateway.NewGateway(http.HandlerFunc(hello))
+
+	payload, err := gw.Invoke(context.Background(), e)
+	assert.NoError(t, err)
+	assert.JSONEq(t, `{"body":"Hello World from Go\n", "headers":{"Content-Type":"text/plain; charset=utf8"}, "multiValueHeaders":{}, "statusCode":200}`, string(payload))
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/apex/gateway
 go 1.12
 
 require (
-	github.com/aws/aws-lambda-go v1.11.1
-	github.com/pkg/errors v0.8.1
-	github.com/tj/assert v0.0.0-20171129193455-018094318fb0
+	github.com/aws/aws-lambda-go v1.17.0
+	github.com/pkg/errors v0.9.1
+	github.com/tj/assert v0.0.3
 )

go.sum

@@ -1,13 +1,32 @@
-github.com/aws/aws-lambda-go v1.11.1 h1:wuOnhS5aqzPOWns71FO35PtbtBKHr4MYsPVt5qXLSfI=
-github.com/aws/aws-lambda-go v1.11.1/go.mod h1:Rr2SMTLeSMKgD45uep9V/NP8tnbCcySgu04cx0k/6cw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/aws/aws-lambda-go v1.17.0 h1:Ogihmi8BnpmCNktKAGpNwSiILNNING1MiosnKUfU8m0=
+github.com/aws/aws-lambda-go v1.17.0/go.mod h1:FEwgPLE6+8wcGBTe5cJN3JWurd1Ztm9zN4jsXsjzKKw=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
-github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/tj/assert v0.0.0-20171129193455-018094318fb0 h1:Rw8kxzWo1mr6FSaYXjQELRe88y2KdfynXdnK72rdjtA=
-github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
-gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
+github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tj/assert v0.0.1 h1:T7ozLNagrCCKl3wc+a706ztUCn/D6WHCJtkyvqYG+kQ=
+github.com/tj/assert v0.0.1/go.mod h1:lsg+GHQ0XplTcWKGxFLf/XPcPxWO8x2ut5jminoR2rA=
+github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk=
+github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

v2/context.go

@@ -0,0 +1,24 @@
+package gateway
+
+import (
+	"context"
+
+	"github.com/aws/aws-lambda-go/events"
+)
+
+// key is the type used for any items added to the request context.
+type key int
+
+// requestContextKey is the key for the api gateway proxy `RequestContext`.
+const requestContextKey key = iota
+
+// RequestContext returns the APIGatewayV2HTTPRequestContext value stored in ctx.
+func RequestContext(ctx context.Context) (events.APIGatewayV2HTTPRequestContext, bool) {
+	c, ok := ctx.Value(requestContextKey).(events.APIGatewayV2HTTPRequestContext)
+	return c, ok
+}
+
+// newContext returns a new Context with specific api gateway v2 values.
+func newContext(ctx context.Context, e events.APIGatewayV2HTTPRequest) context.Context {
+	return context.WithValue(ctx, requestContextKey, e.RequestContext)
+}

v2/gateway.go

@@ -0,0 +1,59 @@
+// Package gateway provides a drop-in replacement for net/http.ListenAndServe for use in AWS Lambda & API Gateway.
+package gateway
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+// ListenAndServe is a drop-in replacement for
+// http.ListenAndServe for use within AWS Lambda.
+//
+// ListenAndServe always returns a non-nil error.
+func ListenAndServe(addr string, h http.Handler) error {
+	if h == nil {
+		h = http.DefaultServeMux
+	}
+
+	gw := NewGateway(h)
+
+	lambda.StartHandler(gw)
+
+	return nil
+}
+
+// NewGateway creates a gateway using the provided http.Handler enabling use in existing aws-lambda-go
+// projects
+func NewGateway(h http.Handler) *Gateway {
+	return &Gateway{h: h}
+}
+
+// Gateway wrap a http handler to enable use as a lambda.Handler
+type Gateway struct {
+	h http.Handler
+}
+
+// Invoke Handler implementation
+func (gw *Gateway) Invoke(ctx context.Context, payload []byte) ([]byte, error) {
+	var evt events.APIGatewayV2HTTPRequest
+
+	if err := json.Unmarshal(payload, &evt); err != nil {
+		return []byte{}, err
+	}
+
+	r, err := NewRequest(ctx, evt)
+	if err != nil {
+		return []byte{}, err
+	}
+
+	w := NewResponse()
+	gw.h.ServeHTTP(w, r)
+
+	resp := w.End()
+
+	return json.Marshal(&resp)
+}

v2/gateway_test.go

@@ -0,0 +1,32 @@
+package gateway_test
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net/http"
+	"testing"
+
+	"github.com/apex/gateway/v2"
+	"github.com/tj/assert"
+)
+
+func Example() {
+	http.HandleFunc("/", hello)
+	log.Fatal(gateway.ListenAndServe(":3000", nil))
+}
+
+func hello(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintln(w, "Hello World from Go")
+}
+
+func TestGateway_Invoke(t *testing.T) {
+
+	e := []byte(`{"version": "2.0", "rawPath": "/pets/luna", "requestContext": {"http": {"method": "POST"}}}`)
+
+	gw := gateway.NewGateway(http.HandlerFunc(hello))
+
+	payload, err := gw.Invoke(context.Background(), e)
+	assert.NoError(t, err)
+	assert.JSONEq(t, `{"body":"Hello World from Go\n", "cookies": null, "headers":{"Content-Type":"text/plain; charset=utf8"}, "multiValueHeaders":{}, "statusCode":200}`, string(payload))
+}

v2/go.mod

@@ -0,0 +1,10 @@
+module github.com/apex/gateway/v2
+
+go 1.12
+
+require (
+	github.com/apex/gateway v1.1.1
+	github.com/aws/aws-lambda-go v1.17.0
+	github.com/pkg/errors v0.9.1
+	github.com/tj/assert v0.0.3
+)

v2/go.sum

@@ -0,0 +1,33 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/apex/gateway v1.1.1 h1:dPE3y2LQ/fSJuZikCOvekqXLyn/Wrbgt10MSECobH/Q=
+github.com/apex/gateway v1.1.1/go.mod h1:x7iPY22zu9D8sfrynawEwh1wZEO/kQTRaOM5ye02tWU=
+github.com/aws/aws-lambda-go v1.17.0 h1:Ogihmi8BnpmCNktKAGpNwSiILNNING1MiosnKUfU8m0=
+github.com/aws/aws-lambda-go v1.17.0/go.mod h1:FEwgPLE6+8wcGBTe5cJN3JWurd1Ztm9zN4jsXsjzKKw=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
+github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tj/assert v0.0.1 h1:T7ozLNagrCCKl3wc+a706ztUCn/D6WHCJtkyvqYG+kQ=
+github.com/tj/assert v0.0.1/go.mod h1:lsg+GHQ0XplTcWKGxFLf/XPcPxWO8x2ut5jminoR2rA=
+github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk=
+github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

v2/request.go

@@ -0,0 +1,77 @@
+package gateway
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/pkg/errors"
+)
+
+// NewRequest returns a new http.Request from the given Lambda event.
+func NewRequest(ctx context.Context, e events.APIGatewayV2HTTPRequest) (*http.Request, error) {
+	// path
+	u, err := url.Parse(e.RawPath)
+	if err != nil {
+		return nil, errors.Wrap(err, "parsing path")
+	}
+
+	u.RawQuery = e.RawQueryString
+
+	// base64 encoded body
+	body := e.Body
+	if e.IsBase64Encoded {
+		b, err := base64.StdEncoding.DecodeString(body)
+		if err != nil {
+			return nil, errors.Wrap(err, "decoding base64 body")
+		}
+		body = string(b)
+	}
+
+	// new request
+	req, err := http.NewRequest(e.RequestContext.HTTP.Method, u.String(), strings.NewReader(body))
+	if err != nil {
+		return nil, errors.Wrap(err, "creating request")
+	}
+
+	// manually set RequestURI because NewRequest is for clients and req.RequestURI is for servers
+	req.RequestURI = e.RawPath
+
+	// remote addr
+	req.RemoteAddr = e.RequestContext.HTTP.SourceIP
+
+	// header fields
+	for k, values := range e.Headers {
+		for _, v := range strings.Split(values, ",") {
+			req.Header.Add(k, v)
+		}
+	}
+
+	// content-length
+	if req.Header.Get("Content-Length") == "" && body != "" {
+		req.Header.Set("Content-Length", strconv.Itoa(len(body)))
+	}
+
+	// custom fields
+	req.Header.Set("X-Request-Id", e.RequestContext.RequestID)
+	req.Header.Set("X-Stage", e.RequestContext.Stage)
+
+	// custom context values
+	req = req.WithContext(newContext(ctx, e))
+
+	// xray support
+	if traceID := ctx.Value("x-amzn-trace-id"); traceID != nil {
+		req.Header.Set("X-Amzn-Trace-Id", fmt.Sprintf("%v", traceID))
+	}
+
+	// host
+	req.URL.Host = req.Header.Get("Host")
+	req.Host = req.URL.Host
+
+	return req, nil
+}