remove supportedLifecycleRules from constants

supportedLifecycleRules' value is different between the 7.x and 8.x branches. We should define the rules directly in the config of the Zenko components. Issue: ARSN-435
scality · Dec 11, 2024 · 6b86467 · 6b86467
1 parent fed5807
commit 6b86467
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -159,13 +159,6 @@ export const notificationArnPrefix = 'arn:scality:bucketnotif';
 // http.Agent.
 export const httpServerKeepAliveTimeout = 60000;
 export const httpClientFreeSocketTimeout = 55000;
-export const supportedLifecycleRules = [
-    'expiration',
-    'noncurrentVersionExpiration',
-    'abortIncompleteMultipartUpload',
-    'transitions',
-    'noncurrentVersionTransition',
-];
 // Maximum number of buckets to cache (bucket metadata)
 export const maxCachedBuckets = process.env.METADATA_MAX_CACHED_BUCKETS ?
     Number(process.env.METADATA_MAX_CACHED_BUCKETS) : 1000;

diff --git a/lib/s3middleware/lifecycleHelpers/LifecycleUtils.ts b/lib/s3middleware/lifecycleHelpers/LifecycleUtils.ts
@@ -1,13 +1,12 @@
 import assert from 'assert';
 
 import LifecycleDateTime from './LifecycleDateTime';
-import { supportedLifecycleRules } from '../../constants';
 
 export default class LifecycleUtils {
     _supportedRules: string[];
     _datetime: LifecycleDateTime;
 
-    constructor(supportedRules?: string[], datetime?: LifecycleDateTime) {
+    constructor(supportedRules: string[], datetime?: LifecycleDateTime) {
         if (supportedRules) {
             assert(Array.isArray(supportedRules));
         }
@@ -16,7 +15,7 @@ export default class LifecycleUtils {
             assert(datetime instanceof LifecycleDateTime);
         }
 
-        this._supportedRules = supportedRules || supportedLifecycleRules;
+        this._supportedRules = supportedRules;
         this._datetime = datetime || new LifecycleDateTime();
     }
 

diff --git a/tests/unit/s3middleware/LifecycleUtils.spec.js b/tests/unit/s3middleware/LifecycleUtils.spec.js
@@ -713,7 +713,13 @@ describe('LifecycleUtils::filterRules', () => {
     let lutils;
 
     beforeAll(() => {
-        lutils = new LifecycleUtils();
+        lutils = new LifecycleUtils([
+            'expiration',
+            'noncurrentVersionExpiration',
+            'abortIncompleteMultipartUpload',
+            'transitions',
+            'noncurrentVersionTransition',
+        ]);
     });
 
     it('should filter out Status disabled rules', () => {
@@ -898,7 +904,13 @@ describe('LifecycleUtils::getApplicableTransition', () => {
     let lutils;
 
     beforeAll(() => {
-        lutils = new LifecycleUtils();
+        lutils = new LifecycleUtils([
+            'expiration',
+            'noncurrentVersionExpiration',
+            'abortIncompleteMultipartUpload',
+            'transitions',
+            'noncurrentVersionTransition',
+        ]);
     });
 
     describe('using Days time type', () => {
@@ -1071,7 +1083,13 @@ describe('LifecycleUtils::getApplicableNCVTransition', () => {
     let lutils;
 
     beforeAll(() => {
-        lutils = new LifecycleUtils();
+        lutils = new LifecycleUtils([
+            'expiration',
+            'noncurrentVersionExpiration',
+            'abortIncompleteMultipartUpload',
+            'transitions',
+            'noncurrentVersionTransition',
+        ]);
     });
 
     describe('using NoncurrentDays time type', () => {
@@ -1175,7 +1193,13 @@ describe('LifecycleUtils::compareTransitions', () => {
     let lutils;
 
     beforeAll(() => {
-        lutils = new LifecycleUtils();
+        lutils = new LifecycleUtils([
+            'expiration',
+            'noncurrentVersionExpiration',
+            'abortIncompleteMultipartUpload',
+            'transitions',
+            'noncurrentVersionTransition',
+        ]);
     });
 
     it('should return undefined if no rules given', () => {
@@ -1274,7 +1298,13 @@ describe('LifecycleUtils::getApplicableNCVTransition', () => {
     let lutils;
 
     beforeAll(() => {
-        lutils = new LifecycleUtils();
+        lutils = new LifecycleUtils([
+            'expiration',
+            'noncurrentVersionExpiration',
+            'abortIncompleteMultipartUpload',
+            'transitions',
+            'noncurrentVersionTransition',
+        ]);
     });
 
     describe('using NoncurrentDays time type', () => {