Merge branch 'brianjbeach-master'

PR #766 Issue #767 * brianjbeach-master: Add fix to changelog Fix parsing blank query strings in local mode
aws · Apr 10, 2018 · 19be95a · 19be95a
2 parents a7e12d3 + 44e5e0a
commit 19be95a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,9 @@ Next Release (TBD)
 
 * Add CORS headers to error response
   (`#715 <https://github.com/aws/chalice/pull/715>`__)
+* Fix parsing empty query strings in local mode
+  (`#767 <https://github.com/aws/chalice/pull/767>`__)
+
 
 1.2.0
 =====

diff --git a/chalice/local.py b/chalice/local.py
@@ -123,7 +123,8 @@ def match_route(self, url):
         """
         # Otherwise we need to check for param substitution
         parsed_url = urlparse(url)
-        query_params = {k: v[0] for k, v in parse_qs(parsed_url.query).items()}
+        parsed_qs = parse_qs(parsed_url.query, keep_blank_values=True)
+        query_params = {k: v[0] for k, v in parsed_qs.items()}
         path = parsed_url.path
         # API Gateway removes the trailing slash if the route is not the root
         # path. We do the same here so our route matching works the same way.
@@ -171,6 +172,7 @@ def create_lambda_event(self, method, path, headers, body=None):
                 'identity': {
                     'sourceIp': self.LOCAL_SOURCE_IP
                 },
+                'path': path.split('?')[0],
             },
             'headers': {k.lower(): v for k, v in headers.items()},
             'pathParameters': view_route.captured,

diff --git a/tests/unit/test_local.py b/tests/unit/test_local.py
@@ -534,6 +534,7 @@ def test_can_create_lambda_event():
         'requestContext': {
             'httpMethod': 'GET',
             'resourcePath': '/foo/{capture}',
+            'path': '/foo/other',
             'identity': {
                 'sourceIp': local.LambdaEventConverter.LOCAL_SOURCE_IP
             },
@@ -546,6 +547,31 @@ def test_can_create_lambda_event():
     }
 
 
+def test_parse_query_string():
+    converter = local.LambdaEventConverter(
+        local.RouteMatcher(['/foo/bar', '/foo/{capture}']))
+    event = converter.create_lambda_event(
+        method='GET',
+        path='/foo/other?a=1&b=&c=3',
+        headers={'content-type': 'application/json'}
+    )
+    assert event == {
+        'requestContext': {
+            'httpMethod': 'GET',
+            'resourcePath': '/foo/{capture}',
+            'path': '/foo/other',
+            'identity': {
+                'sourceIp': local.LambdaEventConverter.LOCAL_SOURCE_IP
+            },
+        },
+        'headers': {'content-type': 'application/json'},
+        'pathParameters': {'capture': 'other'},
+        'queryStringParameters': {'a': '1', 'b': '', 'c': '3'},
+        'body': None,
+        'stageVariables': {},
+    }
+
+
 def test_can_create_lambda_event_for_put_request():
     converter = local.LambdaEventConverter(
         local.RouteMatcher(['/foo/bar', '/foo/{capture}']))
@@ -559,6 +585,7 @@ def test_can_create_lambda_event_for_put_request():
         'requestContext': {
             'httpMethod': 'PUT',
             'resourcePath': '/foo/{capture}',
+            'path': '/foo/other',
             'identity': {
                 'sourceIp': local.LambdaEventConverter.LOCAL_SOURCE_IP
             },
@@ -585,6 +612,7 @@ def test_can_create_lambda_event_for_post_with_formencoded_body():
         'requestContext': {
             'httpMethod': 'POST',
             'resourcePath': '/foo/{capture}',
+            'path': '/foo/other',
             'identity': {
                 'sourceIp': local.LambdaEventConverter.LOCAL_SOURCE_IP
             },