Refactor mock data structure

lib/fog/aws/iam.rb

@@ -61,7 +61,16 @@ module Fog
           @data ||= Hash.new do |hash, key|
             hash[key] = {
               :owner_id => Fog::AWS::Mock.owner_id,
-              :server_certificates => {}
+              :server_certificates => {},
+              :users => Hash.new do |uhash, ukey|
+                uhash[ukey] = {
+                  :user_id     => Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 21),
+                  :path        => '/',
+                  :arn         => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{ukey}",
+                  :access_keys => [],
+                  :policies    => {}
+                }
+              end
             }
           end
         end

lib/fog/aws/requests/iam/create_access_key.rb

@@ -36,20 +36,18 @@ module Fog
         def create_access_key(options)
           #FIXME: Not 100% correct as AWS will use the signing credentials when there is no 'UserName' in the options hash
           #       Also doesn't raise an error when there are too many keys
-          data[:users] ||= {}
           user_name = options['UserName']
           if data[:users].keys.include? user_name
             response = Excon::Response.new
-            user_resp = { 'AccessKey' => { 'SecretAccessKey' => '',
+            key = { 'SecretAccessKey' => '123',
                     'Status' => 'Active',
-                                           'AccessKeyId' => '',
+                    'AccessKeyId' => '456',
                     'UserName' => user_name
-                                          },
+                  }
-                          'RequestId' => Fog::AWS::Mock.request_id }
+            data[:users][user_name][:access_keys] << key
-            data[:users][user_name][:access_keys] ||= []
-            data[:users][user_name][:access_keys] << user_resp
             response.status = 200
-            response.body = user_resp
+            response.body = { 'AccessKey' => key,
+                              'RequestId' => Fog::AWS::Mock.request_id } 
             response
           else
             raise Fog::AWS::IAM::NotFound.new('The user with name booboboboob cannot be found.')

lib/fog/aws/requests/iam/create_user.rb

@@ -37,23 +37,22 @@ module Fog
 
       class Mock
         def create_user(user_name, path='/')
-          data[:users] ||= {}
           if data[:users].keys.include? user_name
             raise Fog::AWS::IAM::EntityAlreadyExists.new "User with name #{user_name} already exists."
           else
             response = Excon::Response.new
-            user_resp = { "User"      => {
+            data[:users][user_name][:path] = path
-                                           "UserId"   => Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 21),
+            user = {
-                                           "Path"     => path,
+                     "UserId"   => data[:users][user_name][:user_id],
+                     "Path"     => data[:users][user_name][:path],
                      "UserName" => user_name,
-                                           "Arn"      => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{user_name}"
+                     "Arn"      => data[:users][user_name][:arn]
-                                          },
-                          "RequestId" => Fog::AWS::Mock.request_id
                    }
 
-            data[:users][user_name] = user_resp
             response.status = 200
-            response.body = user_resp
+            response.body = { 'User' => user,
+                              'RequestId' => Fog::AWS::Mock.request_id
+                             }
             response
           end
         end