Skip to content

Commit 1009739

Browse files
committed
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.
1 parent 67f91f9 commit 1009739

File tree

3 files changed

+48
-75
lines changed

3 files changed

+48
-75
lines changed

alb.go

Lines changed: 24 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,17 @@ import (
99
"net/http"
1010
"net/url"
1111
"strings"
12+
"github.com/aws/aws-lambda-go/events"
1213
)
1314

1415
func NewALBPayloadBuilder(enableMultiValue bool) PayloadBuilder {
15-
if enableMultiValue {
16-
return ALBMultiValuePayloadBuilder{}
17-
} else {
18-
return ALBPayloadBuilder{}
16+
return ALBPayloadBuilder{
17+
EnableMultiValue: enableMultiValue,
1918
}
2019
}
2120

2221
type ALBPayloadBuilder struct {
23-
}
24-
25-
type ALBMultiValuePayloadBuilder struct {
22+
EnableMultiValue bool
2623
}
2724

2825
func (pb ALBPayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
@@ -36,98 +33,51 @@ func (pb ALBPayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
3633
return nil, err
3734
}
3835

39-
event := struct {
40-
HttpMethod string `json:"httpMethod"`
41-
Path string `json:"path"`
42-
QueryStringParameters map[string]string `json:"queryStringParameters"`
43-
Headers map[string]string `json:"headers"`
44-
Body string `json:"body"`
45-
IsBase64Encoded bool `json:"isBase64Encoded"`
46-
}{
47-
HttpMethod: r.Method,
36+
event := events.ALBTargetGroupRequest{
37+
HTTPMethod: r.Method,
4838
Path: r.URL.Path,
49-
QueryStringParameters: ArrayMapToFirstElementMap(queryParams),
50-
Headers: ArrayMapToFirstElementMap(r.Header),
5139
Body: body,
5240
IsBase64Encoded: isBase64Encoded,
41+
RequestContext: events.ALBTargetGroupRequestContext{
42+
ELB: events.ELBContext{
43+
TargetGroupArn: "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-local-proxy-dummy/1234567890123456",
44+
},
45+
},
5346
}
5447

55-
return json.Marshal(event)
56-
}
57-
58-
func (pb ALBMultiValuePayloadBuilder) BuildRequest(r *http.Request) ([]byte, error) {
59-
queryParams, err := url.ParseQuery(r.URL.RawQuery)
60-
if err != nil {
61-
return nil, err
62-
}
63-
64-
body, isBase64Encoded, err := ReadBodyAsString(r)
65-
if err != nil {
66-
return nil, err
67-
}
68-
69-
event := struct {
70-
HttpMethod string `json:"httpMethod"`
71-
Path string `json:"path"`
72-
MultiValueQueryStringParameters map[string][]string `json:"multiValueQueryStringParameters"`
73-
MultiValueHeaders map[string][]string `json:"multiValueHeaders"`
74-
Body string `json:"body"`
75-
IsBase64Encoded bool `json:"isBase64Encoded"`
76-
}{
77-
HttpMethod: r.Method,
78-
Path: r.URL.Path,
79-
MultiValueQueryStringParameters: queryParams,
80-
MultiValueHeaders: r.Header,
81-
Body: body,
82-
IsBase64Encoded: isBase64Encoded,
48+
if pb.EnableMultiValue {
49+
event.MultiValueQueryStringParameters = queryParams
50+
event.MultiValueHeaders = r.Header
51+
} else {
52+
event.QueryStringParameters = ArrayMapToFirstElementMap(queryParams)
53+
event.Headers = ArrayMapToFirstElementMap(r.Header)
8354
}
8455

8556
return json.Marshal(event)
8657
}
8758

8859
func (pb ALBPayloadBuilder) BuildResponse(blob []byte) (int, []byte, map[string][]string, error) {
89-
resp := struct {
90-
StatusCode int `json:"statusCode"`
91-
Headers map[string]string `json:"headers"`
92-
Body string `json:"body"`
93-
IsBase64Encoded bool `json:"isBase64Encoded"`
94-
}{}
60+
resp := events.ALBTargetGroupResponse{}
9561

9662
err := json.Unmarshal(blob, &resp)
9763

64+
var body []byte
9865
if err != nil {
9966
return BuildErrorResponse(err, "Invalid JSON response")
10067
} else if resp.IsBase64Encoded {
10168
binary, err := base64.StdEncoding.DecodeString(resp.Body)
10269
if err != nil {
10370
return BuildErrorResponse(err, "Invalid body in JSON response")
10471
}
105-
return resp.StatusCode, binary, MapToArrayMap(resp.Headers), nil
72+
body = binary
10673
} else {
107-
return resp.StatusCode, []byte(resp.Body), MapToArrayMap(resp.Headers), nil
74+
body = []byte(resp.Body)
10875
}
109-
}
110-
111-
func (pb ALBMultiValuePayloadBuilder) BuildResponse(blob []byte) (int, []byte, map[string][]string, error) {
112-
resp := struct {
113-
StatusCode int `json:"statusCode"`
114-
MultiValueHeaders map[string][]string `json:"multiValueHeaders"`
115-
Body string `json:"body"`
116-
IsBase64Encoded bool `json:"isBase64Encoded"`
117-
}{}
118-
119-
err := json.Unmarshal(blob, &resp)
12076

121-
if err != nil {
122-
return BuildErrorResponse(err, "Invalid JSON response")
123-
} else if resp.IsBase64Encoded {
124-
binary, err := base64.StdEncoding.DecodeString(resp.Body)
125-
if err != nil {
126-
return BuildErrorResponse(err, "Invalid body in JSON response")
127-
}
128-
return resp.StatusCode, binary, resp.MultiValueHeaders, nil
77+
if pb.EnableMultiValue {
78+
return resp.StatusCode, body, resp.MultiValueHeaders, nil
12979
} else {
130-
return resp.StatusCode, []byte(resp.Body), resp.MultiValueHeaders, nil
80+
return resp.StatusCode, body, MapToArrayMap(resp.Headers), nil
13181
}
13282
}
13383

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ module lambda-local-proxy
22

33
go 1.15
44

5-
require github.com/aws/aws-sdk-go v1.35.22
5+
require github.com/aws/aws-sdk-go v1.38.34
6+
require github.com/aws/aws-lambda-go v1.23.0

go.sum

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,37 @@
1+
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2+
github.com/aws/aws-lambda-go v1.23.0 h1:Vjwow5COkFJp7GePkk9kjAo/DyX36b7wVPKwseQZbRo=
3+
github.com/aws/aws-lambda-go v1.23.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
14
github.com/aws/aws-sdk-go v1.35.22 h1:Do184JJHgque0dK/udq6MC14W4hCEGkjLDtzRjxLKGM=
25
github.com/aws/aws-sdk-go v1.35.22/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
6+
github.com/aws/aws-sdk-go v1.38.34 h1:JSAyS6hSDLbRmCAz9VAkwDf5oh/olt9mBTrVBWGJcU8=
7+
github.com/aws/aws-sdk-go v1.38.34/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
8+
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
9+
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
310
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
11+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
412
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
513
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
614
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
715
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
816
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
17+
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
18+
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
919
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
20+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
21+
github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
1022
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
23+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
24+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1125
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
26+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
1227
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
28+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
29+
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1330
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
31+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
32+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
1433
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
34+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1535
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
36+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
37+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)