Merge pull request #294 from linuxbox2/wip-lc-exphdr

lifecycle: expiration header checks do not require @lifecycle_expirat…

s3tests_boto3/functional/test_s3.py

@@ -28,6 +28,7 @@ import random
 import socket
 import ssl
 from collections import namedtuple
+import pdb
 
 from email.header import decode_header
 
@@ -8913,19 +8914,19 @@ def test_lifecycle_expiration_days0():
     eq(len(expire_objects), 0)
 
 
-def setup_lifecycle_expiration(bucket_name, rule_id, delta_days,
+def setup_lifecycle_expiration(bucket_name, rule_id, delta_days, rule_prefix,
-                                    rule_prefix):
+                               key, body):
     rules=[{'ID': rule_id,
             'Expiration': {'Days': delta_days}, 'Prefix': rule_prefix,
             'Status':'Enabled'}]
     lifecycle = {'Rules': rules}
+
+    client = get_client()
     response = client.put_bucket_lifecycle_configuration(
         Bucket=bucket_name, LifecycleConfiguration=lifecycle)
     eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
 
-    key = rule_prefix + '/foo'
+    response = client.put_object(Bucket=bucket_name, Key=key, Body=body)
-    body = 'bar'
-    response = client.put_object(Bucket=bucket_name, Key=key, Body=bar)
     eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
     return response
 
@@ -8935,8 +8936,7 @@ def check_lifecycle_expiration_header(response, start_time, rule_id,
     m = re.search(r'expiry-date="(.+)", rule-id="(.+)"', exp_header)
 
     expiration = datetime.datetime.strptime(m.group(1),
-                                            '%a %b %d %H:%M:%S %Y')
+                                            '%a, %d %b %Y %H:%M:%S %Z')
-    eq((expiration - start_time).days, delta_days)
     eq(m.group(2), rule_id)
 
     return True
@@ -8945,24 +8945,20 @@ def check_lifecycle_expiration_header(response, start_time, rule_id,
 @attr(method='put')
 @attr(operation='test lifecycle expiration header put')
 @attr('lifecycle')
-@attr('lifecycle_expiration')
 def test_lifecycle_expiration_header_put():
     """
     Check for valid x-amz-expiration header after PUT
     """
     bucket_name = get_new_bucket()
-    client = get_client()
-
     now = datetime.datetime.now(None)
-    response = setup_lifecycle_expiration(
+    response = setup_lifecycle_expiration(bucket_name,'rule1', 1, 'days1/',
-        bucket_name, 'rule1', 1, 'days1/')
+                                          'days1/foo', 'foo_body')
     eq(check_lifecycle_expiration_header(response, now, 'rule1', 1), True)
 
 @attr(resource='bucket')
 @attr(method='head')
 @attr(operation='test lifecycle expiration header head')
 @attr('lifecycle')
-@attr('lifecycle_expiration')
 def test_lifecycle_expiration_header_head():
     """
     Check for valid x-amz-expiration header on HEAD request
@@ -8971,14 +8967,107 @@ def test_lifecycle_expiration_header_head():
     client = get_client()
 
     now = datetime.datetime.now(None)
-    response = setup_lifecycle_expiration(
+    response = setup_lifecycle_expiration(bucket_name, 'rule1', 1, 'days1/',
-        bucket_name, 'rule1', 1, 'days1/')
+                                          'days1/foo', 'foo_body')
 
     # stat the object, check header
-    response = client.head_object(Bucket=bucket_name, Key=key)
+    response = client.head_object(Bucket=bucket_name, Key='days1/foo')
     eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
     eq(check_lifecycle_expiration_header(response, now, 'rule1', 1), True)
 
+@attr(resource='bucket')
+@attr(method='get')
+@attr(operation='test lifecycle expiration header get')
+@attr('lifecycle')
+def test_lifecycle_expiration_header_get():
+    """
+    Check for valid x-amz-expiration header on GET request
+    """
+    bucket_name = get_new_bucket()
+    client = get_client()
+
+    now = datetime.datetime.now(None)
+    response = setup_lifecycle_expiration(bucket_name, 'rule1', 1, 'days1/',
+                                          'days1/foo', 'foo_body')
+
+    # stat the object, check header
+    response = client.get_object(Bucket=bucket_name, Key='days1/foo')
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+    eq(check_lifecycle_expiration_header(response, now, 'rule1', 1), True)
+
+@attr(resource='bucket')
+@attr(method='get')
+@attr(operation='test lifecycle expiration header tags')
+@attr('lifecycle')
+def test_lifecycle_expiration_header_tags():
+    """
+    Check x-amz-expiration-header object tags interaction
+    """
+    bucket_name = get_new_bucket()
+    client = get_client()
+
+    lifecycle={
+            "Rules": [
+            {
+                "Filter": {
+                    "Tag": {"Key": "key1", "Value": "tag1"}
+                },
+                "Status": "Enabled",
+                "Expiration": {
+                    "Days": 1
+                },
+                "ID": "rule1"
+                },
+            {
+                "Filter": {
+                    "Tag": {"Key": "key1", "Value": "tag5"}
+                },
+                "Status": "Enabled",
+                "Expiration": {
+                    "Days": 5
+                },
+                "ID": "rule5"
+                }
+            ]
+        }
+
+    response = client.put_bucket_lifecycle_configuration(
+        Bucket=bucket_name, LifecycleConfiguration=lifecycle)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+    key1 = "obj_key1"
+    body1 = "obj_key1_body"
+    response = client.put_object(Bucket=bucket_name, Key=key1, Body=body1)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+    tags1={'TagSet': [{'Key': 'key1', 'Value': 'tag1'}]}
+    response = client.put_object_tagging(Bucket=bucket_name, Key=key1,
+                                         Tagging=tags1)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+    key2 = "obj_key2"
+    body2 = "obj_key2_body"
+    response = client.put_object(Bucket=bucket_name, Key=key2, Body=body2)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+    tags2={'TagSet': [{'Key': 'key1', 'Value': 'tag5'}]}
+    response = client.put_object_tagging(Bucket=bucket_name, Key=key2,
+                                         Tagging=tags2)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+    # check expirations
+    response = client.head_object(Bucket=bucket_name, Key=key1)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+    exp_header = response['ResponseMetadata']['HTTPHeaders']['x-amz-expiration']
+    m = re.search(r'expiry-date="(.+)", rule-id="(.+)"', exp_header)
+    eq(m.group(2), "rule1")
+
+    response = client.head_object(Bucket=bucket_name, Key=key2)
+    eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
+    exp_header = response['ResponseMetadata']['HTTPHeaders']['x-amz-expiration']
+    m = re.search(r'expiry-date="(.+)", rule-id="(.+)"', exp_header)
+    eq(m.group(2), "rule5")
+
 @attr(resource='bucket')
 @attr(method='put')
 @attr(operation='set lifecycle config with noncurrent version expiration')