move disk::utils to crates::utils

rustfs/src/admin/handlers.rs

@@ -21,12 +21,12 @@ use ecstore::pools::{get_total_usable_capacity, get_total_usable_capacity_free};
 use ecstore::store::is_valid_object_prefix;
 use ecstore::store_api::BucketOptions;
 use ecstore::store_api::StorageAPI;
-use ecstore::utils::path::path_join;
 use futures::{Stream, StreamExt};
 use http::{HeaderMap, Uri};
 use hyper::StatusCode;
 use iam::get_global_action_cred;
 use iam::store::MappedPolicy;
+use rustfs_utils::path::path_join;
 // use lazy_static::lazy_static;
 use madmin::metrics::RealtimeMetrics;
 use madmin::utils::parse_duration;

rustfs/src/admin/handlers/sts.rs

@@ -4,11 +4,12 @@ use crate::{
     admin::router::Operation,
     auth::{check_key_valid, get_session_token},
 };
-use ecstore::utils::{crypto::base64_encode, xml};
+use ecstore::bucket::utils::serialize;
 use http::StatusCode;
 use iam::{manager::get_token_signing_key, sys::SESSION_POLICY_NAME};
 use matchit::Params;
 use policy::{auth::get_new_credentials_with_metadata, policy::Policy};
+use rustfs_utils::crypto::base64_encode;
 use s3s::{
     Body, S3Error, S3ErrorCode, S3Request, S3Response, S3Result,
     dto::{AssumeRoleOutput, Credentials, Timestamp},
@@ -138,7 +139,7 @@ impl Operation for AssumeRoleHandle {
         };
 
         // getAssumeRoleCredentials
-        let output = xml::serialize::<AssumeRoleOutput>(&resp).unwrap();
+        let output = serialize::<AssumeRoleOutput>(&resp).unwrap();
 
         Ok(S3Response::new((StatusCode::OK, Body::from(output))))
     }

rustfs/src/console.rs

@@ -8,6 +8,7 @@ use axum::{
 };
 use axum_extra::extract::Host;
 use rustfs_config::{RUSTFS_TLS_CERT, RUSTFS_TLS_KEY};
+use rustfs_utils::net::parse_and_resolve_address;
 use std::io;
 
 use axum::response::Redirect;
@@ -239,8 +240,7 @@ pub async fn start_static_file_server(
         .layer(tower_http::compression::CompressionLayer::new().gzip(true).deflate(true))
         .layer(TraceLayer::new_for_http());
 
-    use ecstore::utils::net;
-    let server_addr = net::parse_and_resolve_address(addrs).expect("Failed to parse socket address");
+    let server_addr = parse_and_resolve_address(addrs).expect("Failed to parse socket address");
     let server_port = server_addr.port();
     let server_address = server_addr.to_string();
 

rustfs/src/main.rs

@@ -29,7 +29,6 @@ use ecstore::config as ecconfig;
 use ecstore::config::GLOBAL_ConfigSys;
 use ecstore::heal::background_heal_ops::init_auto_heal;
 use ecstore::store_api::BucketOptions;
-use ecstore::utils::net;
 use ecstore::{
     endpoints::EndpointServerPools,
     heal::data_scanner::init_data_scanner,
@@ -51,6 +50,7 @@ use license::init_license;
 use protos::proto_gen::node_service::node_service_server::NodeServiceServer;
 use rustfs_config::{DEFAULT_ACCESS_KEY, DEFAULT_SECRET_KEY, RUSTFS_TLS_CERT, RUSTFS_TLS_KEY};
 use rustfs_obs::{SystemObserver, init_obs, set_global_guard};
+use rustfs_utils::net::parse_and_resolve_address;
 use rustls::ServerConfig;
 use s3s::{host::MultiDomain, service::S3ServiceBuilder};
 use service::hybrid;
@@ -122,7 +122,7 @@ async fn run(opt: config::Opt) -> Result<()> {
     // Initialize event notifier
     event::init_event_notifier(opt.event_config).await;
 
-    let server_addr = net::parse_and_resolve_address(opt.address.as_str()).map_err(Error::other)?;
+    let server_addr = parse_and_resolve_address(opt.address.as_str()).map_err(Error::other)?;
     let server_port = server_addr.port();
     let server_address = server_addr.to_string();
 

rustfs/src/storage/ecfs.rs

@@ -48,11 +48,10 @@ use ecstore::store_api::ObjectToDelete;
 use ecstore::store_api::PutObjReader;
 use ecstore::store_api::StorageAPI;
 // use ecstore::store_api::RESERVED_METADATA_PREFIX;
+use ecstore::bucket::utils::serialize;
 use ecstore::cmd::bucket_replication::ReplicationStatusType;
 use ecstore::cmd::bucket_replication::ReplicationType;
 use ecstore::store_api::RESERVED_METADATA_PREFIX_LOWER;
-use ecstore::utils::path::path_join_buf;
-use ecstore::utils::xml;
 use ecstore::xhttp;
 use futures::pin_mut;
 use futures::{Stream, StreamExt};
@@ -66,6 +65,7 @@ use policy::policy::action::Action;
 use policy::policy::action::S3Action;
 use query::instance::make_rustfsms;
 use rustfs_rio::HashReader;
+use rustfs_utils::path::path_join_buf;
 use rustfs_zip::CompressionFormat;
 use s3s::S3;
 use s3s::S3Error;
@@ -1274,7 +1274,7 @@ impl S3 for FS {
             .await
             .map_err(ApiError::from)?;
 
-        let data = try_!(xml::serialize(&tagging));
+        let data = try_!(serialize(&tagging));
 
         metadata_sys::update(&bucket, BUCKET_TAGGING_CONFIG, data)
             .await
@@ -1405,7 +1405,7 @@ impl S3 for FS {
         // check bucket object lock enable
         // check replication suspended
 
-        let data = try_!(xml::serialize(&versioning_configuration));
+        let data = try_!(serialize(&versioning_configuration));
 
         metadata_sys::update(&bucket, BUCKET_VERSIONING_CONFIG, data)
             .await
@@ -1596,7 +1596,7 @@ impl S3 for FS {
 
         let Some(input_cfg) = lifecycle_configuration else { return Err(s3_error!(InvalidArgument)) };
 
-        let data = try_!(xml::serialize(&input_cfg));
+        let data = try_!(serialize(&input_cfg));
         metadata_sys::update(&bucket, BUCKET_LIFECYCLE_CONFIG, data)
             .await
             .map_err(ApiError::from)?;
@@ -1681,7 +1681,7 @@ impl S3 for FS {
 
         // TODO: check kms
 
-        let data = try_!(xml::serialize(&server_side_encryption_configuration));
+        let data = try_!(serialize(&server_side_encryption_configuration));
         metadata_sys::update(&bucket, BUCKET_SSECONFIG, data)
             .await
             .map_err(ApiError::from)?;
@@ -1753,7 +1753,7 @@ impl S3 for FS {
             .await
             .map_err(ApiError::from)?;
 
-        let data = try_!(xml::serialize(&input_cfg));
+        let data = try_!(serialize(&input_cfg));
 
         metadata_sys::update(&bucket, OBJECT_LOCK_CONFIG, data)
             .await
@@ -1829,7 +1829,7 @@ impl S3 for FS {
             .map_err(ApiError::from)?;
 
         // TODO: check enable, versioning enable
-        let data = try_!(xml::serialize(&replication_configuration));
+        let data = try_!(serialize(&replication_configuration));
 
         metadata_sys::update(&bucket, BUCKET_REPLICATION_CONFIG, data)
             .await
@@ -1924,7 +1924,7 @@ impl S3 for FS {
             .await
             .map_err(ApiError::from)?;
 
-        let data = try_!(xml::serialize(&notification_configuration));
+        let data = try_!(serialize(&notification_configuration));
 
         metadata_sys::update(&bucket, BUCKET_NOTIFICATION_CONFIG, data)
             .await

rustfs/src/storage/options.rs

@@ -2,9 +2,9 @@ use ecstore::bucket::versioning_sys::BucketVersioningSys;
 use ecstore::error::Result;
 use ecstore::error::StorageError;
 use ecstore::store_api::ObjectOptions;
-use ecstore::utils::path::is_dir_object;
 use http::{HeaderMap, HeaderValue};
 use lazy_static::lazy_static;
+use rustfs_utils::path::is_dir_object;
 use std::collections::HashMap;
 use uuid::Uuid;