Merge remote-tracking branch 'upstream/master'

tests/test_kms/test_kms.py

@@ -11,21 +11,29 @@ import sure  # noqa
 from moto import mock_kms, mock_kms_deprecated
 from nose.tools import assert_raises
 from freezegun import freeze_time
+from datetime import date
 from datetime import datetime
 from dateutil.tz import tzutc
 
 
-@mock_kms_deprecated
+@mock_kms
 def test_create_key():
-    conn = boto.kms.connect_to_region("us-west-2")
+    conn = boto3.client('kms', region_name='us-east-1')
     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",
+                              Description="my key",
+                              KeyUsage='ENCRYPT_DECRYPT',
+                              Tags=[
+                                  {
+                                      'TagKey': 'project',
+                                      'TagValue': 'moto',
+                                  },
+                              ])
 
         key['KeyMetadata']['Description'].should.equal("my key")
         key['KeyMetadata']['KeyUsage'].should.equal("ENCRYPT_DECRYPT")
         key['KeyMetadata']['Enabled'].should.equal(True)
-        key['KeyMetadata']['CreationDate'].should.equal("1420070400")
+        key['KeyMetadata']['CreationDate'].should.be.a(date)
 
 
 @mock_kms_deprecated
@@ -183,6 +191,7 @@ def test_decrypt():
     conn = boto.kms.connect_to_region('us-west-2')
     response = conn.decrypt('ZW5jcnlwdG1l'.encode('utf-8'))
     response['Plaintext'].should.equal(b'encryptme')
+    response['KeyId'].should.equal('key_id')
 
 
 @mock_kms_deprecated