From 9c1f6678d1d9f77bab2e29a701d3483d91ab0d18 Mon Sep 17 00:00:00 2001
From: overtrue <anzhengchao@gmail.com>
Date: Wed, 2 Sep 2026 22:04:34 +0800
Subject: [PATCH] chore: integrate ODM-01 and ODM-02 as B1 base (fix facade
 merge)

---
 crates/ecstore/src/api/mod.rs                   | 17 +++++++----------
 .../src/bucket/on_demand_migration/mod.rs       |  5 +----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/crates/ecstore/src/api/mod.rs b/crates/ecstore/src/api/mod.rs
index fa9e0e194..9fdb7fca9 100644
--- a/crates/ecstore/src/api/mod.rs
+++ b/crates/ecstore/src/api/mod.rs
@@ -151,6 +151,13 @@ pub mod bucket {
             OnDemandMigrationConfig, OnDemandMigrationConfigError, PathStyle, PolicyConfig, Provider, RangeGetPolicy,
             SourceConfig, SourceCredentials, SourceErrorPolicy, SourceTimeout, TlsConfig, ValidationContext,
         };
+        pub mod source_client {
+            pub use crate::bucket::on_demand_migration::source_client::{
+                SourceClient, SourceClientSpec, SourceError, SourceGet, SourceHead, SourceObject, SourcePage, SourceProbe,
+                SourceProvider, SourceSse, SourceTimeouts, USER_AGENT_SUFFIX, is_multipart_etag, range_header_value,
+                resolve_path_style,
+            };
+        }
     }
 
     pub mod metadata_sys {
@@ -174,16 +181,6 @@ pub mod bucket {
         pub use crate::bucket::migration::{LegacyBlobDecryptFn, try_migrate_bucket_metadata, try_migrate_iam_config};
     }
 
-    pub mod on_demand_migration {
-        pub mod source_client {
-            pub use crate::bucket::on_demand_migration::source_client::{
-                SourceClient, SourceClientSpec, SourceError, SourceGet, SourceHead, SourceObject, SourcePage, SourceProbe,
-                SourceProvider, SourceSse, SourceTimeouts, USER_AGENT_SUFFIX, is_multipart_etag, range_header_value,
-                resolve_path_style,
-            };
-        }
-    }
-
     pub mod object_lock {
         pub use crate::bucket::object_lock::{ObjectLockApi, ObjectLockStatusExt};
 
diff --git a/crates/ecstore/src/bucket/on_demand_migration/mod.rs b/crates/ecstore/src/bucket/on_demand_migration/mod.rs
index 2f3577f29..11491e1c4 100644
--- a/crates/ecstore/src/bucket/on_demand_migration/mod.rs
+++ b/crates/ecstore/src/bucket/on_demand_migration/mod.rs
@@ -19,13 +19,10 @@
 //! layered on top of it by later tasks (rustfs/backlog#2147).
 
 pub mod config;
+pub mod source_client;
 
 pub use config::{
     ConfigPublishHook, FilterConfig, HeadPolicy, ON_DEMAND_MIGRATION_CONFIG_HOOK, ON_DEMAND_MIGRATION_CONFIG_VERSION,
     OnDemandMigrationConfig, OnDemandMigrationConfigError, PathStyle, PolicyConfig, Provider, RangeGetPolicy, SourceConfig,
     SourceCredentials, SourceErrorPolicy, SourceTimeout, TlsConfig, ValidationContext,
 };
-//! On-demand migration (ODM): serve and back-fill objects from an external
-//! S3-compatible source bucket.
-
-pub mod source_client;