CloudFormation: Return Description field in Outputs (#7489)

moto/cloudformation/responses.py

@@ -818,6 +818,7 @@ DESCRIBE_STACKS_TEMPLATE = """<DescribeStacksResponse>
           <member>
             <OutputKey>{{ output.key }}</OutputKey>
             <OutputValue>{{ output.value }}</OutputValue>
+            {% if output.description %}<Description>{{ output.description }}</Description>{% endif %}
           </member>
         {% endfor %}
         </Outputs>

tests/test_cloudformation/test_cloudformation_custom_resources.py

@@ -165,7 +165,11 @@ def test_create_custom_lambda_resource__verify_manual_request():
     stack = cf.describe_stacks(StackName=stack_id)["Stacks"][0]
     assert stack["StackStatus"] == "CREATE_COMPLETE"
     assert stack["Outputs"] == [
-        {"OutputKey": "infokey", "OutputValue": "resultfromthirdpartysystem"}
+        {
+            "OutputKey": "infokey",
+            "OutputValue": "resultfromthirdpartysystem",
+            "Description": "A very important value",
+        },
     ]
 
     # AWSlambda will not have logged anything

tests/test_ec2/test_ec2_cloudformation.py

@@ -764,7 +764,11 @@ def test_vpc_endpoint_creation():
 
     outputs = cf.describe_stacks(StackName=stack_name)["Stacks"][0]["Outputs"]
     assert len(outputs) == 1
-    assert outputs[0] == {"OutputKey": "EndpointId", "OutputValue": vpc_endpoint_id}
+    assert outputs[0] == {
+        "OutputKey": "EndpointId",
+        "OutputValue": vpc_endpoint_id,
+        "Description": "Id of the endpoint created",
+    }
 
     endpoint = ec2_client.describe_vpc_endpoints(VpcEndpointIds=[vpc_endpoint_id])[
         "VpcEndpoints"
@@ -836,6 +840,7 @@ def test_launch_template_create():
     assert outputs[0] == {
         "OutputKey": "LaunchTemplateId",
         "OutputValue": launch_template_id,
+        "Description": "The ID of the created launch template",
     }
 
     launch_template = ec2.describe_launch_templates(

tests/test_emr/test_emr_cloudformation.py

@@ -53,7 +53,11 @@ def test_create_simple_cluster__using_cloudformation():
 
     # Verify outputs
     stack = cf.describe_stacks(StackName="teststack")["Stacks"][0]
-    assert {"OutputKey": "ClusterId", "OutputValue": cluster_id} in stack["Outputs"]
+    assert {
+        "OutputKey": "ClusterId",
+        "OutputValue": cluster_id,
+        "Description": "Cluster info",
+    } in stack["Outputs"]
 
     # Verify EMR Cluster
     cl = emr.describe_cluster(ClusterId=cluster_id)["Cluster"]