Merge remote-tracking branch 'origin/improvement/CLDSRV-843' into w/9.3/improvement/CLDSRV-843

Author: dvasilas

lib/utilities/serverAccessLogger.js

@@ -482,7 +482,7 @@ function buildLogEntry(req, params, options) {
         turnAroundTime: options.turnAroundTime ?? undefined,
         referer: options.referer ?? undefined,
         userAgent: options.userAgent ?? undefined,
-        versionID: options.versionID ?? undefined,
+        versionId: options.versionId ?? undefined,
         signatureVersion: authInfo?.getAuthVersion() ?? undefined,
         cipherSuite: req.socket?.encrypted ? req.socket.getCipher()['standardName'] : undefined,
         authenticationType: authInfo?.getAuthType() ?? undefined,
@@ -581,7 +581,7 @@ function logServerAccess(req, res) {
         objectSize: params.objectSize ?? getObjectSize(req, res),
         totalTime: calculateTotalTime(params.startTime, params.onFinishEndTime),
         turnAroundTime: calculateTurnAroundTime(params.startTurnAroundTime, endTurnAroundTime),
-        versionID: req.query?.versionId,
+        versionId: req.query?.versionId,
         aclRequired: undefined, // TODO: CLDSRV-774
         referer: req.headers?.referer,
         userAgent: req.headers?.['user-agent'],

tests/unit/utils/serverAccessLogger.js

@@ -884,7 +884,7 @@ describe('serverAccessLogger utility functions', () => {
             assert.strictEqual(loggedData.turnAroundTime, '1');
             assert.strictEqual(loggedData.referer, 'https://example.com');
             assert.strictEqual(loggedData.userAgent, 'aws-cli/2.0.0');
-            assert.strictEqual(loggedData.versionID, 'version123');
+            assert.strictEqual(loggedData.versionId, 'version123');
             assert.strictEqual(loggedData.signatureVersion, 'AWS4-HMAC-SHA256');
             assert.strictEqual(loggedData.cipherSuite, 'TLS_AES_128_GCM_SHA256');
             assert.strictEqual(loggedData.authenticationType, 'REST-HEADER');
@@ -996,7 +996,7 @@ describe('serverAccessLogger utility functions', () => {
 
             assert.strictEqual(mockLogger.write.callCount, 1);
             const loggedData = JSON.parse(mockLogger.write.firstCall.args[0].trim());
-            assert.strictEqual('versionID' in loggedData, false);
+            assert.strictEqual('versionId' in loggedData, false);
         });
 
         it('should handle loggingEnabled without TargetBucket/TargetPrefix', () => {
@@ -1099,7 +1099,7 @@ describe('serverAccessLogger utility functions', () => {
             assert.strictEqual('bytesDeleted' in loggedData, false);
             assert.strictEqual('turnAroundTime' in loggedData, false);
             assert.strictEqual('referer' in loggedData, false);
-            assert.strictEqual('versionID' in loggedData, false);
+            assert.strictEqual('versionId' in loggedData, false);
             assert.strictEqual('cipherSuite' in loggedData, false);
             assert.strictEqual('tlsVersion' in loggedData, false);
             assert.strictEqual('aclRequired' in loggedData, false);