Fix parse headers

Author: yacchi

aws/alb_target_group.go

@@ -31,7 +31,11 @@ func NewALBTargetGroupRequest(ctx context.Context, e *events.ALBTargetGroupReque
 
 	if e.MultiValueHeaders != nil {
 		multiValue = true
-		header = e.MultiValueHeaders
+		for key, values := range e.MultiValueHeaders {
+			for _, value := range values {
+				header.Add(key, value)
+			}
+		}
 	} else if e.Headers != nil {
 		for k, v := range e.Headers {
 			header.Set(k, v)

aws/api_gateway_rest.go

@@ -27,7 +27,6 @@ func NewRESTAPIRequest(ctx context.Context, e *events.APIGatewayProxyRequest) (r
 	var (
 		body   *bytes.Buffer
 		header = make(http.Header)
-		query  = make(url.Values)
 	)
 
 	if e.MultiValueHeaders != nil {
@@ -53,15 +52,11 @@ func NewRESTAPIRequest(ctx context.Context, e *events.APIGatewayProxyRequest) (r
 	u.Host = header.Get(types.HTTPHeaderHost)
 
 	if e.MultiValueQueryStringParameters != nil {
-		query = e.MultiValueQueryStringParameters
+		u.RawQuery = utils.JoinMultiValueQueryParameters(e.MultiValueQueryStringParameters)
 	} else if e.QueryStringParameters != nil {
-		for k, v := range e.QueryStringParameters {
-			query.Set(k, v)
-		}
+		u.RawQuery = utils.JoinQueryParameters(e.QueryStringParameters)
 	}
 
-	u.RawQuery = query.Encode()
-
 	// build body reader
 	if e.IsBase64Encoded {
 		b, err := base64.StdEncoding.DecodeString(e.Body)

aws/api_gateway_websocket.go

@@ -44,7 +44,11 @@ func NewWebsocketRequest(ctx context.Context, e *events.APIGatewayWebsocketProxy
 
 	if e.MultiValueHeaders != nil {
 		multiValue = true
-		header = e.MultiValueHeaders
+		for key, values := range e.MultiValueHeaders {
+			for _, value := range values {
+				header.Add(key, value)
+			}
+		}
 	} else if e.Headers != nil {
 		for k, v := range e.Headers {
 			header.Set(k, v)
@@ -64,11 +68,9 @@ func NewWebsocketRequest(ctx context.Context, e *events.APIGatewayWebsocketProxy
 	}
 
 	if e.MultiValueQueryStringParameters != nil {
-		query = e.MultiValueQueryStringParameters
+		u.RawQuery = utils.JoinMultiValueQueryParameters(e.MultiValueQueryStringParameters)
 	} else if e.QueryStringParameters != nil {
-		for k, v := range e.QueryStringParameters {
-			query.Set(k, v)
-		}
+		u.RawQuery = utils.JoinQueryParameters(e.QueryStringParameters)
 	}
 
 	if 0 < len(query) {