diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb index dbd81389e..f4ebe103f 100644 --- a/lib/fog/aws/requests/storage/get_object_acl.rb +++ b/lib/fog/aws/requests/storage/get_object_acl.rb @@ -59,7 +59,7 @@ module Fog class Mock # :nodoc:all - def get_object_acl(bucket_name, object_name) + def get_object_acl(bucket_name, object_name, options = {}) response = Excon::Response.new if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name] response.status = 200 diff --git a/lib/fog/aws/requests/storage/hash_to_acl.rb b/lib/fog/aws/requests/storage/hash_to_acl.rb index 984681640..e9699bf2d 100644 --- a/lib/fog/aws/requests/storage/hash_to_acl.rb +++ b/lib/fog/aws/requests/storage/hash_to_acl.rb @@ -24,9 +24,8 @@ DATA 'Group' end data << " \n" - for key, value in grant['Grantee'] - data << " <#{key}>#{value}\n" - end + data << " #{grant['Grantee']['ID']}\n" + data << " #{grant['Grantee']['DisplayName']}\n" data << " \n" data << " #{grant['Permission']}\n" data << " \n"