Modify lifecycle

Author: dt3310321

qcloud_cos/cos_client.py

@@ -391,7 +391,7 @@ def delete_objects(self, Bucket, Delete={}, **kwargs):
             auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key),
             headers=headers)
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Deleted', 'Error'])
+        format_dict(data, ['Deleted', 'Error'])
         return data
 
     def head_object(self, Bucket, Key, **kwargs):
@@ -723,9 +723,9 @@ def list_parts(self, Bucket, Key, UploadId, EncodingType='', MaxParts=1000, Part
                 headers=headers,
                 params=params)
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Part'])
+        format_dict(data, ['Part'])
         if decodeflag:
-            data = decode_result(data, ['Key'], [])
+            decode_result(data, ['Key'], [])
         return data
 
     def put_object_acl(self, Bucket, Key, AccessControlPolicy={}, **kwargs):
@@ -938,9 +938,9 @@ def list_objects(self, Bucket, Prefix="", Delimiter="", Marker="", MaxKeys=1000,
                 headers=headers,
                 auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key))
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Contents', 'CommonPrefixes'])
+        format_dict(data, ['Contents', 'CommonPrefixes'])
         if decodeflag:
-            data = decode_result(
+            decode_result(
                 data,
                 [
                     'Prefix',
@@ -1006,9 +1006,9 @@ def list_objects_versions(self, Bucket, Prefix="", Delimiter="", KeyMarker="", V
                 headers=headers,
                 auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key))
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Version', 'DeleteMarker', 'CommonPrefixes'])
+        format_dict(data, ['Version', 'DeleteMarker', 'CommonPrefixes'])
         if decodeflag:
-            data = decode_result(
+            decode_result(
                 data,
                 [
                     'Prefix',
@@ -1078,9 +1078,9 @@ def list_multipart_uploads(self, Bucket, Prefix="", Delimiter="", KeyMarker="",
                 auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key))
 
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Upload', 'CommonPrefixes'])
+        format_dict(data, ['Upload', 'CommonPrefixes'])
         if decodeflag:
-            data = decode_result(
+            decode_result(
                 data,
                 [
                     'Prefix',
@@ -1349,7 +1349,17 @@ def put_bucket_lifecycle(self, Bucket, LifecycleConfiguration={}, **kwargs):
                 LifecycleConfiguration=lifecycle_config
             )
         """
-        lst = ['<Rule>', '<Tag>', '</Tag>', '</Rule>']  # 类型为list的标签
+        # 类型为list的标签
+        lst = [
+            '<Rule>',
+            '<Tag>',
+            '<Transition>',
+            '<NoncurrentVersionTransition>',
+            '</NoncurrentVersionTransition>',
+            '</Transition>',
+            '</Tag>',
+            '</Rule>'
+        ]
         xml_config = format_xml(data=LifecycleConfiguration, root='LifecycleConfiguration', lst=lst)
         headers = mapped(kwargs)
         headers['Content-MD5'] = get_md5(xml_config)
@@ -1393,7 +1403,12 @@ def get_bucket_lifecycle(self, Bucket, **kwargs):
             auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key),
             headers=headers)
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Rule'])
+        format_dict(data, ['Rule'])
+        if 'Rule' in data.keys():
+            for rule in data['Rule']:
+                format_dict(rule, ['Transition', 'NoncurrentVersionTransition'])
+                if 'Filter' in rule.keys():
+                    format_dict(rule['Filter'], ['Tag'])
         return data
 
     def delete_bucket_lifecycle(self, Bucket, **kwargs):
@@ -1596,7 +1611,7 @@ def get_bucket_replication(self, Bucket, **kwargs):
             auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key),
             headers=headers)
         data = xml_to_dict(rt.text)
-        data = format_dict(data, ['Rule'])
+        format_dict(data, ['Rule'])
         return data
 
     def delete_bucket_replication(self, Bucket, **kwargs):

ut/test.py

@@ -430,10 +430,27 @@ def test_put_get_delete_lifecycle():
     lifecycle_config = {
         'Rule': [
             {
-                'Expiration': {'Date': get_date(2030, 5, 1)},
-                'ID': '123',
-                'Filter': {'Prefix': ''},
                 'Status': 'Enabled',
+                'Filter': {
+                    # 作用于带标签键 datalevel 和值 backup 的标签的对象
+                    'Tag': [
+                        {
+                            'Key': 'datalevel',
+                            'Value': 'backup'
+                        }
+                    ]
+                },
+                'Transation': [
+                    {
+                        # 30天后转换为Standard_IA
+                        'Days': 30,
+                        'StorageClass': 'Standard_IA'
+                    }
+                ],
+                'Expiration': {
+                    # 3650天后过期删除
+                    'Days': 3650
+                }
             }
         ]
     }