stuff

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/CollectedUserConfigs.java

@@ -24,6 +24,7 @@ public DirtyStatus addConfig(AppSecUserConfig newUserConfig) {
     Collections.sort(userConfigs, Comparator.comparing(c -> c.configKey));
 
     removedDirty.mergeFrom(newDirty);
+    removedDirty.markAllDirty();
     return removedDirty;
   }
 

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy

@@ -1316,20 +1316,17 @@ class WAFModuleSpecification extends DDSpecification {
     1 * ctx.isThrottled(null)
     0 * _
 
-    when: 'removing c restores the state before c was added (rule disabled)'
+    when: 'removing c removes c'
     service.currentAppSecConfig.with {
       def dirtyStatus = userConfigs.removeConfig('c')
       it.dirtyStatus.mergeFrom(dirtyStatus)
-
-      service.listeners['waf'].onNewSubconfig(it, reconf)
+      service.wafBuilder.removeConfig("c")
       it.dirtyStatus.clearDirty()
     }
     dataListener.onDataAvailable(flow, ctx, ATTACK_BUNDLE, gwCtx)
     ctx.closeWafContext()
 
     then:
-    1 * wafMetricCollector.wafUpdates(_, true)
-    1 * reconf.reloadSubscriptions()
     // no attack
     1 * ctx.getOrCreateWafContext(_, true, false)
     2 * ctx.getWafMetrics()