catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for KmsKeyId in ec2:RunInstances (#3943)

Browse source
This commit is contained in:
Brian Pandola 2021-05-19 23:11:50 -07:00 • committed by GitHub
commit 752b508738
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
moto/ec2/models.py
View file

@ -612,9 +612,10 @@ class Instance(TaggedEC2Resource, BotoInstance, CloudFormationModel):
snapshot_id=None,
encrypted=False,
delete_on_termination=False,
kms_key_id=None,
):
volume = self.ec2_backend.create_volume(
size, self.region_name, snapshot_id, encrypted
size, self.region_name, snapshot_id, encrypted, kms_key_id
)
self.ec2_backend.attach_volume(
volume.id, self.id, device_path, delete_on_termination
@ -984,12 +985,14 @@ class InstanceBackend(object):
delete_on_termination = block_device["Ebs"].get(
"DeleteOnTermination", False
)
kms_key_id = block_device["Ebs"].get("KmsKeyId")
new_instance.add_block_device(
volume_size,
device_name,
snapshot_id,
encrypted,
delete_on_termination,
kms_key_id,
)
else:
new_instance.setup_defaults()

1
moto/ec2/responses/instances.py
View file

@ -301,6 +301,7 @@ class InstanceResponse(BaseResponse):
device_template["Ebs"]["Encrypted"] = self._convert_to_bool(
device_mapping.get("ebs._encrypted", False)
)
device_template["Ebs"]["KmsKeyId"] = device_mapping.get("ebs._kms_key_id")
mappings.append(device_template)
return mappings