Support Days=0 lifecycle expiration: bump arsenal and add functional tests

lib/api/bucketPutLifecycle.js

@@ -1,7 +1,6 @@
-const { waterfall } = require('async');
+const { promisify } = require('util');
 const uuid = require('uuid').v4;
-const LifecycleConfiguration =
-    require('arsenal').models.LifecycleConfiguration;
+const LifecycleConfiguration = require('arsenal').models.LifecycleConfiguration;
 
 const config = require('../Config').config;
 const parseXML = require('../utilities/parseXML');
@@ -16,11 +15,16 @@ const monitoring = require('../utilities/monitoringHandler');
  * @param {AuthInfo} authInfo - Instance of AuthInfo class with requester's info
  * @param {object} request - http request object
  * @param {object} log - Werelogs logger
- * @param {function} callback - callback to server
- * @return {undefined}
+ * @param {function} [callback] - callback to server
+ * @return {Promise} - resolves with the CORS response headers
  */
+async function bucketPutLifecycle(authInfo, request, log, callback) {
+    if (callback) {
+        return bucketPutLifecycle(authInfo, request, log)
+            .then(corsHeaders => callback(null, corsHeaders))
+            .catch(err => callback(err, err.additionalResHeaders));
+    }
 
-function bucketPutLifecycle(authInfo, request, log, callback) {
     log.debug('processing request', { method: 'bucketPutLifecycle' });
 
     const { bucketName } = request;
@@ -30,53 +34,34 @@ function bucketPutLifecycle(authInfo, request, log, callback) {
         requestType: request.apiMethods || 'bucketPutLifecycle',
         request,
     };
-    return waterfall([
-        next => parseXML(request.post, log, next),
-        (parsedXml, next) => {
-            const lcConfigClass =
-                new LifecycleConfiguration(parsedXml, config);
-            // if there was an error getting lifecycle configuration,
-            // returned configObj will contain 'error' key
-            process.nextTick(() => {
-                const configObj = lcConfigClass.getLifecycleConfiguration();
-                if (configObj.error) {
-                    return next(configObj.error);
-                }
-                return next(null, configObj);
-            });
-        },
-        (lcConfig, next) => standardMetadataValidateBucket(metadataValParams, request.actionImplicitDenies, log,
-            (err, bucket) => {
-                if (err) {
-                    return next(err, bucket);
-                }
-                return next(null, bucket, lcConfig);
-            }),
-        (bucket, lcConfig, next) => {
-            if (!bucket.getUid()) {
-                bucket.setUid(uuid());
-            }
-            bucket.setLifecycleConfiguration(lcConfig);
-            metadata.updateBucket(bucket.getName(), bucket, log, err =>
-                next(err, bucket));
-        },
-    ], (err, bucket) => {
-        const corsHeaders = collectCorsHeaders(request.headers.origin,
-            request.method, bucket);
-        if (err) {
-            log.trace('error processing request', { error: err,
-                method: 'bucketPutLifecycle' });
-            monitoring.promMetrics(
-                'PUT', bucketName, err.code, 'putBucketLifecycle');
-            return callback(err, corsHeaders);
+
+    let bucket;
+    try {
+        const parsedXml = await promisify(parseXML)(request.post, log);
+        const lcConfig = new LifecycleConfiguration(parsedXml, log, config).getLifecycleConfiguration();
+        if (lcConfig.error) {
+            throw lcConfig.error;
+        }
+        bucket = await promisify(standardMetadataValidateBucket)(metadataValParams, request.actionImplicitDenies, log);
+        if (!bucket.getUid()) {
+            bucket.setUid(uuid());
         }
-        pushMetric('putBucketLifecycle', log, {
-            authInfo,
-            bucket: bucketName,
-        });
-        monitoring.promMetrics('PUT', bucketName, '200', 'putBucketLifecycle');
-        return callback(null, corsHeaders);
+        bucket.setLifecycleConfiguration(lcConfig);
+        await promisify(metadata.updateBucket).call(metadata, bucket.getName(), bucket, log);
+    } catch (err) {
+        log.trace('error processing request', { error: err, method: 'bucketPutLifecycle' });
+        monitoring.promMetrics('PUT', bucketName, err.code, 'putBucketLifecycle');
+        err.additionalResHeaders =
+            err.additionalResHeaders || collectCorsHeaders(request.headers.origin, request.method, bucket);
+        throw err;
+    }
+
+    pushMetric('putBucketLifecycle', log, {
+        authInfo,
+        bucket: bucketName,
     });
+    monitoring.promMetrics('PUT', bucketName, '200', 'putBucketLifecycle');
+    return collectCorsHeaders(request.headers.origin, request.method, bucket);
 }
 
 module.exports = bucketPutLifecycle;

package.json

@@ -37,7 +37,7 @@
         "@opentelemetry/instrumentation-ioredis": "~0.64.0",
         "@opentelemetry/instrumentation-mongodb": "~0.69.0",
         "@smithy/node-http-handler": "^3.0.0",
-        "arsenal": "git+https://github.com/scality/arsenal#8.5.2",
+        "arsenal": "git+https://github.com/scality/arsenal#c35c272bbbb44fe72ff4dfa40517d5fbd5e48c79",
         "async": "2.6.4",
         "bucketclient": "scality/bucketclient#8.2.7",
         "bufferutil": "^4.0.8",