move disk::utils to crates::utils

ecstore/src/bucket/metadata.rs

@@ -17,13 +17,13 @@ use time::OffsetDateTime;
 use tracing::error;
 
 use crate::bucket::target::BucketTarget;
+use crate::bucket::utils::deserialize;
 use crate::config::com::{read_config, save_config};
 use crate::error::{Error, Result};
 use crate::new_object_layer_fn;
 
 use crate::disk::BUCKET_META_PREFIX;
 use crate::store::ECStore;
-use crate::utils::xml::deserialize;
 
 pub const BUCKET_METADATA_FILE: &str = ".metadata.bin";
 pub const BUCKET_METADATA_FORMAT: u16 = 1;

ecstore/src/bucket/metadata_sys.rs

@@ -6,13 +6,12 @@ use std::{collections::HashMap, sync::Arc};
 use crate::StorageAPI;
 use crate::bucket::error::BucketMetadataError;
 use crate::bucket::metadata::{BUCKET_LIFECYCLE_CONFIG, load_bucket_metadata_parse};
-use crate::bucket::utils::is_meta_bucketname;
+use crate::bucket::utils::{deserialize, is_meta_bucketname};
 use crate::cmd::bucket_targets;
 use crate::error::{Error, Result, is_err_bucket_not_found};
 use crate::global::{GLOBAL_Endpoints, is_dist_erasure, is_erasure, new_object_layer_fn};
 use crate::heal::heal_commands::HealOpts;
 use crate::store::ECStore;
-use crate::utils::xml::deserialize;
 use futures::future::join_all;
 use policy::policy::BucketPolicy;
 use s3s::dto::{

ecstore/src/bucket/utils.rs

@@ -1,5 +1,6 @@
 use crate::disk::RUSTFS_META_BUCKET;
 use crate::error::{Error, Result};
+use s3s::xml;
 
 pub fn is_meta_bucketname(name: &str) -> bool {
     name.starts_with(RUSTFS_META_BUCKET)
@@ -70,3 +71,31 @@ pub fn check_valid_object_name(object_name: &str) -> Result<()> {
     }
     check_valid_object_name_prefix(object_name)
 }
+
+pub fn deserialize<T>(input: &[u8]) -> xml::DeResult<T>
+where
+    T: for<'xml> xml::Deserialize<'xml>,
+{
+    let mut d = xml::Deserializer::new(input);
+    let ans = T::deserialize(&mut d)?;
+    d.expect_eof()?;
+    Ok(ans)
+}
+
+pub fn serialize_content<T: xml::SerializeContent>(val: &T) -> xml::SerResult<String> {
+    let mut buf = Vec::with_capacity(256);
+    {
+        let mut ser = xml::Serializer::new(&mut buf);
+        val.serialize_content(&mut ser)?;
+    }
+    Ok(String::from_utf8(buf).unwrap())
+}
+
+pub fn serialize<T: xml::Serialize>(val: &T) -> xml::SerResult<Vec<u8>> {
+    let mut buf = Vec::with_capacity(256);
+    {
+        let mut ser = xml::Serializer::new(&mut buf);
+        val.serialize(&mut ser)?;
+    }
+    Ok(buf)
+}

ecstore/src/bucket/versioning/mod.rs

@@ -1,6 +1,6 @@
 use s3s::dto::{BucketVersioningStatus, VersioningConfiguration};
 
-use crate::utils::wildcard;
+use rustfs_utils::string::match_simple;
 
 pub trait VersioningApi {
     fn enabled(&self) -> bool;
@@ -33,7 +33,7 @@ impl VersioningApi for VersioningConfiguration {
             for p in excluded_prefixes.iter() {
                 if let Some(ref sprefix) = p.prefix {
                     let pattern = format!("{}*", sprefix);
-                    if wildcard::match_simple(&pattern, prefix) {
+                    if match_simple(&pattern, prefix) {
                         return false;
                     }
                 }
@@ -63,7 +63,7 @@ impl VersioningApi for VersioningConfiguration {
                 for p in excluded_prefixes.iter() {
                     if let Some(ref sprefix) = p.prefix {
                         let pattern = format!("{}*", sprefix);
-                        if wildcard::match_simple(&pattern, prefix) {
+                        if match_simple(&pattern, prefix) {
                             return true;
                         }
                     }