Merge pull request #317 from Willamin/deprecate-displayname

Remove the deprecated Owner DisplayName field.

Author: bernardd

lib/ex_aws/s3/parsers.ex

@@ -23,8 +23,7 @@ if Code.ensure_loaded?(SweetXml) do
             storage_class: ~x"./StorageClass/text()"s,
             owner: [
               ~x"./Owner"o,
-              id: ~x"./ID/text()"s,
-              display_name: ~x"./DisplayName/text()"s
+              id: ~x"./ID/text()"s
             ]
           ],
           common_prefixes: [
@@ -44,8 +43,7 @@ if Code.ensure_loaded?(SweetXml) do
         |> SweetXml.xpath(~x"//ListAllMyBucketsResult",
           owner: [
             ~x"./Owner",
-            id: ~x"./ID/text()"s,
-            display_name: ~x"./DisplayName/text()"s
+            id: ~x"./ID/text()"s
           ],
           buckets: [
             ~x".//Bucket"l,
@@ -169,7 +167,6 @@ if Code.ensure_loaded?(SweetXml) do
             size: ~x"./Size/text()"s,
             owner: [
               ~x"./Owner"e,
-              display_name: ~x"./DisplayName/text()"s,
               id: ~x"./ID/text()"s
             ]
           ],
@@ -181,7 +178,6 @@ if Code.ensure_loaded?(SweetXml) do
             last_modified: ~x"./LastModified/text()"s,
             owner: [
               ~x"./Owner"e,
-              display_name: ~x"./DisplayName/text()"s,
               id: ~x"./ID/text()"s
             ]
           ]

test/lib/s3/integration_test.exs

@@ -11,7 +11,6 @@ defmodule ExAws.S3IntegrationTest do
     <ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
       <Owner>
         <ID>fcde9916b80a61ee31a082a6a58a7017df4e4e7a9124e3748dbe9ecc414b9cb8</ID>
-        <DisplayName>ex_aws_s3</DisplayName>
       </Owner>
       <Buckets>
         <Bucket>

test/lib/s3/parser_test.exs

@@ -17,7 +17,6 @@ defmodule ExAws.S3.ParserTest do
         <Size>142863</Size>
         <Owner>
         <ID>canonical-user-id</ID>
-        <DisplayName>display-name</DisplayName>
         </Owner>
         <StorageClass>STANDARD</StorageClass>
       </Contents>
@@ -92,11 +91,9 @@ defmodule ExAws.S3.ParserTest do
       <UploadId>e3gloTamzXlqzgRfKIXrFBhnxCfM35jhktoh.wduDUJHy61R_hjglrx_rLguDGxmOvPeDfzJEK7mxgx7eRwPs9XbYXVmDywrRjbJSmqr.McfkCRDjuI4cdB72IYzfFJl</UploadId>
       <Initiator>
         <ID>arn:aws:iam::123456789012:user/username</ID>
-        <DisplayName>username</DisplayName>
       </Initiator>
       <Owner>
         <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-        <DisplayName>[email protected]</DisplayName>
       </Owner>
       <StorageClass>STANDARD</StorageClass>
       <PartNumberMarker>0</PartNumberMarker>
@@ -119,11 +116,9 @@ defmodule ExAws.S3.ParserTest do
       <UploadId>e3gloTamzXlqzgRfKIXrFBhnxCfM35jhktoh.wduDUJHy61R_hjglrx_rLguDGxmOvPeDfzJEK7mxgx7eRwPs9XbYXVmDywrRjbJSmqr.McfkCRDjuI4cdB72IYzfFJl</UploadId>
       <Initiator>
         <ID>arn:aws:iam::123456789012:user/username</ID>
-        <DisplayName>username</DisplayName>
       </Initiator>
       <Owner>
         <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-        <DisplayName>[email protected]</DisplayName>
       </Owner>
       <StorageClass>STANDARD</StorageClass>
       <PartNumberMarker>0</PartNumberMarker>
@@ -215,7 +210,6 @@ defmodule ExAws.S3.ParserTest do
         <StorageClass>STANDARD</StorageClass>
         <Owner>
             <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-            <DisplayName>[email protected]</DisplayName>
         </Owner>
     </Version>
     <DeleteMarker>
@@ -225,7 +219,6 @@ defmodule ExAws.S3.ParserTest do
         <LastModified>2009-11-12T17:50:30.000Z</LastModified>
         <Owner>
             <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-            <DisplayName>[email protected]</DisplayName>
         </Owner>
     </DeleteMarker>
     <Version>
@@ -238,7 +231,6 @@ defmodule ExAws.S3.ParserTest do
         <StorageClass>STANDARD</StorageClass>
         <Owner>
             <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-            <DisplayName>[email protected]</DisplayName>
         </Owner>
     </Version>
     <DeleteMarker>
@@ -248,7 +240,6 @@ defmodule ExAws.S3.ParserTest do
         <LastModified>2009-10-15T17:50:30.000Z</LastModified>
         <Owner>
             <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-            <DisplayName>[email protected]</DisplayName>
         </Owner>
     </DeleteMarker>
     <Version>
@@ -261,7 +252,6 @@ defmodule ExAws.S3.ParserTest do
         <StorageClass>STANDARD</StorageClass>
         <Owner>
             <ID>75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a</ID>
-            <DisplayName>[email protected]</DisplayName>
         </Owner>
      </Version>
     </ListVersionsResult>
@@ -294,15 +284,13 @@ defmodule ExAws.S3.ParserTest do
     assert version1[:size] == "434234"
     assert version1[:last_modified] == "2009-10-12T17:50:30.000Z"
     assert is_map(version1[:owner])
-    assert version1[:owner][:display_name] == "[email protected]"
 
     delete_marker1 = Enum.at(delete_markers, 0)
     assert delete_marker1[:key] == "my-second-image.jpg"
     assert delete_marker1[:version_id] == "03jpff543dhffds434rfdsFDN943fdsFkdmqnh892"
     assert delete_marker1[:is_latest] == "true"
     assert delete_marker1[:last_modified] == "2009-11-12T17:50:30.000Z"
     assert is_map(delete_marker1[:owner])
-    assert delete_marker1[:owner][:display_name] == "[email protected]"
   end
 
   describe "#parse_upload_part_copy" do