refactor: route ecstore storage api boundaries (#3892)

crates/ecstore/src/bucket/lifecycle/bucket_lifecycle_ops.rs

@@ -36,6 +36,10 @@ use crate::event_notification::{EventArgs, send_event};
 use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions};
 use crate::runtime_sources;
 use crate::set_disk::{MAX_PARTS_COUNT, RUSTFS_MULTIPART_BUCKET_KEY, RUSTFS_MULTIPART_OBJECT_KEY, SetDisks};
+use crate::storage_api_contracts::{
+    DeletedObject, ExpirationOptions, HTTPRangeSpec, ListOperations as _, MultipartOperations as _, ObjectOperations as _,
+    ObjectToDelete,
+};
 use crate::store::ECStore;
 use crate::tier::warm_backend::WarmBackendGetOpts;
 use async_channel::{Receiver as A_Receiver, Sender as A_Sender, bounded};
@@ -57,10 +61,6 @@ use rustfs_filemeta::{
     VersionPurgeStatusType, get_file_info, is_restored_object_on_disk,
 };
 use rustfs_s3_types::EventName;
-use rustfs_storage_api::{
-    DeletedObject, ExpirationOptions, HTTPRangeSpec, ListOperations as _, MultipartOperations as _, ObjectOperations as _,
-    ObjectToDelete,
-};
 use rustfs_utils::{get_env_i64, get_env_usize, path::encode_dir_object, string::strings_has_prefix_fold};
 use s3s::dto::{
     BucketLifecycleConfiguration, DefaultRetention, ExpirationStatus, ReplicationConfiguration, RestoreRequest,
@@ -387,7 +387,7 @@ pub trait ExpiryOp: 'static {
     fn as_any(&self) -> &dyn Any;
 }
 
-pub use rustfs_storage_api::TransitionedObject;
+pub use crate::storage_api_contracts::TransitionedObject;
 
 struct FreeVersionTask(ObjectInfo);
 
@@ -2891,13 +2891,13 @@ mod tests {
     use crate::object_api::{ObjectInfo, ObjectOptions, PutObjReader};
     use crate::runtime_sources;
     use crate::set_disk::{RUSTFS_MULTIPART_BUCKET_KEY, RUSTFS_MULTIPART_OBJECT_KEY};
+    use crate::storage_api_contracts::ExpirationOptions;
+    use crate::storage_api_contracts::{BucketOperations, BucketOptions, MakeBucketOptions, MultipartOperations as _};
     use crate::store::ECStore;
     use futures::FutureExt;
     use rustfs_common::metrics::{IlmAction, global_metrics};
     use rustfs_config::ENV_TRANSITION_WORKERS_ABSOLUTE_MAX;
     use rustfs_filemeta::{ReplicateDecision, VersionPurgeStatusType};
-    use rustfs_storage_api::ExpirationOptions;
-    use rustfs_storage_api::{BucketOperations, BucketOptions, MakeBucketOptions, MultipartOperations as _};
     use s3s::dto::{BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule, Timestamp};
     use serial_test::serial;
     use sha2::{Digest, Sha256};
@@ -4167,7 +4167,7 @@ mod tests {
                 &bucket,
                 object,
                 &upload.upload_id,
-                vec![rustfs_storage_api::CompletePart {
+                vec![crate::storage_api_contracts::CompletePart {
                     part_num: 1,
                     etag: second_part.etag.clone(),
                     checksum_crc32: None,

crates/ecstore/src/bucket/lifecycle/core.rs

@@ -934,7 +934,7 @@ impl Default for Event {
     }
 }
 
-pub use rustfs_storage_api::ExpirationOptions;
+pub use crate::storage_api_contracts::ExpirationOptions;
 
 #[derive(Debug, Clone)]
 pub struct TransitionOptions {

crates/ecstore/src/bucket/lifecycle/tier_delete_journal.rs

@@ -24,9 +24,11 @@ use crate::config::com::{delete_config, read_config, save_config};
 use crate::disk::RUSTFS_META_BUCKET;
 use crate::error::{Error, Result};
 use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
+use crate::storage_api_contracts::{
+    DeletedObject, HTTPRangeSpec, ListOperations as _, ObjectIO, ObjectOperations, ObjectToDelete,
+};
 use crate::store::ECStore;
 use rustfs_filemeta::FileInfo;
-use rustfs_storage_api::{DeletedObject, HTTPRangeSpec, ListOperations as _, ObjectIO, ObjectOperations, ObjectToDelete};
 
 const LOG_COMPONENT_ECSTORE: &str = "ecstore";
 const LOG_SUBSYSTEM_LIFECYCLE: &str = "lifecycle";

crates/ecstore/src/bucket/lifecycle/tier_free_version_recovery.rs

@@ -20,12 +20,11 @@ use tokio_util::sync::CancellationToken;
 use crate::disk::RUSTFS_META_BUCKET;
 use crate::error::Result;
 use crate::object_api::ObjectInfo;
+use crate::storage_api_contracts::{
+    BucketOperations, BucketOptions, ListOperations as _, StorageObjectInfoOrErr, StorageWalkOptions,
+};
 use crate::store::ECStore;
 use rustfs_filemeta::FileInfo;
-use rustfs_storage_api::{
-    BucketOperations, BucketOptions, ListOperations as _, ObjectInfoOrErr as StorageObjectInfoOrErr,
-    WalkOptions as StorageWalkOptions,
-};
 
 pub const DEFAULT_FREE_VERSION_RECOVERY_LIMIT: usize = 1_000;
 const DEFAULT_FREE_VERSION_RECOVERY_SCAN_LIMIT: usize = 10_000;

crates/ecstore/src/bucket/lifecycle/tier_sweeper.rs

@@ -23,8 +23,8 @@ use crate::bucket::lifecycle::lifecycle::{self, ObjectOpts};
 use crate::bucket::lifecycle::tier_delete_journal::persist_tier_delete_journal_entry;
 use crate::client::signer_error::error_chain_contains_signer_header_marker;
 use crate::runtime_sources;
+use crate::storage_api_contracts::TransitionedObject;
 use crate::store::ECStore;
-use rustfs_storage_api::TransitionedObject;
 use rustfs_utils::get_env_usize;
 use sha2::{Digest, Sha256};
 use std::any::Any;