fixup! Ensure we pass the right action name for delete object APIs

lib/api/objectDelete.js

@@ -51,13 +51,6 @@ function objectDeleteInternal(authInfo, request, log, isExpiration, cb) {
     const reqVersionId = decodedVidResult;
     const hasGovernanceBypass = hasGovernanceBypassHeader(request.headers);
 
-    // Reassign a specific apiMethod, as monitoring can rely on the
-    // type of cloudserver instance to determine it comes from Backbeat routes.
-    // This is also needed for quota evaluation, where "routeBackbeat" cannot
-    // be used for different operations, such as putObject
-    // eslint-disable-next-line no-param-reassign
-    request.apiMethod = reqVersionId ? 'objectDeleteVersion' : 'deleteObject';
-
     const valParams = {
         authInfo,
         bucketName,

lib/routes/routeBackbeat.js

@@ -1372,6 +1372,19 @@ function routeBackbeat(clientIP, request, response, log) {
     _normalizeBackbeatRequest(request);
     const requestContexts = prepareRequestContexts('objectReplicate', request);
 
+    if (request.resourceType === 'expiration') {
+        // Reassign a specific apiMethod, as it is needed for quota evaluation (at least), where
+        // "routeBackbeat" cannot be used as it is used for all backbeat API operations...
+        // eslint-disable-next-line no-param-reassign
+        request.apiMethod = 'objectDelete';
+
+        // Request account quotas, as it will not be added for the 'objectReplicate' action which
+        // is used by default for all backbeat operations
+        requestContexts.forEach(context => {
+            context._needQuota = true;
+        });
+    }
+
     // Ensure backbeat operations like expiration can properly use quotas
     // eslint-disable-next-line no-param-reassign
     request.finalizerHooks = [];
@@ -1452,7 +1465,7 @@ function routeBackbeat(clientIP, request, response, log) {
     }
 
     return async.waterfall([next => auth.server.doAuth(
-        request, log, (err, userInfo) => {
+        request, log, (err, userInfo, streamingV4Params, infos) => {
             if (err) {
                 log.debug('authentication error', {
                     error: err,
@@ -1461,6 +1474,8 @@ function routeBackbeat(clientIP, request, response, log) {
                     objectKey: request.objectKey,
                 });
             }
+            // eslint-disable-next-line no-param-reassign
+            request.accountQuotas = infos?.accountQuota;
             return next(err, userInfo);
         }, 's3', requestContexts),
         (userInfo, next) => {