From 80bb116cb75259efe5b8231c125f02493ca728ca Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 21 Aug 2023 06:25:09 -0700 Subject: [PATCH] shaping: downgrade conflicting mx domains to a warning The mail must flow! However, it is unspecified which shaping rules we'll actually use in that situation; the current effective order of resolution and behavior must not be relied upon and may change without notice or anyone even realizing that it changed. --- crates/kumo-api-types/src/shaping.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/kumo-api-types/src/shaping.rs b/crates/kumo-api-types/src/shaping.rs index 6e4a9555..b0b0ec46 100644 --- a/crates/kumo-api-types/src/shaping.rs +++ b/crates/kumo-api-types/src/shaping.rs @@ -425,19 +425,14 @@ impl Shaping { if domains.len() > 1 { let domains = domains.into_iter().collect::>().join(", "); warnings.push(format!( - "Multiple domains rollup to the same site: {site} -> {domains}" + "Multiple domains rollup to the same site: {site} -> {domains}. \ + Actual shaping behavior for those domains will be unspecified. \ + Resolve this by retaining the primary domain and removing the others." )); conflicted.push(domains); } } - if !conflicted.is_empty() { - anyhow::bail!( - "Multiple conflicting rollup domains: {}", - conflicted.join(" ") - ); - } - for (site, partial) in &by_site { partial .clone()