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

Fix cfn delete stack functionality

Browse Source
This commit is contained in:
Hitesh Ghia 2016-06-07 13:31:42 -07:00
parent 773a49c40d
commit d8baa957e9
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moto/cloudformation/parsing.py
View File

@ -403,19 +403,18 @@ class ResourceMap(collections.Mapping):
while remaining_resources and tries < 5: while remaining_resources and tries < 5:
for resource in remaining_resources.copy(): for resource in remaining_resources.copy():
parsed_resource = self._parsed_resources.get(resource) parsed_resource = self._parsed_resources.get(resource)
if parsed_resource: try:
try: if parsed_resource and hasattr(parsed_resource, 'delete'):
parsed_resource.delete(self._region_name) parsed_resource.delete(self._region_name)
except Exception as e: except Exception as e:
# skip over dependency violations, and try again in a second pass # skip over dependency violations, and try again in a second pass
last_exception = e last_exception = e
else: else:
remaining_resources.remove(resource) remaining_resources.remove(resource)
tries += 1 tries += 1
if tries == 5: if tries == 5:
raise last_exception raise last_exception
class OutputMap(collections.Mapping): class OutputMap(collections.Mapping):
def __init__(self, resources, template): def __init__(self, resources, template):
self._template = template self._template = template

28
tests/test_cloudformation/test_cloudformation_stack_crud.py
View File

@ -27,8 +27,23 @@ dummy_template2 = {
"Resources": {}, "Resources": {},
} }
# template with resource which has no delete attribute defined
dummy_template3 = {
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Stack 3",
"Resources": {
"VPC": {
"Properties": {
"CidrBlock": "192.168.0.0/16",
},
"Type": "AWS::EC2::VPC"
}
},
}
dummy_template_json = json.dumps(dummy_template) dummy_template_json = json.dumps(dummy_template)
dummy_template_json2 = json.dumps(dummy_template2) dummy_template_json2 = json.dumps(dummy_template2)
dummy_template_json3 = json.dumps(dummy_template3)
@mock_cloudformation @mock_cloudformation
@ -220,6 +235,19 @@ def test_delete_stack_by_id():
conn.describe_stacks(stack_id).should.have.length_of(1) conn.describe_stacks(stack_id).should.have.length_of(1)
@mock_cloudformation
def test_delete_stack_with_resource_missing_delete_attr():
conn = boto.connect_cloudformation()
conn.create_stack(
"test_stack",
template_body=dummy_template_json3,
)
conn.list_stacks().should.have.length_of(1)
conn.delete_stack("test_stack")
conn.list_stacks().should.have.length_of(0)
@mock_cloudformation @mock_cloudformation
def test_bad_describe_stack(): def test_bad_describe_stack():
conn = boto.connect_cloudformation() conn = boto.connect_cloudformation()