Skip to content

Commit 326233e

Browse files
committed
Address review comments
1 parent dad3222 commit 326233e

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

packages/dd-trace/src/remote_config/manager.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,10 @@ function createUpdateTransaction ({ toUnapply, toApply, toModify }, handledPaths
482482
toApply,
483483
toModify,
484484
ack (path) {
485-
if (typeof path !== 'string') return
486485
outcomes.set(path, { state: ACKNOWLEDGED, error: '' })
487486
handledPaths.add(path)
488487
},
489488
error (path, err) {
490-
if (typeof path !== 'string') return
491489
outcomes.set(path, { state: ERROR, error: err ? err.toString() : 'Error' })
492490
handledPaths.add(path)
493491
}

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const proxyquire = require('proxyquire')
99
const getConfig = require('../../src/config')
1010
const RuleManager = require('../../src/appsec/rule_manager')
1111
const RemoteConfigCapabilities = require('../../src/remote_config/capabilities')
12+
const { assertObjectContains } = require('../../../../integration-tests/helpers')
1213

1314
require('../setup/core')
1415

@@ -165,27 +166,33 @@ describe('AppSec Remote Config', () => {
165166
listener('apply', rcConfigAsmEnabling)
166167

167168
sinon.assert.calledOnce(telemetry.updateConfig)
168-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].name, 'appsec.enabled')
169-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].origin, 'remote_config')
170-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].value, rcConfigAsmEnabling.asm.enabled)
169+
assertObjectContains(telemetry.updateConfig.firstCall.args, [[{
170+
name: 'appsec.enabled',
171+
origin: 'remote_config',
172+
value: rcConfigAsmEnabling.asm.enabled
173+
}]])
171174
})
172175

173176
it('should update appsec.enabled when modifying asm enabling by RC', () => {
174177
listener('modify', rcConfigAsmDisabling)
175178

176179
sinon.assert.calledOnce(telemetry.updateConfig)
177-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].name, 'appsec.enabled')
178-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].origin, 'remote_config')
179-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].value, rcConfigAsmDisabling.asm.enabled)
180+
assertObjectContains(telemetry.updateConfig.firstCall.args, [[{
181+
name: 'appsec.enabled',
182+
origin: 'remote_config',
183+
value: rcConfigAsmDisabling.asm.enabled
184+
}]])
180185
})
181186

182187
it('should update when unapplying asm enabling by RC', () => {
183188
listener('unapply', { asm: { enabled: true } })
184189

185190
sinon.assert.calledOnce(telemetry.updateConfig)
186-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].name, 'appsec.enabled')
187-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].origin, 'default')
188-
assert.strictEqual(telemetry.updateConfig.firstCall.args[0][0].value, config.appsec.enabled)
191+
assertObjectContains(telemetry.updateConfig.firstCall.args, [[{
192+
name: 'appsec.enabled',
193+
origin: 'default',
194+
value: config.appsec.enabled
195+
}]])
189196
})
190197
})
191198

0 commit comments

Comments
 (0)