From 01514478bb1614124c360407b599c525d1371c38 Mon Sep 17 00:00:00 2001 From: Tor Date: Wed, 1 Feb 2023 13:55:41 +0100 Subject: [PATCH] feat(config): Add unknown ruletype (#1741) Adds a new enum variant to ruletype for forward-compatibility #1639 --- relay-general/src/pii/compiledconfig.rs | 1 + relay-general/src/pii/config.rs | 2 ++ relay-general/src/pii/regexes.rs | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/relay-general/src/pii/compiledconfig.rs b/relay-general/src/pii/compiledconfig.rs index 2445be1d46..3c4ac39d18 100644 --- a/relay-general/src/pii/compiledconfig.rs +++ b/relay-general/src/pii/compiledconfig.rs @@ -79,6 +79,7 @@ fn collect_rules( }; collect_rules(config, rules, &a.rule, parent); } + RuleType::Unknown(_) => {} _ => { rules.insert(rule); } diff --git a/relay-general/src/pii/config.rs b/relay-general/src/pii/config.rs index f1753f6964..a858882409 100644 --- a/relay-general/src/pii/config.rs +++ b/relay-general/src/pii/config.rs @@ -150,6 +150,8 @@ pub enum RuleType { Multiple(MultipleRule), /// Applies another rule. Works like a single multiple. Alias(AliasRule), + /// Unknown ruletype for forward compatibility + Unknown(String), } /// A single rule configuration. diff --git a/relay-general/src/pii/regexes.rs b/relay-general/src/pii/regexes.rs index 0f61dc5955..ba0c85949e 100644 --- a/relay-general/src/pii/regexes.rs +++ b/relay-general/src/pii/regexes.rs @@ -89,7 +89,7 @@ pub fn get_regex_for_rule_type( RuleType::Userpath => smallvec![(v, &*PATH_REGEX, ReplaceBehavior::replace_group(1))], // These ought to have been resolved in CompiledConfig - RuleType::Alias(_) | RuleType::Multiple(_) => smallvec![], + RuleType::Alias(_) | RuleType::Multiple(_) | RuleType::Unknown(_) => smallvec![], } }