fix: putBucketLifecycle add ColdArchive and DeepColdArchive

ali-sdk · Aug 7, 2024 · de7aefe · de7aefe
1 parent 3bf8abf
commit de7aefe
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 39 deletions.
diff --git a/lib/common/bucket/putBucketLifecycle.js b/lib/common/bucket/putBucketLifecycle.js
@@ -96,9 +96,9 @@ function handleCheckTag(tag) {
   checkObjectTag(tagObj);
 }
 
-function checkStorageClass(name, storageClass) {
+function checkStorageClass(storageClass) {
   if (!['IA', 'Archive', 'ColdArchive', 'DeepColdArchive'].includes(storageClass))
-    throw new Error(`${name} must be IA or Archive or ColdArchive or DeepColdArchive`);
+    throw new Error(`StorageClass must be IA or Archive or ColdArchive or DeepColdArchive`);
 }
 
 function checkRule(rule) {
@@ -109,7 +109,7 @@ function checkRule(rule) {
   if (!['Enabled', 'Disabled'].includes(rule.status)) throw new Error('Status must be  Enabled or Disabled');
 
   if (rule.transition) {
-    checkStorageClass('StorageClass', rule.transition.storageClass);
+    checkStorageClass(rule.transition.storageClass);
     checkDaysAndDate(rule.transition, 'Transition');
   }
 
@@ -138,7 +138,7 @@ function checkRule(rule) {
   }
 
   if (rule.noncurrentVersionTransition) {
-    checkStorageClass('noncurrentVersionTransition', rule.noncurrentVersionTransition.storageClass);
+    checkStorageClass(rule.noncurrentVersionTransition.storageClass);
     checkNoncurrentDays(rule.noncurrentVersionTransition, 'NoncurrentVersionTransition');
   }
 

diff --git a/test/node/bucket.test.js b/test/node/bucket.test.js
@@ -764,7 +764,25 @@ describe('test/bucket.test.js', () => {
       });
 
       describe('putBucketLifecycle()', () => {
-        // todo delete
+        it('should put the lifecycle throw error', async () => {
+          try {
+            await store.putBucketLifecycle(bucket, [
+              {
+                id: 'expiration1',
+                prefix: 'logs/',
+                status: 'Enabled',
+                day: 1
+              }
+            ]);
+            assert.fail('expected an error to be thrown');
+          } catch (e) {
+            assert.equal(
+              e.message,
+              'Rule must includes expiration or noncurrentVersionExpiration or abortMultipartUpload or transition or noncurrentVersionTransition'
+            );
+          }
+        });
+
         it('should put the lifecycle with old api', async () => {
           const putresult1 = await store.putBucketLifecycle(bucket, [
             {
@@ -774,6 +792,7 @@ describe('test/bucket.test.js', () => {
               days: 1
             }
           ]);
+
           assert.equal(putresult1.res.status, 200);
 
           const putresult2 = await store.putBucketLifecycle(bucket, [

diff --git a/test/node/multiversion.test.js b/test/node/multiversion.test.js
@@ -22,7 +22,8 @@ describe('test/multiversion.test.js', () => {
   ].forEach((moreConfigs, idx) => {
     describe(`test multiversion in iterate ${idx}`, () => {
       before(async () => {
-        store = oss({ ...config, ...moreConfigs });
+        // oss-ap-southeast-1 suport PutBucketLifecycle DeepColdArchive
+        store = oss({ ...config, ...moreConfigs, region: 'oss-ap-southeast-1' });
         bucket = `ali-oss-test-bucket-version-${prefix.replace(/[/.]/g, '-')}${idx}`;
 
         const result = await store.putBucket(bucket);
@@ -170,40 +171,44 @@ describe('test/multiversion.test.js', () => {
         });
 
         it('should putBucketLifecycle with noncurrentVersionTransition', async () => {
-          const putresult = await store.putBucketLifecycle(bucket, [
-            {
-              prefix: 'log/',
-              status: 'Enabled',
-              noncurrentVersionTransition: {
-                noncurrentDays: '10',
-                storageClass: 'IA'
-              }
-            },
-            {
-              prefix: 'logs/',
-              status: 'Enabled',
-              noncurrentVersionTransition: {
-                noncurrentDays: '10',
-                storageClass: 'Archive'
-              }
-            },
-            {
-              prefix: 'logss/',
-              status: 'Enabled',
-              noncurrentVersionTransition: {
-                noncurrentDays: '10',
-                storageClass: 'ColdArchive'
-              }
-            },
-            {
-              prefix: 'logsss/',
-              status: 'Enabled',
-              noncurrentVersionTransition: {
-                noncurrentDays: '10',
-                storageClass: 'DeepColdArchive'
+          const putresult = await store.putBucketLifecycle(
+            bucket,
+            [
+              {
+                prefix: 'log/',
+                status: 'Enabled',
+                noncurrentVersionTransition: {
+                  noncurrentDays: '10',
+                  storageClass: 'IA'
+                }
+              },
+              {
+                prefix: 'log/',
+                status: 'Enabled',
+                noncurrentVersionTransition: {
+                  noncurrentDays: '10',
+                  storageClass: 'Archive'
+                }
+              },
+              {
+                prefix: 'log/',
+                status: 'Enabled',
+                noncurrentVersionTransition: {
+                  noncurrentDays: '10',
+                  storageClass: 'ColdArchive'
+                }
+              },
+              {
+                prefix: 'log/',
+                status: 'Enabled',
+                noncurrentVersionTransition: {
+                  noncurrentDays: '10',
+                  storageClass: 'DeepColdArchive'
+                }
               }
-            }
-          ]);
+            ],
+            { headers: { 'x-oss-allow-same-action-overlap': 'true' } }
+          );
           assert.equal(putresult.res.status, 200);
           await utils.sleep(1000);