From 2a741a81bfd580afa6fb10c67a56facbd893dddb Mon Sep 17 00:00:00 2001 From: Veli-Matti Lintu Date: Thu, 14 Jun 2018 09:38:36 +0300 Subject: [PATCH] Explicitly define None as the default value for missing kms_key_id key in manifest. None should be returned by default, but this makes it easier to see. --- bootstrapvz/providers/ec2/__init__.py | 2 +- bootstrapvz/providers/ec2/tasks/ebs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 8431aa4..0dd2856 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -26,7 +26,7 @@ def validate_manifest(data, validator, error): bootloader = data['system']['bootloader'] virtualization = data['provider']['virtualization'] encrypted = data['provider'].get('encrypted', False) - kms_key_id = data['provider'].get('kms_key_id') + kms_key_id = data['provider'].get('kms_key_id', None) backing = data['volume']['backing'] partition_type = data['volume']['partitions']['type'] enhanced_networking = data['provider']['enhanced_networking'] if 'enhanced_networking' in data['provider'] else None diff --git a/bootstrapvz/providers/ec2/tasks/ebs.py b/bootstrapvz/providers/ec2/tasks/ebs.py index b232c47..90239eb 100644 --- a/bootstrapvz/providers/ec2/tasks/ebs.py +++ b/bootstrapvz/providers/ec2/tasks/ebs.py @@ -19,7 +19,7 @@ class Create(Task): # EBS volumes support encryption. KMS key id is optional and default key # is used when it is not defined. encrypted = info.manifest.data['provider'].get('encrypted', False) - kms_key_id = info.manifest.data['provider'].get('kms_key_id') + kms_key_id = info.manifest.data['provider'].get('kms_key_id', None) info.volume.create(info._ec2['connection'], info._ec2['host']['availabilityZone'], tags=tags, encrypted=encrypted, kms_key_id=kms_key_id)