move disk::utils to crates::utils

ecstore/src/heal/background_heal_ops.rs

@@ -1,5 +1,6 @@
 use futures::future::join_all;
 use madmin::heal_commands::HealResultItem;
+use rustfs_utils::path::{SLASH_SEPARATOR, path_join};
 use std::{cmp::Ordering, env, path::PathBuf, sync::Arc, time::Duration};
 use tokio::{
     spawn,
@@ -34,7 +35,6 @@ use crate::{
     new_object_layer_fn,
     store::get_disk_via_endpoint,
     store_api::{BucketInfo, BucketOptions, StorageAPI},
-    utils::path::{SLASH_SEPARATOR, path_join},
 };
 
 pub static DEFAULT_MONITOR_NEW_DISK_INTERVAL: Duration = Duration::from_secs(10);

ecstore/src/heal/data_scanner.rs

@@ -43,7 +43,6 @@ use crate::{
     new_object_layer_fn,
     peer::is_reserved_or_invalid_bucket,
     store::ECStore,
-    utils::path::{SLASH_SEPARATOR, path_join, path_to_bucket_object, path_to_bucket_object_with_base_path},
 };
 use crate::{disk::DiskAPI, store_api::ObjectInfo};
 use crate::{
@@ -56,6 +55,7 @@ use lazy_static::lazy_static;
 use rand::Rng;
 use rmp_serde::{Deserializer, Serializer};
 use rustfs_filemeta::{FileInfo, MetaCacheEntries, MetaCacheEntry, MetadataResolutionParams};
+use rustfs_utils::path::{SLASH_SEPARATOR, path_join, path_to_bucket_object, path_to_bucket_object_with_base_path};
 use s3s::dto::{BucketLifecycleConfiguration, ExpirationStatus, LifecycleRule, ReplicationConfiguration, ReplicationRuleStatus};
 use serde::{Deserialize, Serialize};
 use tokio::{

ecstore/src/heal/data_usage.rs

@@ -6,9 +6,9 @@ use crate::{
     error::to_object_err,
     new_object_layer_fn,
     store::ECStore,
-    utils::path::SLASH_SEPARATOR,
 };
 use lazy_static::lazy_static;
+use rustfs_utils::path::SLASH_SEPARATOR;
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, sync::Arc, time::SystemTime};
 use tokio::sync::mpsc::Receiver;

ecstore/src/heal/heal_commands.rs

@@ -6,12 +6,11 @@ use std::{
 
 use crate::{
     config::storageclass::{RRS, STANDARD},
-    disk::{BUCKET_META_PREFIX, DeleteOptions, DiskAPI, DiskStore, RUSTFS_META_BUCKET, error::DiskError},
+    disk::{BUCKET_META_PREFIX, DeleteOptions, DiskAPI, DiskStore, RUSTFS_META_BUCKET, error::DiskError, fs::read_file},
     global::GLOBAL_BackgroundHealState,
     heal::heal_ops::HEALING_TRACKER_FILENAME,
     new_object_layer_fn,
     store_api::{BucketInfo, StorageAPI},
-    utils::fs::read_file,
 };
 use crate::{disk, error::Result};
 use chrono::{DateTime, Utc};

ecstore/src/heal/heal_ops.rs

@@ -5,6 +5,7 @@ use super::{
     heal_commands::{HEAL_ITEM_BUCKET_METADATA, HealOpts, HealScanMode, HealStopSuccess, HealingTracker},
 };
 use crate::error::{Error, Result};
+use crate::heal::heal_commands::{HEAL_ITEM_BUCKET, HEAL_ITEM_OBJECT};
 use crate::store_api::StorageAPI;
 use crate::{
     config::com::CONFIG_PREFIX,
@@ -18,17 +19,14 @@ use crate::{
     global::GLOBAL_IsDistErasure,
     heal::heal_commands::{HEAL_UNKNOWN_SCAN, HealStartSuccess},
     new_object_layer_fn,
-    utils::path::has_prefix,
-};
-use crate::{
-    heal::heal_commands::{HEAL_ITEM_BUCKET, HEAL_ITEM_OBJECT},
-    utils::path::path_join,
 };
 use chrono::Utc;
 use futures::join;
 use lazy_static::lazy_static;
 use madmin::heal_commands::{HealDriveInfo, HealItemType, HealResultItem};
 use rustfs_filemeta::MetaCacheEntry;
+use rustfs_utils::path::has_prefix;
+use rustfs_utils::path::path_join;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,

ecstore/src/heal/mrf.rs

@@ -1,10 +1,10 @@
 use crate::disk::{BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
 use crate::heal::background_heal_ops::{heal_bucket, heal_object};
 use crate::heal::heal_commands::{HEAL_DEEP_SCAN, HEAL_NORMAL_SCAN};
-use crate::utils::path::SLASH_SEPARATOR;
 use chrono::{DateTime, Utc};
 use lazy_static::lazy_static;
 use regex::Regex;
+use rustfs_utils::path::SLASH_SEPARATOR;
 use std::ops::Sub;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;