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

transform DeletionDate in model instead to accomodate Key.to_dict

Browse Source
This commit is contained in:
Jon Beilke 2018-10-06 01:47:22 -05:00
parent 76baab74ad
commit 398dcd8230
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/kms/models.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import boto.kms import boto.kms
from moto.core import BaseBackend, BaseModel from moto.core import BaseBackend, BaseModel
from moto.core.utils import iso_8601_datetime_without_milliseconds
from .utils import generate_key_id from .utils import generate_key_id
from collections import defaultdict from collections import defaultdict
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -43,7 +44,7 @@ class Key(BaseModel):
} }
} }
if self.key_state == 'PendingDeletion': if self.key_state == 'PendingDeletion':
key_dict['KeyMetadata']['DeletionDate'] = self.deletion_date key_dict['KeyMetadata']['DeletionDate'] = iso_8601_datetime_without_milliseconds(self.deletion_date)
return key_dict return key_dict
def delete(self, region_name): def delete(self, region_name):
@ -166,7 +167,7 @@ class KmsBackend(BaseBackend):
self.keys[key_id].enabled = False self.keys[key_id].enabled = False
self.keys[key_id].key_state = 'PendingDeletion' self.keys[key_id].key_state = 'PendingDeletion'
self.keys[key_id].deletion_date = datetime.now() + timedelta(days=pending_window_in_days) self.keys[key_id].deletion_date = datetime.now() + timedelta(days=pending_window_in_days)
return self.keys[key_id].deletion_date return iso_8601_datetime_without_milliseconds(self.keys[key_id].deletion_date)
kms_backends = {} kms_backends = {}

3
moto/kms/responses.py
View File

@ -9,7 +9,6 @@ from boto.exception import JSONResponseError
from boto.kms.exceptions import AlreadyExistsException, NotFoundException from boto.kms.exceptions import AlreadyExistsException, NotFoundException
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
from moto.core.utils import iso_8601_datetime_without_milliseconds
from .models import kms_backends from .models import kms_backends
reserved_aliases = [ reserved_aliases = [
@ -277,7 +276,7 @@ class KmsResponse(BaseResponse):
try: try:
return json.dumps({ return json.dumps({
'KeyId': key_id, 'KeyId': key_id,
'DeletionDate': iso_8601_datetime_without_milliseconds(self.kms_backend.schedule_key_deletion(key_id, pending_window_in_days)) 'DeletionDate': self.kms_backend.schedule_key_deletion(key_id, pending_window_in_days)
}) })
except KeyError: except KeyError:
raise JSONResponseError(404, 'Not Found', body={ raise JSONResponseError(404, 'Not Found', body={