Merge pull request #94 from gridsmartercities/defaults

default value None added to kwargs

Author: SamN2997

aws_lambda_decorators/decorators.py

@@ -24,6 +24,7 @@
 CORS_NON_DICT_ERROR = "Invalid response type for CORS headers"
 CORS_INVALID_TYPE_LOG_MESSAGE = "Cannot set %s header to a non %s value"
 CORS_NON_DICT_LOG_MESSAGE = "Cannot add headers to a non dictionary response"
+UNKNOWN = "Unknown"
 
 
 def extract_from_event(parameters, group_errors=False):
@@ -87,6 +88,7 @@ def lambda_handler(event, context, user_id=None)
     def decorator(func):
         def wrapper(*args, **kwargs):
             try:
+                param = None
                 errors = []
                 arg_dictionary = all_func_args(func, args, kwargs)
                 for param in parameters:
@@ -98,17 +100,19 @@ def wrapper(*args, **kwargs):
                         if not group_errors:
                             LOGGER.error(VALIDATE_ERROR_MESSAGE, errors)
                             return failure(errors)
-                    elif return_val is not None:
+                    else:
                         kwargs[param.get_var_name()] = return_val
             except Exception as ex:  # noqa: pylint - broad-except
-                LOGGER.error(EXCEPTION_LOG_MESSAGE, full_name(ex), str(ex), param.func_param_name, param.path)
+                LOGGER.error(EXCEPTION_LOG_MESSAGE, full_name(ex), str(ex),
+                             param.func_param_name if param else UNKNOWN,
+                             param.path if param else UNKNOWN)
                 return failure(ERROR_MESSAGE)
+            else:
+                if group_errors and errors:
+                    LOGGER.error(VALIDATE_ERROR_MESSAGE, errors)
+                    return failure(errors)
 
-            if group_errors and errors:
-                LOGGER.error(VALIDATE_ERROR_MESSAGE, errors)
-                return failure(errors)
-
-            return func(*args, **kwargs)
+                return func(*args, **kwargs)
         return wrapper
     return decorator
 

setup.py

@@ -3,7 +3,7 @@
 LONG_DESCRIPTION = open("README.md").read()
 
 setup(name="aws-lambda-decorators",
-      version="0.36",
+      version="0.37",
       description="A set of python decorators to simplify aws python lambda development",
       long_description=LONG_DESCRIPTION,
       long_description_content_type="text/markdown",

tests/test_decorators.py

@@ -1295,3 +1295,18 @@ def handler(event, context, c=None):  # noqa
 
         self.assertEqual(400, response["statusCode"])
         self.assertEqual("{\"message\": [{\"c\": [\"Missing mandatory value\"]}]}", response["body"])
+
+    def test_extract_nulls_are_returned(self):
+        path = "/a/b"
+        dictionary = {
+            "a": {
+            }
+        }
+
+        @extract([Parameter(path, "event", default=None)])
+        def handler(event, context, **kwargs):  # noqa
+            return kwargs["b"]
+
+        response = handler(dictionary, None)
+
+        self.assertEqual(None, response)