Support allowlist extension (#2756)

* Support allowlist extension

* Address lint

Author: ranweiler

src/agent/coverage/src/allowlist.rs

@@ -23,6 +23,17 @@ impl TargetAllowList {
             source_files,
         }
     }
+
+    #[allow(clippy::field_reassign_with_default)]
+    pub fn extend(&self, other: &Self) -> Self {
+        let mut new = Self::default();
+
+        new.functions = self.functions.extend(&other.functions);
+        new.modules = self.modules.extend(&other.modules);
+        new.source_files = self.source_files.extend(&other.source_files);
+
+        new
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -93,6 +104,22 @@ impl AllowList {
         // Allowed if rule-allowed but not excluded by a negative (deny) rule.
         self.allow.is_match(path) && !self.deny.is_match(path)
     }
+
+    /// Build a new `Allowlist` that adds the allow and deny rules of `other` to `self`.
+    pub fn extend(&self, other: &Self) -> Self {
+        let allow = add_regexsets(&self.allow, &other.allow);
+        let deny = add_regexsets(&self.deny, &other.deny);
+
+        AllowList::new(allow, deny)
+    }
+}
+
+fn add_regexsets(lhs: &RegexSet, rhs: &RegexSet) -> RegexSet {
+    let mut patterns = lhs.patterns().to_vec();
+    patterns.extend(rhs.patterns().iter().map(|s| s.to_owned()));
+
+    // Can't panic: patterns were accepted by input `RegexSet` ctors.
+    RegexSet::new(patterns).unwrap()
 }
 
 impl Default for AllowList {

src/agent/coverage/src/allowlist/tests.rs

@@ -116,3 +116,48 @@ fn test_allow_glob_extension() -> Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn test_allowlist_extend() -> Result<()> {
+    let baseline_text = "! bad/*
+other/*";
+    let baseline = AllowList::parse(baseline_text)?;
+
+    assert!(!baseline.is_allowed("bad/a"));
+    assert!(!baseline.is_allowed("bad/b"));
+    assert!(!baseline.is_allowed("good/a"));
+    assert!(!baseline.is_allowed("good/b"));
+    assert!(!baseline.is_allowed("good/bad/c"));
+    assert!(baseline.is_allowed("other/a"));
+    assert!(baseline.is_allowed("other/b"));
+
+    let provided_text = "good/*
+bad/*
+! other/*";
+    let provided = AllowList::parse(provided_text)?;
+
+    assert!(provided.is_allowed("bad/a"));
+    assert!(provided.is_allowed("bad/b"));
+    assert!(provided.is_allowed("good/a"));
+    assert!(provided.is_allowed("good/b"));
+    assert!(provided.is_allowed("good/bad/c"));
+    assert!(!provided.is_allowed("other/a"));
+    assert!(!provided.is_allowed("other/b"));
+
+    let extended = baseline.extend(&provided);
+
+    // Deny rules from `baseline` should not be overridden by `provided`, but
+    // allow rules should be.
+    //
+    // A provided allowlist can deny patterns that are baseline-allowed, but
+    // cannot allow patterns that are baseline-denied.
+    assert!(!extended.is_allowed("bad/a"));
+    assert!(!extended.is_allowed("bad/b"));
+    assert!(extended.is_allowed("good/a"));
+    assert!(extended.is_allowed("good/b"));
+    assert!(extended.is_allowed("good/bad/c"));
+    assert!(!extended.is_allowed("other/a"));
+    assert!(!extended.is_allowed("other/b"));
+
+    Ok(())
+}