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

Fix:Cloudformation descibe stacks special chars (#3514)

Browse Source 
* Fix:descibe stacks special chars

* removed debug statements

* Linting

Co-authored-by: usmanokc <usman@okcredit.in>
This commit is contained in:
usmangani1 2020-12-06 13:41:52 +05:30 committed by GitHub
parent cfaaa70ea9
commit d44beb0c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/cloudformation/responses.py
View File

@ -729,7 +729,7 @@ DESCRIBE_STACKS_TEMPLATE = """<DescribeStacksResponse>
{% if stack.change_set_id %}
<ChangeSetId>{{ stack.change_set_id }}</ChangeSetId>
{% endif %}
<Description>{{ stack.description }}</Description>
<Description><![CDATA[{{ stack.description }}]]></Description>
<CreationTime>{{ stack.creation_time_iso_8601 }}</CreationTime>
<StackStatus>{{ stack.status }}</StackStatus>
{% if stack.notification_arns %}

35
tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py
View File

@ -170,7 +170,29 @@ dummy_redrive_template = {
},
}
dummy_template_special_chars_in_description = {
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Stack 1 <env>",
"Resources": {
"EC2Instance1": {
"Type": "AWS::EC2::Instance",
"Properties": {
"ImageId": "ami-d3adb33f",
"KeyName": "dummy",
"InstanceType": "t2.micro",
"Tags": [
{"Key": "Description", "Value": "Test tag"},
{"Key": "Name", "Value": "Name tag for tests"},
],
},
}
},
}
dummy_template_json = json.dumps(dummy_template)
dummy_template_special_chars_in_description_json = json.dumps(
dummy_template_special_chars_in_description
)
dummy_update_template_json = json.dumps(dummy_update_template)
dummy_output_template_json = json.dumps(dummy_output_template)
dummy_import_template_json = json.dumps(dummy_import_template)
@ -1149,6 +1171,19 @@ def test_describe_deleted_stack():
stack_by_id["StackStatus"].should.equal("DELETE_COMPLETE")
@mock_cloudformation
def test_describe_stack_with_special_chars():
cf_conn = boto3.client("cloudformation", region_name="us-east-1")
cf_conn.create_stack(
StackName="test_stack_spl",
TemplateBody=dummy_template_special_chars_in_description_json,
)
stack = cf_conn.describe_stacks(StackName="test_stack_spl")["Stacks"][0]
assert stack.get("StackName") == "test_stack_spl"
assert stack.get("Description") == "Stack 1 <env>"
@mock_cloudformation
@mock_ec2
def test_describe_updated_stack():