On Mon, Jul 17, 2023 at 05:00:04PM +0200, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner <l.wag...@proxmox.com> > --- > proxmox-notify/src/api/common.rs | 11 +++ > proxmox-notify/src/api/mod.rs | 125 +++++++++++++++++++++++++++++++ > 2 files changed, 136 insertions(+) > > diff --git a/proxmox-notify/src/api/common.rs > b/proxmox-notify/src/api/common.rs > index 518caa8f..48761fbb 100644 > --- a/proxmox-notify/src/api/common.rs > +++ b/proxmox-notify/src/api/common.rs > @@ -42,3 +42,14 @@ pub fn test_target(config: &Config, endpoint: &str) -> > Result<(), ApiError> { > > Ok(()) > } > + > +/// Return all entities (targets, groups, filters) that are linked to the > entity. > +/// For instance, if a group 'grp1' contains the targets 'a', 'b' and 'c', > +/// where grp1 has 'filter1' and 'a' has 'filter2' as filters, then > +/// the result for 'grp1' would be [grp1, a, b, c, filter1, filter2]. > +/// The result will always contain the entity that was passed as a parameter. > +/// If the entity does not exist, the result will only contain the entity. > +pub fn get_referenced_entities(config: &Config, entity: &str) -> > Result<Vec<String>, ApiError> { > + let entities = super::get_referenced_entities(config, entity); > + Ok(Vec::from_iter(entities.into_iter())) > +} > diff --git a/proxmox-notify/src/api/mod.rs b/proxmox-notify/src/api/mod.rs > index 12811baf..d8a44bf2 100644 > --- a/proxmox-notify/src/api/mod.rs > +++ b/proxmox-notify/src/api/mod.rs > @@ -1,3 +1,4 @@ > +use std::collections::HashSet; > use std::error::Error as StdError; > use std::fmt::Display; > > @@ -101,6 +102,48 @@ fn endpoint_exists(config: &Config, name: &str) -> bool { > exists > } > > +fn get_referenced_entities(config: &Config, entity: &str) -> HashSet<String> > { > + let mut to_expand = HashSet::new(); > + let mut expanded = HashSet::new(); > + to_expand.insert(entity.to_string()); > + > + let expand = |entities: &HashSet<String>| -> HashSet<String> { > + let mut new = HashSet::new(); > + > + for entity in entities { > + if let Ok(group) = group::get_group(config, entity) { > + for target in group.endpoint { > + new.insert(target.clone()); > + } > + } > + > + #[cfg(feature = "sendmail")] > + if let Ok(target) = sendmail::get_endpoint(config, entity) { > + if let Some(filter) = target.filter { > + new.insert(filter.clone()); > + } > + } > + > + #[cfg(feature = "gotify")] > + if let Ok(target) = gotify::get_endpoint(config, entity) { > + if let Some(filter) = target.filter { > + new.insert(filter.clone()); > + } > + } > + } > + > + new > + }; > + > + while !to_expand.is_empty() { > + let new = expand(&to_expand); > + expanded.extend(to_expand.drain());
^ could drop the `drain()` call and move it in since you replace it with new afterwards anyway > + to_expand = new; > + } > + > + expanded > +} > + > #[cfg(test)] > mod test_helpers { > use crate::Config; (...) _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel