refactor: segment external storage api boundaries (#3903)

crates/protocols/src/swift/account.rs

@@ -14,7 +14,7 @@
 
 //! Swift account operations and validation
 
-use super::storage_api::{BucketOperations, MakeBucketOptions};
+use super::storage_api::account::{BucketOperations, MakeBucketOptions};
 use super::{SwiftError, SwiftResult};
 use super::{get_swift_bucket_metadata, resolve_swift_object_store_handle, set_swift_bucket_metadata};
 use rustfs_credentials::Credentials;

crates/protocols/src/swift/container.rs

@@ -17,7 +17,7 @@
 //! This module implements Swift container CRUD operations and container-bucket translation.
 
 use super::account::validate_account_access;
-use super::storage_api::{
+use super::storage_api::container::{
     BucketInfo, BucketOperations, BucketOptions, DeleteBucketOptions, ListOperations as _, MakeBucketOptions,
 };
 use super::types::Container;

crates/protocols/src/swift/dlo.rs

@@ -18,7 +18,7 @@
 //! Segments are discovered at download time using lexicographic ordering
 //! based on a container metadata manifest pointer.
 
-use super::storage_api::HTTPRangeSpec;
+use super::storage_api::large_object::HTTPRangeSpec;
 use super::{SwiftError, container, object};
 use axum::http::{HeaderMap, Response, StatusCode};
 use rustfs_credentials::Credentials;

crates/protocols/src/swift/mod.rs

@@ -61,7 +61,9 @@ pub mod versioning;
 pub use errors::{SwiftError, SwiftResult};
 pub use router::{SwiftRoute, SwiftRouter};
 // Note: Container, Object, and SwiftMetadata types used by Swift implementation
-pub use storage_api::{SwiftGetObjectReader, SwiftObjectInfo, SwiftObjectOptions, SwiftPutObjReader};
-pub(crate) use storage_api::{get_swift_bucket_metadata, resolve_swift_object_store_handle, set_swift_bucket_metadata};
+pub use storage_api::public_api::{SwiftGetObjectReader, SwiftObjectInfo, SwiftObjectOptions, SwiftPutObjReader};
+pub(crate) use storage_api::public_api::{
+    get_swift_bucket_metadata, resolve_swift_object_store_handle, set_swift_bucket_metadata,
+};
 #[allow(unused_imports)]
 pub use types::{Container, Object, SwiftMetadata};

crates/protocols/src/swift/object.rs

@@ -51,7 +51,7 @@
 
 use super::account::validate_account_access;
 use super::container::ContainerMapper;
-use super::storage_api::{BucketOperations, BucketOptions, HTTPRangeSpec, ObjectIO as _, ObjectOperations as _};
+use super::storage_api::object::{BucketOperations, BucketOptions, HTTPRangeSpec, ObjectIO as _, ObjectOperations as _};
 use super::{SwiftError, SwiftResult, resolve_swift_object_store_handle};
 use axum::http::HeaderMap;
 use rustfs_credentials::Credentials;

crates/protocols/src/swift/slo.rs

@@ -18,7 +18,7 @@
 //! Large files (>5GB) are split into segments, and a manifest defines
 //! how segments are assembled on download.
 
-use super::storage_api::HTTPRangeSpec;
+use super::storage_api::large_object::HTTPRangeSpec;
 use super::{SwiftError, object};
 use axum::http::{HeaderMap, Response, StatusCode};
 use rustfs_credentials::Credentials;

crates/protocols/src/swift/storage_api.rs

@@ -26,6 +26,31 @@ pub(crate) use rustfs_storage_api::{
     ObjectOperations,
 };
 
+pub(crate) mod account {
+    pub(crate) use super::{BucketOperations, MakeBucketOptions};
+}
+
+pub(crate) mod container {
+    pub(crate) use super::{BucketInfo, BucketOperations, BucketOptions, DeleteBucketOptions, ListOperations, MakeBucketOptions};
+}
+
+pub(crate) mod large_object {
+    pub(crate) use super::HTTPRangeSpec;
+}
+
+pub(crate) mod object {
+    pub(crate) use super::{BucketOperations, BucketOptions, HTTPRangeSpec, ObjectIO, ObjectOperations};
+}
+
+pub(crate) mod public_api {
+    pub use super::{SwiftGetObjectReader, SwiftObjectInfo, SwiftObjectOptions, SwiftPutObjReader};
+    pub(crate) use super::{get_swift_bucket_metadata, resolve_swift_object_store_handle, set_swift_bucket_metadata};
+}
+
+pub(crate) mod versioning {
+    pub(crate) use super::{ListOperations, ObjectOperations};
+}
+
 pub type SwiftGetObjectReader = <SwiftStore as ObjectIO>::GetObjectReader;
 pub type SwiftObjectInfo = <SwiftStore as ObjectOperations>::ObjectInfo;
 pub type SwiftObjectOptions = <SwiftStore as ObjectOperations>::ObjectOptions;

crates/protocols/src/swift/versioning.rs

@@ -55,7 +55,7 @@ use super::account::validate_account_access;
 use super::container::ContainerMapper;
 use super::object::{ObjectKeyMapper, SwiftObjectOptions as ObjectOptions, head_object};
 use super::resolve_swift_object_store_handle;
-use super::storage_api::{ListOperations as _, ObjectOperations as _};
+use super::storage_api::versioning::{ListOperations as _, ObjectOperations as _};
 use super::{SwiftError, SwiftResult};
 use rustfs_credentials::Credentials;
 use std::time::{SystemTime, UNIX_EPOCH};