Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cloudformation NoValue parsing to not add attribute. Closes #870

Browse Source
This commit is contained in:
Steve Pulec 2017-03-16 21:19:53 -04:00
parent 042524fe80
commit e3bff8b926
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/cloudformation/parsing.py
View File

@ -158,7 +158,11 @@ def clean_json(resource_json, resources_map):
cleaned_json = {} cleaned_json = {}
for key, value in resource_json.items(): for key, value in resource_json.items():
cleaned_json[key] = clean_json(value, resources_map) cleaned_val = clean_json(value, resources_map)
if cleaned_val is None:
# If we didn't find anything, don't add this attribute
continue
cleaned_json[key] = cleaned_val
return cleaned_json return cleaned_json
elif isinstance(resource_json, list): elif isinstance(resource_json, list):
return [clean_json(val, resources_map) for val in resource_json] return [clean_json(val, resources_map) for val in resource_json]

1
tests/test_cloudformation/test_cloudformation_stack_integration.py
View File

@ -382,6 +382,7 @@ def test_stack_elb_integration_with_update():
"Protocol": "HTTP", "Protocol": "HTTP",
} }
], ],
"Policies": {"Ref" : "AWS::NoValue"},
} }
}, },
}, },