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

Platform independent KMS timestamp generation (#2193)

Browse Source 
* Platform independent KMS timestamp generation

Fixes #2192

* Switch to moto.core.unix_time

Fixes #2192
This commit is contained in:
James Bungard 2019-05-22 02:46:22 +10:00 committed by Terry Cain
parent 9bf8fd3417
commit 796dd71c0c
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/kms/models.py
View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import os import os
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 moto.core.utils import iso_8601_datetime_without_milliseconds, unix_time
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
@ -37,7 +37,7 @@ class Key(BaseModel):
"KeyMetadata": { "KeyMetadata": {
"AWSAccountId": self.account_id, "AWSAccountId": self.account_id,
"Arn": self.arn, "Arn": self.arn,
"CreationDate": datetime.strftime(datetime.utcnow(), "%s"), "CreationDate": "%d" % unix_time(),
"Description": self.description, "Description": self.description,
"Enabled": self.enabled, "Enabled": self.enabled,
"KeyId": self.id, "KeyId": self.id,

15
tests/test_kms/test_kms.py
View File

@ -18,13 +18,14 @@ from dateutil.tz import tzutc
@mock_kms_deprecated @mock_kms_deprecated
def test_create_key(): def test_create_key():
conn = boto.kms.connect_to_region("us-west-2") conn = boto.kms.connect_to_region("us-west-2")
with freeze_time("2015-01-01 00:00:00"):
key = conn.create_key(policy="my policy",
description="my key", key_usage='ENCRYPT_DECRYPT')
key = conn.create_key(policy="my policy", key['KeyMetadata']['Description'].should.equal("my key")
description="my key", key_usage='ENCRYPT_DECRYPT') key['KeyMetadata']['KeyUsage'].should.equal("ENCRYPT_DECRYPT")
key['KeyMetadata']['Enabled'].should.equal(True)
key['KeyMetadata']['Description'].should.equal("my key") key['KeyMetadata']['CreationDate'].should.equal("1420070400")
key['KeyMetadata']['KeyUsage'].should.equal("ENCRYPT_DECRYPT")
key['KeyMetadata']['Enabled'].should.equal(True)
@mock_kms_deprecated @mock_kms_deprecated
@ -980,5 +981,3 @@ def test_put_key_policy_key_not_found():
PolicyName='default', PolicyName='default',
Policy='new policy' Policy='new policy'
) )