non-strict payload deserializer (#125)

Author: ammokhov

src/cloudformation_cli_python_lib/utils.py

@@ -1,6 +1,6 @@
 # pylint: disable=invalid-name
 import json
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, fields
 from datetime import date, datetime, time
 from typing import (
     Any,
@@ -93,8 +93,14 @@ class HandlerRequest:
     callbackContext: Optional[MutableMapping[str, Any]] = None
     nextToken: Optional[str] = None
 
+    def __init__(self, **kwargs: Any) -> None:
+        dataclass_fields = {f.name for f in fields(self)}
+        for k, v in kwargs.items():
+            if k in dataclass_fields:
+                setattr(self, k, v)
+
     @classmethod
-    def deserialize(cls, json_data: MutableMapping[str, Any]) -> "HandlerRequest":
+    def deserialize(cls, json_data: MutableMapping[str, Any]) -> Any:
         event = HandlerRequest(**json_data)
         event.requestData = RequestData.deserialize(json_data.get("requestData", {}))
         return event

tests/lib/resource_test.py

@@ -47,6 +47,7 @@
     },
     "stackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/SampleStack/e"
     "722ae60-fe62-11e8-9a0e-0ae8cc519968",
+    "snapshotRequested": None,
 }
 TYPE_NAME = "Test::Foo::Bar"
 
@@ -193,17 +194,6 @@ def test_entrypoint_success_without_caller_provider_creds():
         assert event == expected
 
 
-@pytest.mark.parametrize(
-    "event,messages", [({}, ("missing", "awsAccountId", "bearerToken", "requestData"))]
-)
-def test__parse_request_invalid_request(resource, event, messages):
-    with pytest.raises(InvalidRequest) as excinfo:
-        resource._parse_request(event)
-
-    for msg in messages:
-        assert msg in str(excinfo.value), msg
-
-
 def test_cast_resource_request_invalid_request(resource):
     request = HandlerRequest.deserialize(ENTRYPOINT_PAYLOAD)
     request.requestData = None

tests/plugin/codegen_test.py

@@ -94,10 +94,10 @@ def test_initialize(project):
         "README.md",
         "foo-bar-baz.json",
         "requirements.txt",
-        "inputs/inputs_1_invalid.json",
-        "inputs/inputs_1_update.json",
-        "inputs/inputs_1_create.json",
-        "inputs",
+        "example_inputs/inputs_1_invalid.json",
+        "example_inputs/inputs_1_update.json",
+        "example_inputs/inputs_1_create.json",
+        "example_inputs",
         "src",
         "src/foo_bar_baz",
         "src/foo_bar_baz/__init__.py",