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

Fix: KeyName should not be in ec2:DescribeInstances response if value is None (#5347)

Browse Source 
AWS does not serialize NULL values.
This commit is contained in:
Brian Pandola 2022-07-30 14:12:57 -07:00 committed by GitHub
parent 23c4f47635
commit f701875334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/ec2/responses/instances.py
View File

@ -406,7 +406,9 @@ EC2_RUN_INSTANCES = (
<publicDnsName>{{ instance.public_dns }}</publicDnsName>
<dnsName>{{ instance.public_dns }}</dnsName>
<reason/>
<keyName>{{ instance.key_name }}</keyName>
{% if instance.key_name is not none %}
<keyName>{{ instance.key_name }}</keyName>
{% endif %}
<ebsOptimized>{{ instance.ebs_optimized }}</ebsOptimized>
<amiLaunchIndex>{{ instance.ami_launch_index }}</amiLaunchIndex>
<instanceType>{{ instance.instance_type }}</instanceType>
@ -559,7 +561,9 @@ EC2_DESCRIBE_INSTANCES = (
<publicDnsName>{{ instance.public_dns }}</publicDnsName>
<dnsName>{{ instance.public_dns }}</dnsName>
<reason>{{ instance._reason }}</reason>
<keyName>{{ instance.key_name }}</keyName>
{% if instance.key_name is not none %}
<keyName>{{ instance.key_name }}</keyName>
{% endif %}
<ebsOptimized>{{ instance.ebs_optimized }}</ebsOptimized>
<amiLaunchIndex>{{ instance.ami_launch_index }}</amiLaunchIndex>
<productCodes/>

16
tests/test_ec2/test_instances.py
View File

@ -1990,6 +1990,22 @@ def test_modify_delete_on_termination():
instance.block_device_mappings[0]["Ebs"]["DeleteOnTermination"].should.be(False)
@mock_ec2
def test_create_instance_with_default_options():
client = boto3.client("ec2", region_name="eu-west-1")
def assert_instance(instance):
# TODO: Add additional asserts for default instance response
assert instance["ImageId"] == EXAMPLE_AMI_ID
assert "KeyName" not in instance
resp = client.run_instances(ImageId=EXAMPLE_AMI_ID, MaxCount=1, MinCount=1)
assert_instance(resp["Instances"][0])
resp = client.describe_instances(InstanceIds=[resp["Instances"][0]["InstanceId"]])
assert_instance(resp["Reservations"][0]["Instances"][0])
@mock_ec2
def test_create_instance_ebs_optimized():
ec2_resource = boto3.resource("ec2", region_name="eu-west-1")