diff --git a/moto/kms/models.py b/moto/kms/models.py index 01b3d9711..bb39d1b24 100644 --- a/moto/kms/models.py +++ b/moto/kms/models.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import boto.kms from moto.core import BaseBackend, BaseModel +from moto.core.utils import iso_8601_datetime_without_milliseconds from .utils import generate_key_id from collections import defaultdict from datetime import datetime, timedelta @@ -43,7 +44,7 @@ class Key(BaseModel): } } 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 def delete(self, region_name): @@ -166,7 +167,7 @@ class KmsBackend(BaseBackend): self.keys[key_id].enabled = False self.keys[key_id].key_state = 'PendingDeletion' 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 = {} diff --git a/moto/kms/responses.py b/moto/kms/responses.py index 7caeafcaa..5883f51ec 100644 --- a/moto/kms/responses.py +++ b/moto/kms/responses.py @@ -9,7 +9,6 @@ from boto.exception import JSONResponseError from boto.kms.exceptions import AlreadyExistsException, NotFoundException from moto.core.responses import BaseResponse -from moto.core.utils import iso_8601_datetime_without_milliseconds from .models import kms_backends reserved_aliases = [ @@ -277,7 +276,7 @@ class KmsResponse(BaseResponse): try: return json.dumps({ '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: raise JSONResponseError(404, 'Not Found', body={