Merge pull request #2280 from acsbendi/create-access-key-fix

Create access key fix

moto/iam/models.py

@@ -292,8 +292,8 @@ class AccessKey(BaseModel):
 
     def __init__(self, user_name):
         self.user_name = user_name
-        self.access_key_id = random_access_key()
-        self.secret_access_key = random_alphanumeric(32)
+        self.access_key_id = "AKIA" + random_access_key()
+        self.secret_access_key = random_alphanumeric(40)
         self.status = 'Active'
         self.create_date = datetime.utcnow()
         self.last_used = datetime.utcnow()

moto/iam/responses.py

@@ -1493,6 +1493,7 @@ CREATE_ACCESS_KEY_TEMPLATE = """<CreateAccessKeyResponse>
          <AccessKeyId>{{ key.access_key_id }}</AccessKeyId>
          <Status>{{ key.status }}</Status>
          <SecretAccessKey>{{ key.secret_access_key }}</SecretAccessKey>
+         <CreateDate>{{ key.created_iso_8601 }}</CreateDate>
       </AccessKey>
    </CreateAccessKeyResult>
    <ResponseMetadata>

moto/iam/utils.py

@@ -7,7 +7,7 @@ import six
 def random_alphanumeric(length):
     return ''.join(six.text_type(
         random.choice(
-            string.ascii_letters + string.digits
+            string.ascii_letters + string.digits + "+" + "/"
         )) for _ in range(length)
     )
 

tests/test_iam/test_iam.py

@@ -577,13 +577,17 @@ def test_delete_login_profile():
     conn.delete_login_profile('my-user')
 
 
-@mock_iam_deprecated()
+@mock_iam()
 def test_create_access_key():
-    conn = boto.connect_iam()
-    with assert_raises(BotoServerError):
-        conn.create_access_key('my-user')
-    conn.create_user('my-user')
-    conn.create_access_key('my-user')
+    conn = boto3.client('iam', region_name='us-east-1')
+    with assert_raises(ClientError):
+        conn.create_access_key(UserName='my-user')
+    conn.create_user(UserName='my-user')
+    access_key = conn.create_access_key(UserName='my-user')["AccessKey"]
+    (datetime.utcnow() - access_key["CreateDate"].replace(tzinfo=None)).seconds.should.be.within(0, 10)
+    access_key["AccessKeyId"].should.have.length_of(20)
+    access_key["SecretAccessKey"].should.have.length_of(40)
+    assert access_key["AccessKeyId"].startswith("AKIA")
 
 
 @mock_iam_deprecated()