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

need datetime for tests since thats what boto3 returns and add default for PendingWindowInDays

Browse source
This commit is contained in:
Jon Beilke 2018-10-06 01:18:26 -05:00
commit 9b25d56a35
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moto/kms/models.py
View file

@ -160,7 +160,7 @@ class KmsBackend(BaseBackend):
self.keys[key_id].key_state = 'Disabled'
self.keys[key_id].deletion_date = None
def schedule_key_deletion(self, key_id, pending_window_in_days=30):
def schedule_key_deletion(self, key_id, pending_window_in_days):
if key_id in self.keys:
if 7 <= pending_window_in_days <= 30:
self.keys[key_id].enabled = False

5
moto/kms/responses.py
View file

@ -269,7 +269,10 @@ class KmsResponse(BaseResponse):
def schedule_key_deletion(self):
key_id = self.parameters.get('KeyId')
pending_window_in_days = self.parameters.get('PendingWindowInDays')
if self.parameters.get('PendingWindowInDays') is None:
pending_window_in_days = 30
else:
pending_window_in_days = self.parameters.get('PendingWindowInDays')
_assert_valid_key_id(self.kms_backend.get_key_id(key_id))
try:
return json.dumps({