♻️ remove wrapper and use promisify

Author: DarkIsDude

lib/api/bucketGet.js

@@ -1,3 +1,4 @@
+const { promisify } = require('util');
 const querystring = require('querystring');
 const { errors, errorInstances, versioning, s3middleware } = require('arsenal');
 const constants = require('../../constants');
@@ -252,22 +253,6 @@ function handleResult(listParams, requestMaxKeys, encoding, authInfo, bucketName
     return res;
 }
 
-const validateBucket = (params, denials, log) => new Promise(resolve => {
-    standardMetadataValidateBucket(params, denials, log, (error, bucket) => {
-        resolve({ error, bucket });
-    });
-});
-
-const getObjectListing = (bucketName, listParams, log) => new Promise((resolve, reject) => {
-    services.getObjectListing(bucketName, listParams, log, (err, list) => {
-        if (err) {
-            return reject(err);
-        }
-
-        return resolve(list);
-    });
-});
-
 /**
  * bucketGet - Return list of objects in bucket, supports v1 & v2
  * @param  {AuthInfo} authInfo - Instance of AuthInfo class with
@@ -276,7 +261,7 @@ const getObjectListing = (bucketName, listParams, log) => new Promise((resolve,
  * @param  {function} log - Werelogs request logger
  * @param  {function} callback - callback to respond to http request
  *  with either error code or xml response body
- * @return {undefined}
+ * @return {Promise<object>} - object containing xml and additionalResHeaders
  */
 async function bucketGet(authInfo, request, log) {
     const params = request.query;
@@ -339,7 +324,16 @@ async function bucketGet(authInfo, request, log) {
         listParams.marker = params.marker;
     }
 
-    const { error, bucket } = await validateBucket(metadataValParams, request.actionImplicitDenies, log);
+    let error;
+    let bucket;
+
+    try {
+        const standardMetadataValidateBucketPromised = promisify(standardMetadataValidateBucket);
+        bucket = await standardMetadataValidateBucketPromised(metadataValParams, request.actionImplicitDenies, log);
+    } catch (err) {
+        error = err;
+    }
+
     const corsHeaders = collectCorsHeaders(request.headers.origin, request.method, bucket);
 
     if (error) {
@@ -369,7 +363,7 @@ async function bucketGet(authInfo, request, log) {
 
     let list;
     try {
-        list = await getObjectListing(bucketName, listParams, log);
+        list = await promisify(services.getObjectListing)(bucketName, listParams, log);
     } catch (err) {
         log.debug('error processing request', { error: err });
         monitoring.promMetrics('GET', bucketName, err.code, 'listBucket');
@@ -391,7 +385,7 @@ module.exports = {
 
         bucketGet(...argsWithoutCallback)
             .then(result => callback(null, ...result))
-            .catch(callback);
+            .catch(err => callback(err, null, err.additionalResHeaders));
     },
 };
 

lib/api/objectGetLegalHold.js

@@ -1,3 +1,4 @@
+const { promisify } = require('util');
 const { errors, errorInstances, s3middleware } = require('arsenal');
 
 const { decodeVersionId, getVersionIdResHeader }
@@ -38,18 +39,20 @@ async function objectGetLegalHold(authInfo, request, log) {
         request,
     };
 
-    const { bucket, objectMD } = await new Promise((resolve, reject) => {
-        standardMetadataValidateBucketAndObj(
-            metadataValParams, request.actionImplicitDenies, log,
-            (err, bucket, objectMD) => {
-                if (err) {
-                    log.trace('request authorization failed', { method: 'objectGetLegalHold', error: err });
-                    return reject(err);
-                }
-                return resolve({ bucket, objectMD });
-            });
-    });
+    let bucket, objectMD;
+
+    try {
+        const standardMetadataValidateBucketAndObjPromised = promisify(standardMetadataValidateBucketAndObj);
 
+        ({ bucket, objectMD } = await standardMetadataValidateBucketAndObjPromised(
+            metadataValParams,
+            request.actionImplicitDenies,
+            log,
+        ));
+    } catch (err) {
+        log.trace('request authorization failed', { method: 'objectGetLegalHold', error: err });
+        throw err;
+    }
 
     if (!objectMD) {
         const err = versionId ? errors.NoSuchVersion : errors.NoSuchKey;
@@ -101,5 +104,5 @@ module.exports = (...args) => {
 
     objectGetLegalHold(...argsWithoutCallback)
         .then(result => callback(null, ...result))
-        .catch(callback);
+        .catch(err => callback(err, null, err.additionalResHeaders));
 };