Merge pull request awslabs#26 from maros7/multi-value-query-string-parameters

Add support for multi value query string parameters

Author: sapessi

core/request.go

@@ -118,19 +118,6 @@ func (r *RequestAccessor) ProxyEventToHTTPRequest(req events.APIGatewayProxyRequ
 		decodedBody = base64Body
 	}
 
-	queryString := ""
-	if len(req.QueryStringParameters) > 0 {
-		queryString = "?"
-		queryCnt := 0
-		for q := range req.QueryStringParameters {
-			if queryCnt > 0 {
-				queryString += "&"
-			}
-			queryString += url.QueryEscape(q) + "=" + url.QueryEscape(req.QueryStringParameters[q])
-			queryCnt++
-		}
-	}
-
 	path := req.Path
 	if r.stripBasePath != "" && len(r.stripBasePath) > 1 {
 		if strings.HasPrefix(path, r.stripBasePath) {
@@ -144,12 +131,24 @@ func (r *RequestAccessor) ProxyEventToHTTPRequest(req events.APIGatewayProxyRequ
 	if customAddress, ok := os.LookupEnv(CustomHostVariable); ok {
 		serverAddress = customAddress
 	}
-
 	path = serverAddress + path
 
+	if len(req.MultiValueQueryStringParameters) > 0 {
+		queryString := ""
+		for q, l := range req.MultiValueQueryStringParameters {
+			for _, v := range l {
+				if queryString != "" {
+					queryString += "&"
+				}
+				queryString += url.QueryEscape(q) + "=" + url.QueryEscape(v)
+			}
+		}
+		path += "?" + queryString
+	}
+
 	httpRequest, err := http.NewRequest(
 		strings.ToUpper(req.HTTPMethod),
-		path+queryString,
+		path,
 		bytes.NewReader(decodedBody),
 	)
 

core/request_test.go

@@ -58,9 +58,9 @@ var _ = Describe("RequestAccessor tests", func() {
 		})
 
 		qsRequest := getProxyRequest("/hello", "GET")
-		qsRequest.QueryStringParameters = map[string]string{
-			"hello": "1",
-			"world": "2",
+		qsRequest.MultiValueQueryStringParameters = map[string][]string{
+			"hello": {"1"},
+			"world": {"2", "3"},
 		}
 		It("Populates query string correctly", func() {
 			httpReq, err := accessor.ProxyEventToHTTPRequest(qsRequest)
@@ -73,9 +73,10 @@ var _ = Describe("RequestAccessor tests", func() {
 			Expect(query["hello"]).ToNot(BeNil())
 			Expect(query["world"]).ToNot(BeNil())
 			Expect(1).To(Equal(len(query["hello"])))
-			Expect(1).To(Equal(len(query["world"])))
+			Expect(2).To(Equal(len(query["world"])))
 			Expect("1").To(Equal(query["hello"][0]))
 			Expect("2").To(Equal(query["world"][0]))
+			Expect("3").To(Equal(query["world"][1]))
 		})
 
 		basePathRequest := getProxyRequest("/app1/orders", "GET")

vendor/vendor.json

@@ -3,28 +3,34 @@
 	"ignore": "test",
 	"package": [
 		{
-			"checksumSHA1": "6nfly5ibFQnlDU6IpeFaZZ2q1w0=",
+			"checksumSHA1": "60T22joBzjxNa8yKzW0V4egimZI=",
 			"path": "github.com/aws/aws-lambda-go/events",
-			"revision": "5fea2b254568d4043f23d27471ae265cd33d3530",
-			"revisionTime": "2018-01-26T03:40:30Z"
+			"revision": "dcf76fe64fb68bc66dd3522c904ccf5ff1b2710a",
+			"revisionTime": "2019-01-29T19:04:57Z"
 		},
 		{
-			"checksumSHA1": "uI0hFuHj5Amsq+6TzWcczBIdWZY=",
+			"checksumSHA1": "trfV9u2UzDAypLfWLdFApLNWj0k=",
 			"path": "github.com/aws/aws-lambda-go/lambda",
-			"revision": "5fea2b254568d4043f23d27471ae265cd33d3530",
-			"revisionTime": "2018-01-26T03:40:30Z"
+			"revision": "dcf76fe64fb68bc66dd3522c904ccf5ff1b2710a",
+			"revisionTime": "2019-01-29T19:04:57Z"
+		},
+		{
+			"checksumSHA1": "R5cnUZPkb0MPZnK822yvu4qlTXQ=",
+			"path": "github.com/aws/aws-lambda-go/lambda/handlertrace",
+			"revision": "dcf76fe64fb68bc66dd3522c904ccf5ff1b2710a",
+			"revisionTime": "2019-01-29T19:04:57Z"
 		},
 		{
 			"checksumSHA1": "d4ehJWLS4YsqFG825pgwdvKDB6A=",
 			"path": "github.com/aws/aws-lambda-go/lambda/messages",
-			"revision": "5fea2b254568d4043f23d27471ae265cd33d3530",
-			"revisionTime": "2018-01-26T03:40:30Z"
+			"revision": "dcf76fe64fb68bc66dd3522c904ccf5ff1b2710a",
+			"revisionTime": "2019-01-29T19:04:57Z"
 		},
 		{
 			"checksumSHA1": "f9MhOwQHveaPVWO6trwfqHa+W0M=",
 			"path": "github.com/aws/aws-lambda-go/lambdacontext",
-			"revision": "5fea2b254568d4043f23d27471ae265cd33d3530",
-			"revisionTime": "2018-01-26T03:40:30Z"
+			"revision": "dcf76fe64fb68bc66dd3522c904ccf5ff1b2710a",
+			"revisionTime": "2019-01-29T19:04:57Z"
 		},
 		{
 			"checksumSHA1": "QeKwBtN2df+j+4stw3bQJ6yO4EY=",