Skip to content

Commit f07a03a

Browse files
watsonwatson
authored
refactor: move remote_config code to the root of dd-trace (#4475)
1 parent b046c06 commit f07a03a

14 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎integration-tests/debugger/basic.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const os = require('os')
55
const { assert } = require('chai')
66
const { pollInterval, setup } = require('./utils')
77
const { assertObjectContains, assertUUID } = require('../helpers')
8-
const { ACKNOWLEDGED, ERROR } = require('../../packages/dd-trace/src/appsec/remote_config/apply_states')
8+
const { ACKNOWLEDGED, ERROR } = require('../../packages/dd-trace/src/remote_config/apply_states')
99
const { version } = require('../../package.json')
1010

1111
describe('Dynamic Instrumentation', function () {

‎packages/dd-trace/src/appsec/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const log = require('../log')
44
const RuleManager = require('./rule_manager')
5-
const remoteConfig = require('./remote_config')
5+
const remoteConfig = require('../remote_config')
66
const {
77
bodyParser,
88
cookieParser,

‎packages/dd-trace/src/appsec/rule_manager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const fs = require('fs')
44
const waf = require('./waf')
5-
const { ACKNOWLEDGED, ERROR } = require('./remote_config/apply_states')
5+
const { ACKNOWLEDGED, ERROR } = require('../remote_config/apply_states')
66

77
const blocking = require('./blocking')
88

‎packages/dd-trace/src/proxy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const DynamicInstrumentation = require('./debugger')
99
const telemetry = require('./telemetry')
1010
const nomenclature = require('./service-naming')
1111
const PluginManager = require('./plugin_manager')
12-
const remoteConfig = require('./appsec/remote_config')
12+
const remoteConfig = require('./remote_config')
1313
const AppsecSdk = require('./appsec/sdk')
1414
const dogstatsd = require('./dogstatsd')
1515
const NoopDogStatsDClient = require('./noop/dogstatsd')

packages/dd-trace/src/appsec/remote_config/apply_states.js renamed to packages/dd-trace/src/remote_config/apply_states.js

File renamed without changes.

packages/dd-trace/src/appsec/remote_config/capabilities.js renamed to packages/dd-trace/src/remote_config/capabilities.js

File renamed without changes.

packages/dd-trace/src/appsec/remote_config/index.js renamed to packages/dd-trace/src/remote_config/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

3-
const Activation = require('../activation')
3+
const Activation = require('../appsec/activation')
44

55
const RemoteConfigManager = require('./manager')
66
const RemoteConfigCapabilities = require('./capabilities')
7-
const { setCollectionMode } = require('../user_tracking')
8-
const log = require('../../log')
7+
const { setCollectionMode } = require('../appsec/user_tracking')
8+
const log = require('../log')
99

1010
let rc
1111

@@ -80,7 +80,7 @@ function enableOrDisableAppsec (action, rcConfig, config, appsec) {
8080
function enableWafUpdate (appsecConfig) {
8181
if (rc && appsecConfig && !appsecConfig.rules) {
8282
// dirty require to make startup faster for serverless
83-
const RuleManager = require('../rule_manager')
83+
const RuleManager = require('../appsec/rule_manager')
8484

8585
rc.updateCapabilities(RemoteConfigCapabilities.ASM_IP_BLOCKING, true)
8686
rc.updateCapabilities(RemoteConfigCapabilities.ASM_USER_BLOCKING, true)
@@ -115,7 +115,7 @@ function enableWafUpdate (appsecConfig) {
115115

116116
function disableWafUpdate () {
117117
if (rc) {
118-
const RuleManager = require('../rule_manager')
118+
const RuleManager = require('../appsec/rule_manager')
119119

120120
rc.updateCapabilities(RemoteConfigCapabilities.ASM_IP_BLOCKING, false)
121121
rc.updateCapabilities(RemoteConfigCapabilities.ASM_USER_BLOCKING, false)

packages/dd-trace/src/appsec/remote_config/manager.js renamed to packages/dd-trace/src/remote_config/manager.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
const { URL, format } = require('url')
44
const uuid = require('crypto-randomuuid')
55
const { EventEmitter } = require('events')
6-
const tracerVersion = require('../../../../../package.json').version
7-
const request = require('../../exporters/common/request')
8-
const log = require('../../log')
9-
const { getExtraServices } = require('../../service-naming/extra-services')
6+
const tracerVersion = require('../../../../package.json').version
7+
const request = require('../exporters/common/request')
8+
const log = require('../log')
9+
const { getExtraServices } = require('../service-naming/extra-services')
1010
const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('./apply_states')
1111
const Scheduler = require('./scheduler')
12-
const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
12+
const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
1313

1414
const clientId = uuid()
1515

packages/dd-trace/src/appsec/remote_config/scheduler.js renamed to packages/dd-trace/src/remote_config/scheduler.js

File renamed without changes.

‎packages/dd-trace/test/appsec/rule_manager.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path')
44
const fs = require('fs')
55
const { loadRules, clearAllRules, updateWafFromRC } = require('../../src/appsec/rule_manager')
66
const Config = require('../../src/config')
7-
const { ACKNOWLEDGED } = require('../../src/appsec/remote_config/apply_states')
7+
const { ACKNOWLEDGED } = require('../../src/remote_config/apply_states')
88

99
const rules = require('../../src/appsec/recommended.json')
1010
const waf = require('../../src/appsec/waf')

0 commit comments

Comments
 (0)