Use aws-lambda-go instead of self-defined event structs

The event sent to the lambda endpoint now includes RequestContext field with a dummy TargetGroupArn.
treasure-data · May 6, 2021 · 1009739 · 1009739
1 parent 67f91f9
commit 1009739
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 75 deletions.
diff --git a/alb.go b/alb.go
@@ -9,20 +9,17 @@ import (
  "net/http"
  "net/url"
  "strings"
+ "github.com/aws/aws-lambda-go/events"
 )
 
 func NewALBPayloadBuilder(enableMultiValue bool) PayloadBuilder {
- if enableMultiValue {
- return ALBMultiValuePayloadBuilder{}
- } else {
- return ALBPayloadBuilder{}
+ return ALBPayloadBuilder{
+ EnableMultiValue: enableMultiValue,
  }
 }
 
 type ALBPayloadBuilder struct {
-}
-
-type ALBMultiValuePayloadBuilder struct {
+ EnableMultiValue bool
 }
 
 func (pb ALBPayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
@@ -36,98 +33,51 @@ func (pb ALBPayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
  return nil, err
  }
 
- event := struct {
- HttpMethod string `json:"httpMethod"`
- Path string `json:"path"`
- QueryStringParameters map[string]string `json:"queryStringParameters"`
- Headers map[string]string `json:"headers"`
- Body string `json:"body"`
- IsBase64Encoded bool `json:"isBase64Encoded"`
- }{
- HttpMethod: r.Method,
+ event := events.ALBTargetGroupRequest{
+ HTTPMethod: r.Method,
  Path: r.URL.Path,
- QueryStringParameters: ArrayMapToFirstElementMap(queryParams),
- Headers: ArrayMapToFirstElementMap(r.Header),
  Body: body,
  IsBase64Encoded: isBase64Encoded,
+ RequestContext: events.ALBTargetGroupRequestContext{
+ ELB: events.ELBContext{
+ TargetGroupArn: "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-local-proxy-dummy/1234567890123456",
+ },
+ },
  }
 
- return json.Marshal(event)
-}
-
-func (pb ALBMultiValuePayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
- queryParams, err := url.ParseQuery(r.URL.RawQuery)
- if err != nil {
- return nil, err
- }
-
- body, isBase64Encoded, err := ReadBodyAsString(r)
- if err != nil {
- return nil, err
- }
-
- event := struct {
- HttpMethod string `json:"httpMethod"`
- Path string `json:"path"`
- MultiValueQueryStringParameters map[string][]string `json:"multiValueQueryStringParameters"`
- MultiValueHeaders map[string][]string `json:"multiValueHeaders"`
- Body string `json:"body"`
- IsBase64Encoded bool `json:"isBase64Encoded"`
- }{
- HttpMethod: r.Method,
- Path: r.URL.Path,
- MultiValueQueryStringParameters: queryParams,
- MultiValueHeaders: r.Header,
- Body: body,
- IsBase64Encoded: isBase64Encoded,
+ if pb.EnableMultiValue {
+ event.MultiValueQueryStringParameters = queryParams
+ event.MultiValueHeaders = r.Header
+ } else {
+ event.QueryStringParameters = ArrayMapToFirstElementMap(queryParams)
+ event.Headers = ArrayMapToFirstElementMap(r.Header)
  }
 
  return json.Marshal(event)
 }
 
 func (pb ALBPayloadBuilder) BuildResponse(blob []byte) (int, []byte, map[string][]string, error) {
- resp := struct {
- StatusCode int `json:"statusCode"`
- Headers map[string]string `json:"headers"`
- Body string `json:"body"`
- IsBase64Encoded bool `json:"isBase64Encoded"`
- }{}
+ resp := events.ALBTargetGroupResponse{}
 
  err := json.Unmarshal(blob, &resp)
 
+ var body []byte
  if err != nil {
  return BuildErrorResponse(err, "Invalid JSON response")
  } else if resp.IsBase64Encoded {
  binary, err := base64.StdEncoding.DecodeString(resp.Body)
  if err != nil {
  return BuildErrorResponse(err, "Invalid body in JSON response")
  }
- return resp.StatusCode, binary, MapToArrayMap(resp.Headers), nil
+ body = binary
  } else {
- return resp.StatusCode, []byte(resp.Body), MapToArrayMap(resp.Headers), nil
+ body = []byte(resp.Body)
  }
-}
-
-func (pb ALBMultiValuePayloadBuilder) BuildResponse(blob []byte) (int, []byte, map[string][]string, error) {
- resp := struct {
- StatusCode int `json:"statusCode"`
- MultiValueHeaders map[string][]string `json:"multiValueHeaders"`
- Body string `json:"body"`
- IsBase64Encoded bool `json:"isBase64Encoded"`
- }{}
-
- err := json.Unmarshal(blob, &resp)
 
- if err != nil {
- return BuildErrorResponse(err, "Invalid JSON response")
- } else if resp.IsBase64Encoded {
- binary, err := base64.StdEncoding.DecodeString(resp.Body)
- if err != nil {
- return BuildErrorResponse(err, "Invalid body in JSON response")
- }
- return resp.StatusCode, binary, resp.MultiValueHeaders, nil
+ if pb.EnableMultiValue {
+ return resp.StatusCode, body, resp.MultiValueHeaders, nil
  } else {
- return resp.StatusCode, []byte(resp.Body), resp.MultiValueHeaders, nil
+ return resp.StatusCode, body, MapToArrayMap(resp.Headers), nil
  }
 }
 

diff --git a/go.mod b/go.mod
@@ -2,4 +2,5 @@ module lambda-local-proxy
 
 go 1.15
 
-require github.com/aws/aws-sdk-go v1.35.22
+require github.com/aws/aws-sdk-go v1.38.34
+require github.com/aws/aws-lambda-go v1.23.0
diff --git a/go.sum b/go.sum
@@ -1,15 +1,37 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/aws/aws-lambda-go v1.23.0 h1:Vjwow5COkFJp7GePkk9kjAo/DyX36b7wVPKwseQZbRo=
+github.com/aws/aws-lambda-go v1.23.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
 github.com/aws/aws-sdk-go v1.35.22 h1:Do184JJHgque0dK/udq6MC14W4hCEGkjLDtzRjxLKGM=
 github.com/aws/aws-sdk-go v1.35.22/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
+github.com/aws/aws-sdk-go v1.38.34 h1:JSAyS6hSDLbRmCAz9VAkwDf5oh/olt9mBTrVBWGJcU8=
+github.com/aws/aws-sdk-go v1.38.34/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=