CLDSRV-839: Check BATCH.DELETE.OBJECT unordered

Author: BourgoisMickael

tests/functional/aws-node-sdk/test/serverAccessLogs/testServerAccessLogFile.js

@@ -1710,37 +1710,41 @@ describe('Server Access Logs - File Output', async () => {
                             objectKey: `${objectKey}2`,
                             httpMethod: 'PUT',
                         },
+                        {
+                            ...commonProperties,
+                            operation: 'REST.POST.MULTI_OBJECT_DELETE',
+                            action: 'DeleteObjects',
+                            httpMethod: 'POST',
+                            objectKey: null,
+                        }
+                    ],
+                    // Objects are deleted concurrently, they might get logged in any order
+                    // for example errors or non-existent objects might get logged first
+                    unorderedExpected: [
                         {
                             ...commonProperties,
                             operation: 'BATCH.DELETE.OBJECT',
-                            action: 'DeleteObject',
+                            action: 'DeleteObjects',
                             objectKey,
                             httpCode: 204,
                             httpMethod: 'POST',
                         },
                         {
                             ...commonProperties,
                             operation: 'BATCH.DELETE.OBJECT',
-                            action: 'DeleteObject',
+                            action: 'DeleteObjects',
                             objectKey: `${objectKey}2`,
                             httpCode: 204,
                             httpMethod: 'POST',
                         },
                         {
                             ...commonProperties,
                             operation: 'BATCH.DELETE.OBJECT',
-                            action: 'DeleteObject',
+                            action: 'DeleteObjects',
                             objectKey: `${objectKey}-non-existent`,
                             httpCode: 204,
                             httpMethod: 'POST',
                         },
-                        {
-                            ...commonProperties,
-                            operation: 'REST.POST.MULTI_OBJECT_DELETE',
-                            action: 'DeleteObjects',
-                            httpMethod: 'POST',
-                            objectKey: null,
-                        }
                     ],
                 };
             })(),
@@ -2679,13 +2683,37 @@ describe('Server Access Logs - File Output', async () => {
         for (const operation of operations) {
             it(`should log correct ${operation.methodName} operation with all required fields`, async () => {
                 await operation.method();
-                const logEntries = await waitForLogs(logFilePath, operation.expected.length,
+                const totalExpected = operation.expected.length + (operation.unorderedExpected?.length || 0);
+                const logEntries = await waitForLogs(logFilePath, totalExpected,
                     TEST_CONFIG.MAX_LOG_WAIT_RETRIES, TEST_CONFIG.LOG_POLL_DELAY_MS);
-                assert.strictEqual(logEntries.length, operation.expected.length,
-                    `Expected ${operation.expected.length} log entries, got ${logEntries.length}`);
+                assert.strictEqual(logEntries.length, totalExpected,
+                    `Expected ${totalExpected} log entries, got ${logEntries.length}`);
+
+                let logIdx = 0;
 
+                // Validate ordered entries
                 for (let i = 0; i < operation.expected.length; i++) {
                     validateLogEntry(logEntries[i], operation.expected[i]);
+                    logIdx++;
+                }
+
+                // Validate unordered entries if present
+                if (operation.unorderedExpected) {
+                    const unorderedLogs = logEntries.slice(logIdx);
+                    const remaining = [...operation.unorderedExpected];
+
+                    for (const logEntry of unorderedLogs) {
+                        const matchIdx = remaining.findIndex(exp => exp.objectKey === logEntry.objectKey);
+
+                        assert.notStrictEqual(matchIdx, -1,
+                            `Unexpected log entry with objectKey: ${logEntry.objectKey}`);
+
+                        validateLogEntry(logEntry, remaining[matchIdx]);
+                        remaining.splice(matchIdx, 1);
+                    }
+
+                    assert.strictEqual(remaining.length, 0,
+                        `Missing expected entries: ${JSON.stringify(remaining)}`);
                 }
             });
         }