♻️ use callbackify instead of manual callback

Issue: CLDSRV-823

Author: DarkIsDude

lib/api/bucketGet.js

@@ -1,3 +1,4 @@
+const { callbackify } = require('util');
 const querystring = require('querystring');
 const { errors, errorInstances, versioning, s3middleware } = require('arsenal');
 const constants = require('../../constants');
@@ -277,16 +278,14 @@ const getObjectListing = (bucketName, listParams, log) => new Promise((resolve,
  *  with either error code or xml response body
  * @return {undefined}
  */
-async function bucketGet(authInfo, request, log, callback) {
+async function bucketGet(authInfo, request, log) {
     try {
         const params = request.query;
         const bucketName = request.bucketName;
         const v2 = params['list-type'];
 
         if (v2 !== undefined && Number.parseInt(v2, 10) !== 2) {
-            return callback(errorInstances.InvalidArgument.customizeDescription(
-                'Invalid List Type specified in Request'
-            ));
+            throw errorInstances.InvalidArgument.customizeDescription('Invalid List Type specified in Request');
         }
 
         if (v2) {
@@ -306,14 +305,13 @@ async function bucketGet(authInfo, request, log, callback) {
         const encoding = params['encoding-type'];
         if (encoding !== undefined && encoding !== 'url') {
             monitoring.promMetrics('GET', bucketName, 400, 'listBucket');
-            return callback(errorInstances.InvalidArgument.customizeDescription(
-                'Invalid Encoding Method specified in Request'
-            ));
+            throw errorInstances.InvalidArgument.customizeDescription('Invalid Encoding Type specified in Request');
         }
+
         const requestMaxKeys = params['max-keys'] ? Number.parseInt(params['max-keys'], 10) : 1000;
         if (Number.isNaN(requestMaxKeys) || requestMaxKeys < 0) {
             monitoring.promMetrics('GET', bucketName, 400, 'listBucket');
-            return callback(errors.InvalidArgument);
+            throw errors.InvalidArgument;
         }
         const actualMaxKeys = Math.min(constants.listingHardLimit, requestMaxKeys);
 
@@ -348,7 +346,8 @@ async function bucketGet(authInfo, request, log, callback) {
         if (error) {
             log.debug('error processing request', { error });
             monitoring.promMetrics('GET', bucketName, error.code, 'listBucket');
-            return callback(error, null, corsHeaders);
+            error.additionalResHeaders = corsHeaders;
+            throw error;
         }
         if (params.versions !== undefined) {
             listParams.listingType = 'DelimiterVersions';
@@ -366,7 +365,7 @@ async function bucketGet(authInfo, request, log, callback) {
                 IsTruncated: false,
             };
             const res = handleResult(listParams, requestMaxKeys, encoding, authInfo, bucketName, emptyList, log);
-            return callback(null, res, corsHeaders);
+            return [res, corsHeaders];
         }
 
         let list;
@@ -375,20 +374,22 @@ async function bucketGet(authInfo, request, log, callback) {
         } catch (err) {
             log.debug('error processing request', { error: err });
             monitoring.promMetrics('GET', bucketName, err.code, 'listBucket');
-            return callback(err, null, corsHeaders);
+
+            err.additionalResHeaders = corsHeaders;
+            throw err;
         }
 
         const res = handleResult(listParams, requestMaxKeys, encoding, authInfo, bucketName, list, log);
-        return callback(null, res, corsHeaders);
+        return [res, corsHeaders];
     } catch (err) {
         log.error('unhandled error in bucketGet', { error: err });
-        return callback(errors.InternalError);
+        throw errors.InternalError;
     }
 }
 
 module.exports = {
     processVersions,
     processMasterVersions,
-    bucketGet,
+    bucketGet: callbackify(bucketGet),
 };
 

lib/api/objectGetLegalHold.js

@@ -1,3 +1,4 @@
+const { callbackify } = require('util');
 const { errors, errorInstances, s3middleware } = require('arsenal');
 
 const { decodeVersionId, getVersionIdResHeader }
@@ -16,15 +17,15 @@ const { convertToXml } = s3middleware.objectLegalHold;
  * @param {object} log - Werelogs logger
  * @return {Promise<object>} - object containing xml and additionalResHeaders
  */
-async function objectGetLegalHold(authInfo, request, log, callback) {
+async function objectGetLegalHold(authInfo, request, log) {
     log.debug('processing request', { method: 'objectGetLegalHold' });
 
     const { bucketName, objectKey, query } = request;
 
     const decodedVidResult = decodeVersionId(query);
     if (decodedVidResult instanceof Error) {
         log.trace('invalid versionId query', { versionId: query.versionId, error: decodedVidResult });
-        return process.nextTick(() => callback(decodedVidResult));
+        throw decodedVidResult;
     }
     const versionId = decodedVidResult;
 
@@ -95,12 +96,12 @@ async function objectGetLegalHold(authInfo, request, log, callback) {
         const verCfg = bucket.getVersioningConfiguration();
         additionalResHeaders['x-amz-version-id'] = getVersionIdResHeader(verCfg, objectMD);
 
-        return callback(null, xml, additionalResHeaders);
+        return [xml, additionalResHeaders];
     } catch (err) {
         const additionalResHeaders = collectCorsHeaders(request.headers.origin, request.method, bucket);
         err.additionalResHeaders = additionalResHeaders;
-        return callback(err);
+        throw err;
     }
 }
 
-module.exports = objectGetLegalHold;
+module.exports = callbackify(objectGetLegalHold);