added support for aws go runtime

Author: Dana H. P'Simer, Jr

.gitignore

@@ -29,3 +29,5 @@ _testmain.go
 .idea
 
 examples/helloWorld/helloWorld
+examples/helloWorld/aws/handler
+

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vendor/github.com/aws/aws-lambda-go"]
+	path = vendor/github.com/aws/aws-lambda-go
+	url = https://github.com/aws/aws-lambda-go
+[submodule "vendor/github.com/eawsy/aws-lambda-go"]
+	path = vendor/github.com/eawsy/aws-lambda-go
+	url = https://github.com/eawsy/aws-lambda-go

Readme.md

@@ -52,7 +52,7 @@ The basic steps for usage are as follows:
     	log.Fatal(http.ListenAndServe(":8080", handler))
     }
     ```
-3. create your main() for your lambda: 
+3. create your main() for your eawsy:
 
     ```go
     package main
@@ -69,7 +69,7 @@ The basic steps for usage are as follows:
     func main() {
     }
     ```
-4. Make your lambda: 
+4. Make your eawsy:
 
     ```Makefile
     build:
@@ -80,7 +80,7 @@ The basic steps for usage are as follows:
     	zip handler.zip handler.so
     	chown `stat -c "%u:%g" .` handler.zip
     ```
-5. Create your lambda in AWS: (in the directory your lambda handler was built) 
+5. Create your eawsy in AWS: (in the directory your eawsy handler was built)
 
     ```bash
     aws lambda create-function \

aws/shim.go

@@ -0,0 +1,97 @@
+package aws
+
+import (
+	"encoding/base64"
+	"fmt"
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+	"github.com/danapsimer/aws-api-to-lambda-shim/utils"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/url"
+	"strings"
+	"context"
+)
+
+type ShimInitFunc func() (http.Handler, error)
+
+type HttpHandlerShim struct {
+	init       ShimInitFunc
+	initCalled bool
+	handler    http.Handler
+}
+
+func NewHttpHandlerShim(init ShimInitFunc) (*HttpHandlerShim, error) {
+	shim := &HttpHandlerShim{
+		init:       init,
+		initCalled: false,
+		handler:    nil,
+	}
+	lambda.Start(func(ctx context.Context,evt events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+		return shim.handle(ctx, evt)
+	})
+	return shim, nil
+}
+
+func (shim *HttpHandlerShim) handle(ctx context.Context,request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+	if !shim.initCalled {
+		handler, err := shim.init()
+		if err != nil {
+			log.Printf("ERROR: %s", err.Error())
+			return events.APIGatewayProxyResponse{StatusCode: 500, Body: err.Error()}, err
+		}
+		shim.handler = handler
+		shim.initCalled = true
+	}
+
+	var urlStr string
+	if len(request.QueryStringParameters) != 0 {
+		urlStr = fmt.Sprintf("%s?%s", request.Path, utils.QueryStringParams2Values(request.QueryStringParameters).Encode())
+	} else {
+		urlStr = request.Path
+	}
+	url, err := url.ParseRequestURI(urlStr)
+	if err != nil {
+		log.Printf("ERROR: %s", err.Error())
+		return events.APIGatewayProxyResponse{StatusCode: 500, Body: err.Error()}, err
+	}
+	var bodyReader io.Reader
+	bodyReader = strings.NewReader(request.Body)
+	if request.IsBase64Encoded {
+		bodyReader = base64.NewDecoder(base64.StdEncoding, bodyReader)
+	}
+	httpRequest := http.Request{
+		Method:        request.HTTPMethod,
+		URL:           url,
+		Proto:         "HTTP/1.0",
+		ProtoMajor:    1,
+		ProtoMinor:    0,
+		Header:        utils.Headers2Header(request.Headers),
+		Body:          ioutil.NopCloser(bodyReader),
+		ContentLength: int64(len(request.Body)),
+		Close:         false,
+		Host:          request.Headers["Host"],
+		RemoteAddr:    request.Headers["Host"],
+		RequestURI:    url.String(),
+	}
+	responseWriter, err := utils.NewLambdaResponseWriter()
+	if err != nil {
+		log.Printf("ERROR: %s", err.Error())
+		return events.APIGatewayProxyResponse{StatusCode: 500, Body: err.Error()}, nil
+	}
+	shim.handler.ServeHTTP(responseWriter, httpRequest.WithContext(ctx))
+	if responseWriter.ResponseBuffer.Len() > 0 {
+		if _, hasContentType := responseWriter.Header()["Content-Type"]; !hasContentType {
+			responseWriter.Header().Add("Content-Type", http.DetectContentType(responseWriter.ResponseBuffer.Bytes()))
+		}
+	}
+	responseBody := responseWriter.ResponseBuffer.String()
+	response := events.APIGatewayProxyResponse{
+		StatusCode: int(responseWriter.StatusCode),
+		Body:       responseBody,
+		Headers:    utils.Header2Headers(responseWriter.Header()),
+	}
+	return response, nil
+}

shim/shim.go renamed to eawsy/shim.go

@@ -1,17 +1,17 @@
-package shim
+package eawsy
 
 import (
-	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/danapsimer/aws-api-to-lambda-shim/utils"
 	"github.com/eawsy/aws-lambda-go/service/lambda/runtime"
 	"io"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
 	"strings"
-	"encoding/base64"
 )
 
 type ShimInitFunc func() (http.Handler, error)
@@ -78,68 +78,6 @@ type apiGatewayResponse struct {
 	Body       string            `json:"body,omitempty"`
 }
 
-type lambdaResponseWriter struct {
-	header         http.Header
-	StatusCode     int
-	ResponseBuffer bytes.Buffer
-}
-
-func NewLambdaResponseWriter() (*lambdaResponseWriter, error) {
-	return &lambdaResponseWriter{
-		header:     make(map[string][]string),
-		StatusCode: 0,
-	}, nil
-}
-
-func (w *lambdaResponseWriter) Header() http.Header {
-	return w.header
-}
-
-func (w *lambdaResponseWriter) Write(bytes []byte) (int, error) {
-	if w.StatusCode == 0 {
-		w.StatusCode = 200
-	}
-	bytesWritten, err := w.ResponseBuffer.Write(bytes)
-	return bytesWritten, err
-}
-
-func (w *lambdaResponseWriter) WriteHeader(statusCode int) {
-	w.StatusCode = statusCode
-}
-
-func queryStringParams2Values(qsp map[string]string) url.Values {
-	if qsp == nil {
-		return nil
-	}
-	values := url.Values{}
-	for k, v := range qsp {
-		values.Add(k, v)
-	}
-	return values
-}
-
-func headers2Header(headers map[string]string) http.Header {
-	if headers == nil {
-		return nil
-	}
-	values := http.Header{}
-	for k, v := range headers {
-		values.Add(k, v)
-	}
-	return values
-}
-
-func header2Headers(header http.Header) map[string]string {
-	if header == nil {
-		return nil
-	}
-	values := make(map[string]string)
-	for k, v := range header {
-		values[k] = v[0]
-	}
-	return values
-}
-
 func (shim *HttpHandlerShim) handle(evt json.RawMessage, ctx *runtime.Context) (interface{}, error) {
 	if !shim.initCalled {
 		handler, err := shim.init()
@@ -161,7 +99,7 @@ func (shim *HttpHandlerShim) handle(evt json.RawMessage, ctx *runtime.Context) (
 
 	var urlStr string
 	if len(msg.QueryStringParameters) != 0 {
-		urlStr = fmt.Sprintf("%s?%s", msg.Path, queryStringParams2Values(msg.QueryStringParameters).Encode())
+		urlStr = fmt.Sprintf("%s?%s", msg.Path, utils.QueryStringParams2Values(msg.QueryStringParameters).Encode())
 	} else {
 		urlStr = msg.Path
 	}
@@ -182,7 +120,7 @@ func (shim *HttpHandlerShim) handle(evt json.RawMessage, ctx *runtime.Context) (
 		Proto:         "HTTP/1.0",
 		ProtoMajor:    1,
 		ProtoMinor:    0,
-		Header:        headers2Header(msg.Headers),
+		Header:        utils.Headers2Header(msg.Headers),
 		Body:          ioutil.NopCloser(bodyReader),
 		ContentLength: int64(len(msg.Body)),
 		Close:         false,
@@ -191,7 +129,7 @@ func (shim *HttpHandlerShim) handle(evt json.RawMessage, ctx *runtime.Context) (
 		RequestURI:    url.String(),
 	}
 	//log.Printf("httpRequest created: %v", &httpRequest)
-	responseWriter, err := NewLambdaResponseWriter()
+	responseWriter, err := utils.NewLambdaResponseWriter()
 	if err != nil {
 		log.Printf("ERROR: %s", err.Error())
 		return apiGatewayResponse{StatusCode: 500, Body: err.Error()}, nil
@@ -207,7 +145,7 @@ func (shim *HttpHandlerShim) handle(evt json.RawMessage, ctx *runtime.Context) (
 	response := apiGatewayResponse{
 		StatusCode: int32(responseWriter.StatusCode),
 		Body:       responseBody,
-		Headers:    header2Headers(responseWriter.Header()),
+		Headers:    utils.Header2Headers(responseWriter.Header()),
 	}
 	//log.Printf("Response: %v", &response)
 	return &response, nil

examples/helloWorld/aws/Makefile

@@ -0,0 +1,25 @@
+AWS_ACCOUNT_ID := $(shell aws iam get-user | jq -r '.User.Arn' | cut -d : -f 5)
+$(info AWS_ACCOUNT_ID = '$(AWS_ACCOUNT_ID)')
+
+AWS_ROLE := arn:aws:iam::$(AWS_ACCOUNT_ID):role/lambda_basic_execution
+
+build:
+	GOOS=linux go build -o handler
+
+pack:
+	zip handler.zip handler
+
+clean:
+	@rm -rf handler.zip handler
+
+create:
+	@aws lambda create-function \
+		--region us-east-1 \
+		--function-name hello-world-api-go \
+		--zip-file fileb://handler.zip \
+		--runtime go1.x \
+		--role $(AWS_ROLE) \
+		--handler handler
+
+update:
+	@aws lambda update-function-code --function-name hello-world-api-go --zip-file fileb://handler.zip

examples/helloWorld/lambda/handler.go renamed to examples/helloWorld/aws/handler.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"github.com/danapsimer/aws-api-to-lambda-shim/examples/helloWorld/hello"
-	"github.com/danapsimer/aws-api-to-lambda-shim/shim"
+	"github.com/danapsimer/aws-api-to-lambda-shim/aws"
 )
 
 func init() {
-	shim.NewHttpHandlerShim(hello.InitHandler)
+	aws.NewHttpHandlerShim(hello.InitHandler)
 }
 
 func main() {

examples/helloWorld/lambda/Makefile renamed to examples/helloWorld/eawsy/Makefile

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/danapsimer/aws-api-to-lambda-shim/examples/helloWorld/hello"
+	"github.com/danapsimer/aws-api-to-lambda-shim/eawsy"
+)
+
+func init() {
+	eawsy.NewHttpHandlerShim(hello.InitHandler)
+}
+
+func main() {
+}

examples/helloWorld/eawsy/handler.go

@@ -0,0 +1,70 @@
+package utils
+
+import (
+	"bytes"
+	"net/url"
+	"net/http"
+)
+
+type lambdaResponseWriter struct {
+	header         http.Header
+	StatusCode     int
+	ResponseBuffer bytes.Buffer
+}
+
+func NewLambdaResponseWriter() (*lambdaResponseWriter, error) {
+	return &lambdaResponseWriter{
+		header:     make(map[string][]string),
+		StatusCode: 0,
+	}, nil
+}
+
+func (w *lambdaResponseWriter) Header() http.Header {
+	return w.header
+}
+
+func (w *lambdaResponseWriter) Write(bytes []byte) (int, error) {
+	if w.StatusCode == 0 {
+		w.StatusCode = 200
+	}
+	bytesWritten, err := w.ResponseBuffer.Write(bytes)
+	return bytesWritten, err
+}
+
+func (w *lambdaResponseWriter) WriteHeader(statusCode int) {
+	w.StatusCode = statusCode
+}
+
+func QueryStringParams2Values(qsp map[string]string) url.Values {
+	if qsp == nil {
+		return nil
+	}
+	values := url.Values{}
+	for k, v := range qsp {
+		values.Add(k, v)
+	}
+	return values
+}
+
+func Headers2Header(headers map[string]string) http.Header {
+	if headers == nil {
+		return nil
+	}
+	values := http.Header{}
+	for k, v := range headers {
+		values.Add(k, v)
+	}
+	return values
+}
+
+func Header2Headers(header http.Header) map[string]string {
+	if header == nil {
+		return nil
+	}
+	values := make(map[string]string)
+	for k, v := range header {
+		values[k] = v[0]
+	}
+	return values
+}
+