♻️ migrate to async/await style

Issue: CLDSRV-878

Author: DarkIsDude

lib/routes/veeam/get.js

@@ -11,7 +11,7 @@ const { responseXMLBody } = require('arsenal/build/lib/s3routes/routesUtils');
  * @param {object} log - logger object
  * @returns {undefined} -
  */
-function getVeeamFile(request, response, bucketMd, log) {
+async function getVeeamFile(request, response, bucketMd, log) {
     if (!bucketMd) {
         return responseXMLBody(errors.NoSuchBucket, null, response, log);
     }
@@ -21,13 +21,12 @@ function getVeeamFile(request, response, bucketMd, log) {
             buildHeadXML('<Tagging><TagSet></TagSet></Tagging>'));
     }
 
-    return buildVeeamFileData(request, bucketMd, log, 'getVeeamFile', (err, result) => {
-        if (err) {
-            return responseXMLBody(err, null, response, log);
-        }
-
+    try {
+        const result = await buildVeeamFileData(request, bucketMd, log, 'getVeeamFile');
         return respondWithData(request, response, log, result.bucketData, result.xmlContent, result.modified);
-    });
+    } catch (err) {
+        return responseXMLBody(err, null, response, log);
+    }
 }
 
 module.exports = getVeeamFile;

lib/routes/veeam/head.js

@@ -11,24 +11,23 @@ const { responseXMLBody, responseContentHeaders } = require('arsenal/build/lib/s
  * @param {object} log - logger object
  * @returns {undefined} -
  */
-function headVeeamFile(request, response, bucketMd, log) {
+async function headVeeamFile(request, response, bucketMd, log) {
     if (!bucketMd) {
         return responseXMLBody(errors.NoSuchBucket, null, response, log);
     }
 
-    return buildVeeamFileData(request, bucketMd, log, 'headVeeamFile', (err, result) => {
-        if (err) {
-            return responseXMLBody(err, null, response, log);
-        }
-
+    try {
+        const result = await buildVeeamFileData(request, bucketMd, log, 'headVeeamFile');
         return responseContentHeaders(
             null,
             {},
             getResponseHeader(request, result.bucketData, result.dataBuffer, result.modified, log),
             response,
             log,
         );
-    });
+    } catch (err) {
+        return responseXMLBody(err, null, response, log);
+    }
 }
 
 module.exports = headVeeamFile;

lib/routes/veeam/list.js

@@ -83,7 +83,7 @@ function buildXMLResponse(request, arrayOfFiles, versioned = false) {
  * @param {object} log - logger object
  * @returns {undefined} -
  */
-function listVeeamFiles(request, response, bucketMd, log) {
+async function listVeeamFiles(request, response, bucketMd, log) {
     if (!bucketMd) {
         return responseXMLBody(errors.NoSuchBucket, null, response, log);
     }
@@ -94,60 +94,64 @@ function listVeeamFiles(request, response, bucketMd, log) {
             .customizeDescription('The Veeam folder does not support this action.'), null, response, log);
     }
 
-    return metadata.getBucket(request.bucketName, log, (err, data) => {
-        if (err) {
-            return responseXMLBody(errors.InternalError, null, response, log);
-        }
-
-        const buildAndRespond = bucketMetrics => {
-            const filesToBuild = [];
-            const fieldsToGenerate = [];
-            if (data._capabilities?.VeeamSOSApi?.SystemInfo) {
-                fieldsToGenerate.push({
-                    ...data._capabilities?.VeeamSOSApi?.SystemInfo,
-                    name: `${validPath}system.xml`,
-                });
-            }
-            if (data._capabilities?.VeeamSOSApi?.CapacityInfo) {
-                fieldsToGenerate.push({
-                    ...data._capabilities?.VeeamSOSApi?.CapacityInfo,
-                    name: `${validPath}capacity.xml`,
-                });
-            }
-            fieldsToGenerate.forEach(file => {
-                const isCapacity = file.name.endsWith('capacity.xml');
-                const lastModified = isCapacity
-                    ? bucketMetrics.date
-                    : file.LastModified;
-                // eslint-disable-next-line no-param-reassign
-                delete file.LastModified;
-                const builder = new xml2js.Builder({
-                    headless: true,
-                });
-                const dataBuffer = Buffer.from(buildHeadXML(builder.buildObject(file)));
-                filesToBuild.push({
-                    ...getResponseHeader(request, data,
-                        dataBuffer, lastModified, log),
-                    name: file.name,
-                });
-            });
-
-            // When `versions` is present, listing should return a versioned list
-            return respondWithData(request, response, log, data,
-                buildXMLResponse(request, filesToBuild, 'versions' in request.query));
-        };
+    let data;
+    try {
+        data = await new Promise((resolve, reject) =>
+            metadata.getBucket(request.bucketName, log, (err, result) => {
+                if (err) { return reject(err); }
+                return resolve(result);
+            })
+        );
+    } catch {
+        return responseXMLBody(errors.InternalError, null, response, log);
+    }
 
-        if (data._capabilities?.VeeamSOSApi?.CapacityInfo) {
-            return fetchCapacityMetrics(bucketMd, request, log, 'listVeeamFiles', (err, bucketMetrics) => {
-                if (err) {
-                    return responseXMLBody(errors.InternalError, null, response, log);
-                }
-                return buildAndRespond(bucketMetrics);
-            });
+    let bucketMetrics;
+    if (data._capabilities?.VeeamSOSApi?.CapacityInfo) {
+        try {
+            bucketMetrics = await fetchCapacityMetrics(bucketMd, request, log, 'listVeeamFiles');
+        } catch {
+            return responseXMLBody(errors.InternalError, null, response, log);
         }
+    } else {
+        bucketMetrics = { date: new Date() };
+    }
 
-        return buildAndRespond({ date: new Date() });
+    const filesToBuild = [];
+    const fieldsToGenerate = [];
+    if (data._capabilities?.VeeamSOSApi?.SystemInfo) {
+        fieldsToGenerate.push({
+            ...data._capabilities?.VeeamSOSApi?.SystemInfo,
+            name: `${validPath}system.xml`,
+        });
+    }
+    if (data._capabilities?.VeeamSOSApi?.CapacityInfo) {
+        fieldsToGenerate.push({
+            ...data._capabilities?.VeeamSOSApi?.CapacityInfo,
+            name: `${validPath}capacity.xml`,
+        });
+    }
+    fieldsToGenerate.forEach(file => {
+        const isCapacity = file.name.endsWith('capacity.xml');
+        const lastModified = isCapacity
+            ? bucketMetrics.date
+            : file.LastModified;
+        // eslint-disable-next-line no-param-reassign
+        delete file.LastModified;
+        const builder = new xml2js.Builder({
+            headless: true,
+        });
+        const dataBuffer = Buffer.from(buildHeadXML(builder.buildObject(file)));
+        filesToBuild.push({
+            ...getResponseHeader(request, data,
+                dataBuffer, lastModified, log),
+            name: file.name,
+        });
     });
+
+    // When `versions` is present, listing should return a versioned list
+    return respondWithData(request, response, log, data,
+        buildXMLResponse(request, filesToBuild, 'versions' in request.query));
 }
 
 module.exports = listVeeamFiles;

lib/routes/veeam/put.js

@@ -1,4 +1,5 @@
 const async = require('async');
+const { callbackify } = require('util');
 const { parseString } = require('xml2js');
 const { receiveData, isSystemXML, getFileToBuild } = require('./utils');
 const { s3routes, errors } = require('arsenal');
@@ -28,7 +29,7 @@ function putVeeamFile(request, response, bucketMd, log) {
         next => {
             // Extract the data from the request, keep it in memory
             writeContinue(request, response);
-            return receiveData(request, log, next);
+            return callbackify(receiveData)(request, log, next);
         },
         (value, next) => parseString(value, { explicitArray: false }, (err, parsed) => {
             // Convert the received XML to a JS object