Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics

# Conflicts:
#	crates/notify/src/event.rs
#	crates/notify/src/global.rs
#	crates/notify/src/integration.rs
#	crates/notify/src/notifier.rs

crates/notify/src/rules/config.rs

@@ -1,11 +1,11 @@
 use super::rules_map::RulesMap;
 // Keep for existing structure if any, or remove if not used
 use super::xml_config::ParseConfigError as BucketNotificationConfigError;
+use crate::EventName;
 use crate::arn::TargetID;
+use crate::rules::NotificationConfiguration;
 use crate::rules::pattern_rules;
 use crate::rules::target_id_set;
-use crate::rules::NotificationConfiguration;
-use crate::EventName;
 use std::collections::HashMap;
 use std::io::Read;
 

crates/notify/src/rules/pattern.rs

@@ -78,10 +78,7 @@ mod tests {
         assert_eq!(new_pattern(Some(""), Some("b")), "*b");
         assert_eq!(new_pattern(None, None), "");
         assert_eq!(new_pattern(Some("prefix"), Some("suffix")), "prefix*suffix");
-        assert_eq!(
-            new_pattern(Some("prefix/"), Some("/suffix")),
-            "prefix/*suffix"
-        ); // prefix/* + */suffix -> prefix/**/suffix -> prefix/*/suffix
+        assert_eq!(new_pattern(Some("prefix/"), Some("/suffix")), "prefix/*suffix"); // prefix/* + */suffix -> prefix/**/suffix -> prefix/*/suffix
     }
 
     #[test]

crates/notify/src/rules/pattern_rules.rs

@@ -23,9 +23,7 @@ impl PatternRules {
 
     /// Checks if there are any rules that match the given object name.
     pub fn match_simple(&self, object_name: &str) -> bool {
-        self.rules
-            .keys()
-            .any(|p| pattern::match_simple(p, object_name))
+        self.rules.keys().any(|p| pattern::match_simple(p, object_name))
     }
 
     /// Returns all TargetIDs that match the object name.
@@ -61,8 +59,7 @@ impl PatternRules {
         for (pattern, self_targets) in &self.rules {
             match other.rules.get(pattern) {
                 Some(other_targets) => {
-                    let diff_targets: TargetIdSet =
-                        self_targets.difference(other_targets).cloned().collect();
+                    let diff_targets: TargetIdSet = self_targets.difference(other_targets).cloned().collect();
                     if !diff_targets.is_empty() {
                         result_rules.insert(pattern.clone(), diff_targets);
                     }
@@ -73,8 +70,6 @@ impl PatternRules {
                 }
             }
         }
-        PatternRules {
-            rules: result_rules,
-        }
+        PatternRules { rules: result_rules }
     }
 }

crates/notify/src/rules/xml_config.rs

@@ -1,5 +1,5 @@
 use super::pattern;
-use crate::arn::{ArnError, TargetIDError, ARN};
+use crate::arn::{ARN, ArnError, TargetIDError};
 use crate::event::EventName;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;