BB-428 move forceLegacyListing to ensure compatibility with Artesca

scality · Aug 8, 2023 · 1561316 · 1561316
1 parent 42b71e0
commit 1561316
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/extensions/lifecycle/LifecycleConfigValidator.js b/extensions/lifecycle/LifecycleConfigValidator.js
@@ -7,6 +7,7 @@ const joiSchema = {
     bucketTasksTopic: joi.string().required(),
     objectTasksTopic: joi.string().required(),
     auth: authJoi.required(),
+    forceLegacyListing: joi.boolean().default(false),
     conductor: {
         bucketSource: joi.string().
             valid('bucketd', 'zookeeper').default('zookeeper'),
@@ -33,7 +34,6 @@ const joiSchema = {
         // overloading the system
         concurrency: joi.number().greater(0).default(1),
         probeServer: probeServerJoi.default(),
-        forceLegacyListing: joi.boolean().default(false),
     },
     objectProcessor: {
         groupId: joi.string().required(),

diff --git a/extensions/lifecycle/bucketProcessor/LifecycleBucketProcessor.js b/extensions/lifecycle/bucketProcessor/LifecycleBucketProcessor.js
@@ -345,8 +345,7 @@ class LifecycleBucketProcessor {
             }
 
             let task;
-            // TODO: ZENKO-4501 Check if bucket is indexed before using new lifecycle improvement solution
-            if (this._lcConfig.bucketProcessor.forceLegacyListing) {
+            if (this._lcConfig.forceLegacyListing) {
                 task = new LifecycleTask(this);
             } else {
                 task = new LifecycleTaskV2(this);

diff --git a/tests/functional/lifecycle/configObjects.js b/tests/functional/lifecycle/configObjects.js
@@ -13,14 +13,14 @@ const kafkaConfig = {
 };
 
 const lcConfig = {
+    forceLegacyListing: true,
     auth: {
         type: 'assumeRole',
         roleName: 'role',
         sts: {},
     },
     bucketProcessor: {
         groupId: `bucket-processor-test-${Math.random()}`,
-        forceLegacyListing: true,
     },
     objectProcessor: {
         groupId: `object-processor-test-${Math.random()}`,