🐛 use SUR date instead of the infostore one to have an update LastModified date

Issue: CLDSRV-878

Author: DarkIsDude

lib/routes/veeam/get.js

@@ -34,7 +34,7 @@ function getVeeamFile(request, response, bucketMd, log) {
 
             // Extract the last modified date, but do not include it when computing
             // the file's ETag (md5)
-            const modified = fileToBuild.value.LastModified;
+            const modified = bucketMetrics?.date || fileToBuild.value.LastModified;
             delete fileToBuild.value.LastModified;
 
             // The SOSAPI metrics are dynamically computed using the SUR backend.
@@ -53,15 +53,14 @@ function getVeeamFile(request, response, bucketMd, log) {
             return respondWithData(request, response, log, data,
                 buildHeadXML(builder.buildObject(fileToBuild.value)), modified);
         };
+
         if (!isSystemXML(request.objectKey)) {
             const bucketKey = `${bucketMd._name}_${new Date(bucketMd._creationDate).getTime()}`;
             return UtilizationService.getUtilizationMetrics('bucket', bucketKey, null, {}, (err, bucketMetrics) => {
                 if (err) {
-                    // Handle errors from UtilizationService/scubaclient
-                    // axios errors have status in err.response.status
                     const statusCode = err.response?.status || err.statusCode || err.code;
+
                     // Only handle 404 gracefully (no metrics available yet, e.g. post-install)
-                    // For 404, continue with static capacity data (Used=0 from bucket metadata)
                     if (statusCode === 404) {
                         log.warn('UtilizationService returned 404 when fetching capacity metrics', {
                             method: 'getVeeamFile',
@@ -70,14 +69,17 @@ function getVeeamFile(request, response, bucketMd, log) {
                         });
                         return finalizeRequest();
                     }
+
                     log.error('error fetching capacity metrics from UtilizationService', {
                         method: 'getVeeamFile',
                         bucket: request.bucketName,
                         error: err.message || err.code,
                         statusCode,
                     });
+
                     return responseXMLBody(errors.InternalError, null, response, log);
                 }
+
                 return finalizeRequest(bucketMetrics);
             });
         }

lib/routes/veeam/head.js

@@ -17,26 +17,33 @@ function headVeeamFile(request, response, bucketMd, log) {
     if (!bucketMd) {
         return responseXMLBody(errors.NoSuchBucket, null, response, log);
     }
+
     return metadata.getBucket(request.bucketName, log, (err, data) => {
         if (err) {
             return responseXMLBody(errors.InternalError, null, response, log);
         }
+
         const fileToBuild = getFileToBuild(request, data._capabilities?.VeeamSOSApi);
         if (fileToBuild.error) {
             return responseXMLBody(fileToBuild.error, null, response, log);
         }
-        let modified = new Date().toISOString();
-        // Extract the last modified date, but do not include it when computing
-        // the file's ETag (md5)
-        modified = fileToBuild.value.LastModified;
+
+        // Extract the last modified date, but do not include it when computing the file's ETag (md5)
+        const modified = fileToBuild.value.LastModified;
         delete fileToBuild.value.LastModified;
         // Recompute file content to generate appropriate content-md5 header
         const builder = new xml2js.Builder({
             headless: true,
         });
         const dataBuffer = Buffer.from(buildHeadXML(builder.buildObject(fileToBuild)));
-        return responseContentHeaders(null, {}, getResponseHeader(request, data,
-            dataBuffer, modified, log), response, log);
+
+        return responseContentHeaders(
+            null, 
+            {},
+            getResponseHeader(request, data, dataBuffer, modified, log), 
+            response, 
+            log,
+        );
     });
 }
 

lib/routes/veeam/utils.js

@@ -172,13 +172,15 @@ function isSystemXML(objectKey) {
  */
 function getFileToBuild(request, data, inlineLastModified = false) {
     const _isSystemXML = isSystemXML(request.objectKey);
-    const fileToBuild = _isSystemXML ? data?.SystemInfo
-        : data?.CapacityInfo;
+    const fileToBuild = _isSystemXML ? data?.SystemInfo : data?.CapacityInfo;
+
     if (!fileToBuild) {
         return { error: errors.NoSuchKey };
     }
+
     const modified = fileToBuild.LastModified || (new Date()).toISOString();
     const fieldName = _isSystemXML ? 'SystemInfo' : 'CapacityInfo';
+
     if (inlineLastModified) {
         fileToBuild.LastModified = modified;
         return {

tests/unit/api/apiUtils/objectLockHelpers.js

@@ -172,7 +172,7 @@ describe('objectLockHelpers: calculateRetainUntilDate', () => {
         };
         const date = moment();
         const expectedRetainUntilDate
-            = date.add(mockConfigWithYears.years * 365, 'days');
+            = date.add(mockConfigWithYears.years * 365 * 86400000, 'ms');
         const retainUntilDate = calculateRetainUntilDate(mockConfigWithYears);
         assert.strictEqual(retainUntilDate.slice(0, 16),
             expectedRetainUntilDate.toISOString().slice(0, 16));

tests/unit/routes/veeam-routes.js

@@ -164,8 +164,10 @@ describe('Veeam routes - comprehensive unit tests', () => {
     });
 
     it('should successfully use metrics when UtilizationService returns data', done => {
+        const metricsDate = '2026-03-26T19:00:08.996Z';
         const bucketMetrics = {
             bytesTotal: 123456789,
+            date: metricsDate,
         };
         utilizationStub.callsArgWith(4, null, bucketMetrics);
 
@@ -179,6 +181,16 @@ describe('Veeam routes - comprehensive unit tests', () => {
             assert(response.writeHead.calledWith(200), 'should return 200 with metrics');
             assert(utilizationStub.calledOnce, 'should call UtilizationService once');
             assert(response.end.called, 'response should be ended');
+
+            const lastModifiedCall = response.setHeader.getCalls()
+                .find(call => call.args[0] === 'Last-Modified');
+
+            assert(lastModifiedCall, 'Last-Modified header should be set');
+            assert.strictEqual(
+                lastModifiedCall.args[1],
+                new Date(metricsDate).toUTCString(),
+                'Last-Modified should use the date from bucketMetrics',
+            );
             done();
         });
     });