fixup! manual fixes (stricter key check)

Author: BridgeAR

integration-tests/ci-visibility/automatic-log-submission.spec.js

@@ -99,7 +99,7 @@ describe('test optimization automatic log submission', () => {
             logMessages.forEach(({ dd, level }) => {
               assert.equal(level, 'info')
               assert.equal(dd.service, 'my-service')
-              assert.ok(['trace_id', 'span_id', 'service'].every(key => Object.hasOwn(dd, key)))
+              assert.deepStrictEqual(['service', 'span_id', 'trace_id'], Object.keys(dd).sort())
             })
 
             assertObjectContains(logMessages.map(({ message }) => message), [

integration-tests/debugger/basic.spec.js

@@ -245,7 +245,7 @@ describe('Dynamic Instrumentation', function () {
 
               if (diagnostics.status === 'ERROR') {
                 assert.ok(Object.hasOwn(diagnostics, 'exception'))
-                assert.ok(['message', 'stacktrace'].every(key => Object.hasOwn(diagnostics.exception, key)))
+                assert.deepStrictEqual(['message', 'stacktrace'], Object.keys(diagnostics.exception).sort())
                 assert.strictEqual(typeof diagnostics.exception.message, 'string')
                 assert.strictEqual(typeof diagnostics.exception.stacktrace, 'string')
               }
@@ -831,7 +831,7 @@ function setupAssertionListeners (t, done, probe) {
 
     payload = payload[0]
     assert.ok(typeof payload.dd === 'object' && payload.dd !== null)
-    assert.ok(['trace_id', 'span_id'].every(key => Object.hasOwn(payload.dd, key)))
+    assert.deepStrictEqual(['span_id', 'trace_id'], Object.keys(payload.dd).sort())
     assert.strictEqual(typeof payload.dd.trace_id, 'string')
     assert.strictEqual(typeof payload.dd.span_id, 'string')
     assert.ok(payload.dd.trace_id.length > 0)
@@ -902,7 +902,7 @@ function assertBasicInputPayload (t, payload, probe = t.rcConfig.config) {
   assert.ok(payload.debugger.snapshot.stack.length > 0)
   for (const frame of payload.debugger.snapshot.stack) {
     assert.ok(typeof frame === 'object' && frame !== null)
-    assert.ok(['fileName', 'function', 'lineNumber', 'columnNumber'].every(key => Object.hasOwn(frame, key)))
+    assert.deepStrictEqual(['columnNumber', 'fileName', 'function', 'lineNumber'], Object.keys(frame).sort())
     assert.strictEqual(typeof frame.fileName, 'string')
     assert.strictEqual(typeof frame.function, 'string')
     assert.ok(frame.lineNumber > 0)

integration-tests/debugger/ddtags.spec.js

@@ -28,14 +28,14 @@ describe('Dynamic Instrumentation', function () {
 
           const ddtags = extractDDTagsFromQuery(query)
 
-          assert.ok([
-            'env',
-            'version',
+          assert.deepStrictEqual([
             'debugger_version',
-            'host_name',
+            'env',
             'git.commit.sha',
-            'git.repository_url'
-          ].every(key => Object.hasOwn(ddtags, key)))
+            'git.repository_url',
+            'host_name',
+            'version',
+          ], Object.keys(ddtags).sort())
 
           assert.strictEqual(ddtags.env, 'test-env')
           assert.strictEqual(ddtags.version, 'test-version')
@@ -62,7 +62,7 @@ describe('Dynamic Instrumentation', function () {
 
           const ddtags = extractDDTagsFromQuery(query)
 
-          assert.ok(['debugger_version', 'host_name'].every(key => Object.hasOwn(ddtags, key)))
+          assert.deepStrictEqual(['debugger_version', 'host_name'], Object.keys(ddtags).sort())
 
           done()
         })

packages/dd-trace/test/appsec/response_blocking.spec.js

@@ -128,14 +128,14 @@ describe('HTTP Response Blocking', () => {
     const res = await axios.get('/')
 
     assert.equal(res.status, 200)
-    assert.ok([
+    assert.deepStrictEqual([
       'a',
       'b',
       'bad3',
-      'date',
       'connection',
-      'transfer-encoding'
-    ].every(key => Object.hasOwn(cloneHeaders(res.headers), key)))
+      'date',
+      'transfer-encoding',
+    ], Object.keys(cloneHeaders(res.headers)).sort())
     assert.deepEqual(res.data, 'end')
   })
 
@@ -221,16 +221,16 @@ describe('HTTP Response Blocking', () => {
     const res = await axios.get('/')
 
     assert.equal(res.status, 201)
-    assert.ok([
+    assert.deepStrictEqual([
       'a',
       'b',
       'c',
+      'connection',
       'd',
-      'e',
       'date',
-      'connection',
-      'transfer-encoding'
-    ].every(key => Object.hasOwn(cloneHeaders(res.headers), key)))
+      'e',
+      'transfer-encoding',
+    ], Object.keys(cloneHeaders(res.headers)).sort())
     assert.deepEqual(res.data, 'writefileend')
   })
 
@@ -264,12 +264,12 @@ function cloneHeaders (headers) {
 
 function assertBlocked (res) {
   assert.equal(res.status, 403)
-  assert.ok([
-    'content-type',
+  assert.deepStrictEqual([
+    'connection',
     'content-length',
+    'content-type',
     'date',
-    'connection'
-  ].every(key => Object.hasOwn(cloneHeaders(res.headers), key)))
+  ], Object.keys(cloneHeaders(res.headers)).sort())
   assert.deepEqual(res.data, blockingResponse)
 
   sinon.assert.callCount(WafContext.prototype.run, 2)