Skip to content

recasting might happen on already cast objects (re-invokes) #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjlohan merged 1 commit into from
Jun 17, 2020
Merged

recasting might happen on already cast objects (re-invokes) #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/cloudformation_cli_python_lib/recast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

from .exceptions import InvalidRequest

PRIMITIVES = (str, bool, int, float)


# CloudFormation recasts all primitive types as strings, this tries to set them back to
# the types in the type hints
Expand All @@ -22,7 +24,7 @@ def recast_object(
json_data[k] = _recast_lists(cls, k, v, classes)
elif isinstance(v, set):
json_data[k] = _recast_sets(cls, k, v, classes)
elif isinstance(v, str):
elif isinstance(v, PRIMITIVES):
dest_type = _field_to_type(cls.__dataclass_fields__[k].type, k, classes)
json_data[k] = _recast_primitive(dest_type, k, v)
else:
Expand All @@ -47,7 +49,7 @@ def _recast_sets(cls: Any, k: str, v: Set[Any], classes: Dict[str, Any]) -> Set[


def cast_sequence_item(cls: Any, k: str, item: Any, classes: Dict[str, Any]) -> Any:
if isinstance(item, str):
if isinstance(item, PRIMITIVES):
return _recast_primitive(cls, k, item)
if isinstance(item, list):
return _recast_lists(cls, k, item, classes)
Expand All @@ -59,12 +61,12 @@ def cast_sequence_item(cls: Any, k: str, item: Any, classes: Dict[str, Any]) ->
raise InvalidRequest(f"Unsupported type: {type(item)} for {k}")


def _recast_primitive(cls: Any, k: str, v: str) -> Any:
def _recast_primitive(cls: Any, k: str, v: Any) -> Any:
if cls == typing.Any:
# If the type is Any, we cannot guess what the original type was, so we leave
# it as a string
return v
if cls == bool:
if cls == bool and isinstance(v, str):
if v.lower() == "true":
return True
if v.lower() == "false":
Expand Down
6 changes: 4 additions & 2 deletions tests/lib/recast_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ def test_recast_complex_object():
],
}
model = ComplexResourceModel._deserialize(payload)
assert expected == payload
assert expected == model._serialize()
assert payload == expected
assert model._serialize() == expected
# re-invocations should not fail because they already type-cast payloads
assert ComplexResourceModel._deserialize(payload)._serialize() == expected


def test_recast_object_invalid_json_type():
Expand Down