refactor: expose external ECStore owner symbols (#3748)

crates/notify/src/config_manager.rs

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 use crate::{
-    Event, NotificationError, ecstore_config, ecstore_global, ecstore_storage, registry::TargetRegistry,
-    rule_engine::NotifyRuleEngine, runtime_facade::NotifyRuntimeFacade,
+    Event, NotificationError, registry::TargetRegistry, resolve_notify_object_store_handle, rule_engine::NotifyRuleEngine,
+    runtime_facade::NotifyRuntimeFacade,
 };
 use rustfs_config::notify::{
     NOTIFY_AMQP_SUB_SYS, NOTIFY_KAFKA_SUB_SYS, NOTIFY_MQTT_SUB_SYS, NOTIFY_MYSQL_SUB_SYS, NOTIFY_NATS_SUB_SYS,
@@ -31,8 +31,6 @@ const LOG_SUBSYSTEM_CONFIG: &str = "config";
 const EVENT_NOTIFY_RUNTIME_LIFECYCLE: &str = "notify_runtime_lifecycle";
 const EVENT_NOTIFY_CONFIG_UPDATE: &str = "notify_config_update";
 
-type NotifyStore = ecstore_storage::ECStore;
-
 #[derive(Debug)]
 enum NotifyConfigStoreError {
     StorageNotAvailable,
@@ -48,33 +46,21 @@ where
         return Err(NotifyConfigStoreError::StorageNotAvailable);
     };
 
-    let mut new_config = read_notify_server_config_without_migrate(store.clone()).await?;
+    let mut new_config = crate::read_notify_server_config_without_migrate(store.clone())
+        .await
+        .map_err(NotifyConfigStoreError::Read)?;
 
     if !modifier(&mut new_config) {
         return Ok(None);
     }
 
-    save_notify_server_config(store, &new_config).await?;
+    crate::save_notify_server_config(store, &new_config)
+        .await
+        .map_err(NotifyConfigStoreError::Save)?;
 
     Ok(Some(new_config))
 }
 
-fn resolve_notify_object_store_handle() -> Option<Arc<NotifyStore>> {
-    ecstore_global::resolve_object_store_handle()
-}
-
-async fn read_notify_server_config_without_migrate(store: Arc<NotifyStore>) -> Result<Config, NotifyConfigStoreError> {
-    ecstore_config::com::read_config_without_migrate(store)
-        .await
-        .map_err(|err| NotifyConfigStoreError::Read(err.to_string()))
-}
-
-async fn save_notify_server_config(store: Arc<NotifyStore>, config: &Config) -> Result<(), NotifyConfigStoreError> {
-    ecstore_config::com::save_server_config(store, config)
-        .await
-        .map_err(|err| NotifyConfigStoreError::Save(err.to_string()))
-}
-
 pub(crate) fn notify_configuration_hint() -> String {
     let webhook_enable_primary = format!("{}_PRIMARY", rustfs_config::notify::ENV_NOTIFY_WEBHOOK_ENABLE);
     let webhook_endpoint_primary = format!("{}_PRIMARY", rustfs_config::notify::ENV_NOTIFY_WEBHOOK_ENDPOINT);

crates/notify/src/lib.rs

@@ -18,6 +18,8 @@
 //! It supports sending events to various targets
 //! (like Webhook and MQTT) and includes features like event persistence and retry on failure.
 
+use std::sync::Arc;
+
 mod bucket_config_manager;
 mod config_manager;
 mod error;
@@ -37,9 +39,7 @@ mod runtime_view;
 mod services;
 mod status_view;
 
-pub(crate) use rustfs_ecstore::api::config as ecstore_config;
-pub(crate) use rustfs_ecstore::api::global as ecstore_global;
-pub(crate) use rustfs_ecstore::api::storage as ecstore_storage;
+pub(crate) use rustfs_ecstore::api::storage::ECStore as NotifyStore;
 
 pub use bucket_config_manager::NotifyBucketConfigManager;
 pub use config_manager::{NotifyConfigManager, runtime_target_id_for_subsystem};
@@ -58,3 +58,24 @@ pub use runtime_facade::NotifyRuntimeFacade;
 pub use runtime_view::NotifyRuntimeView;
 pub use services::NotifyServices;
 pub use status_view::NotifyStatusView;
+
+pub(crate) fn resolve_notify_object_store_handle() -> Option<Arc<NotifyStore>> {
+    rustfs_ecstore::api::global::resolve_object_store_handle()
+}
+
+pub(crate) async fn read_notify_server_config_without_migrate(
+    store: Arc<NotifyStore>,
+) -> Result<rustfs_config::server_config::Config, String> {
+    rustfs_ecstore::api::config::com::read_config_without_migrate(store)
+        .await
+        .map_err(|err| err.to_string())
+}
+
+pub(crate) async fn save_notify_server_config(
+    store: Arc<NotifyStore>,
+    config: &rustfs_config::server_config::Config,
+) -> Result<(), String> {
+    rustfs_ecstore::api::config::com::save_server_config(store, config)
+        .await
+        .map_err(|err| err.to_string())
+}