Made fixes to the S3 Lifecycle mocks to be more consistent with the API.

moto/s3/models.py

@@ -329,7 +329,8 @@ class FakeGrant(BaseModel):
 
 class FakeAcl(BaseModel):
 
-    def __init__(self, grants=[]):
+    def __init__(self, grants=None):
+        grants = grants or []
         self.grants = grants
 
     @property
@@ -396,7 +397,7 @@ class FakeTag(BaseModel):
 class LifecycleFilter(BaseModel):
 
     def __init__(self, prefix=None, tag=None, and_filter=None):
-        self.prefix = prefix or ''
+        self.prefix = prefix
         self.tag = tag
         self.and_filter = and_filter
 
@@ -404,7 +405,7 @@ class LifecycleFilter(BaseModel):
 class LifecycleAndFilter(BaseModel):
 
     def __init__(self, prefix=None, tags=None):
-        self.prefix = prefix or ''
+        self.prefix = prefix
         self.tags = tags
 
 
@@ -478,6 +479,8 @@ class FakeBucket(BaseModel):
         self.logging = {}
         self.notification_configuration = None
         self.accelerate_configuration = None
+        self.payer = 'BucketOwner'
+        self.creation_date = datetime.datetime.utcnow()
 
     @property
     def location(self):
@@ -494,6 +497,11 @@ class FakeBucket(BaseModel):
             expiration = rule.get('Expiration')
             transition = rule.get('Transition')
 
+            try:
+                top_level_prefix = rule['Prefix'] or ''  # If it's `None` the set to the empty string
+            except KeyError:
+                top_level_prefix = None
+
             nve_noncurrent_days = None
             if rule.get('NoncurrentVersionExpiration') is not None:
                 if rule["NoncurrentVersionExpiration"].get('NoncurrentDays') is None:
@@ -528,13 +536,22 @@ class FakeBucket(BaseModel):
             if rule.get("Filter"):
                 # Can't have both `Filter` and `Prefix` (need to check for the presence of the key):
                 try:
+                    # 'Prefix' cannot be outside of a Filter:
                     if rule["Prefix"] or not rule["Prefix"]:
                         raise MalformedXML()
                 except KeyError:
                     pass
 
+                filters = 0
+                try:
+                    prefix_filter = rule['Filter']['Prefix'] or ''  # If it's `None` the set to the empty string
+                    filters += 1
+                except KeyError:
+                    prefix_filter = None
+
                 and_filter = None
                 if rule["Filter"].get("And"):
+                    filters += 1
                     and_tags = []
                     if rule["Filter"]["And"].get("Tag"):
                         if not isinstance(rule["Filter"]["And"]["Tag"], list):
@@ -543,17 +560,34 @@ class FakeBucket(BaseModel):
                         for t in rule["Filter"]["And"]["Tag"]:
                             and_tags.append(FakeTag(t["Key"], t.get("Value", '')))
 
-                    and_filter = LifecycleAndFilter(prefix=rule["Filter"]["And"]["Prefix"], tags=and_tags)
+                    try:
+                        and_prefix = rule["Filter"]["And"]["Prefix"] or ''  # If it's `None` then set to the empty string
+                    except KeyError:
+                        and_prefix = None
+
+                    and_filter = LifecycleAndFilter(prefix=and_prefix, tags=and_tags)
 
                 filter_tag = None
                 if rule["Filter"].get("Tag"):
+                    filters += 1
                     filter_tag = FakeTag(rule["Filter"]["Tag"]["Key"], rule["Filter"]["Tag"].get("Value", ''))
 
-                lc_filter = LifecycleFilter(prefix=rule["Filter"]["Prefix"], tag=filter_tag, and_filter=and_filter)
+                # Can't have more than 1 filter:
+                if filters > 1:
+                    raise MalformedXML()
+
+                lc_filter = LifecycleFilter(prefix=prefix_filter, tag=filter_tag, and_filter=and_filter)
+
+            # If no top level prefix and no filter is present, then this is invalid:
+            if top_level_prefix is None:
+                try:
+                    rule['Filter']
+                except KeyError:
+                    raise MalformedXML()
 
             self.rules.append(LifecycleRule(
                 id=rule.get('ID'),
-                prefix=rule.get('Prefix'),
+                prefix=top_level_prefix,
                 lc_filter=lc_filter,
                 status=rule['Status'],
                 expiration_days=expiration.get('Days') if expiration else None,

moto/s3/responses.py

@@ -1310,7 +1310,7 @@ S3_ALL_BUCKETS = """<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2
     {% for bucket in buckets %}
       <Bucket>
         <Name>{{ bucket.name }}</Name>
-        <CreationDate>2006-02-03T16:45:09.000Z</CreationDate>
+        <CreationDate>{{ bucket.creation_date }}</CreationDate>
       </Bucket>
     {% endfor %}
  </Buckets>
@@ -1416,7 +1416,9 @@ S3_BUCKET_LIFECYCLE_CONFIGURATION = """<?xml version="1.0" encoding="UTF-8"?>
         <ID>{{ rule.id }}</ID>
         {% if rule.filter %}
         <Filter>
+            {% if rule.filter.prefix != None %}
             <Prefix>{{ rule.filter.prefix }}</Prefix>
+            {% endif %}
             {% if rule.filter.tag %}
             <Tag>
                 <Key>{{ rule.filter.tag.key }}</Key>
@@ -1425,7 +1427,9 @@ S3_BUCKET_LIFECYCLE_CONFIGURATION = """<?xml version="1.0" encoding="UTF-8"?>
             {% endif %}
             {% if rule.filter.and_filter %}
             <And>
+                {% if rule.filter.and_filter.prefix != None %}
                 <Prefix>{{ rule.filter.and_filter.prefix }}</Prefix>
+                {% endif %}
                 {% for tag in rule.filter.and_filter.tags %}
                 <Tag>
                     <Key>{{ tag.key }}</Key>
@@ -1436,7 +1440,9 @@ S3_BUCKET_LIFECYCLE_CONFIGURATION = """<?xml version="1.0" encoding="UTF-8"?>
             {% endif %}
         </Filter>
         {% else %}
-        <Prefix>{{ rule.prefix if rule.prefix != None }}</Prefix>
+            {% if rule.prefix != None %}
+            <Prefix>{{ rule.prefix }}</Prefix>
+            {% endif %}
         {% endif %}
         <Status>{{ rule.status }}</Status>
         {% if rule.storage_class %}