refactor(replication): route metadata contracts through crate (#4160)

crates/ecstore/src/bucket/bucket_target_sys.rs

@@ -49,7 +49,7 @@ use hyper_util::client::legacy::Client as HyperClient;
 use hyper_util::rt::{TokioExecutor, TokioTimer};
 use reqwest::Client as HttpClient;
 use rustfs_config::{DEFAULT_TRUST_LEAF_CERT_AS_CA, ENV_TRUST_LEAF_CERT_AS_CA, RUSTFS_CA_CERT, RUSTFS_TLS_CERT};
-use rustfs_filemeta::ReplicationStatusType;
+use rustfs_replication::ReplicationStatusType;
 use rustfs_utils::egress::{OutboundUrlError, validate_outbound_url};
 use rustfs_utils::http::{
     AMZ_BUCKET_REPLICATION_STATUS, AMZ_OBJECT_LOCK_BYPASS_GOVERNANCE, AMZ_OBJECT_LOCK_LEGAL_HOLD, AMZ_OBJECT_LOCK_MODE,

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

@@ -3001,7 +3001,7 @@ mod tests {
     use futures::FutureExt;
     use rustfs_common::metrics::{IlmAction, global_metrics};
     use rustfs_config::ENV_TRANSITION_WORKERS_ABSOLUTE_MAX;
-    use rustfs_filemeta::{ReplicateDecision, ReplicationStatusType, VersionPurgeStatusType};
+    use rustfs_replication::{ReplicateDecision, ReplicationStatusType, VersionPurgeStatusType};
     use s3s::dto::{
         BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule, MetadataEntry, OutputLocation,
         RestoreRequest, RestoreRequestType, S3Location, Timestamp, Transition, TransitionStorageClass,

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

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use rustfs_config::{DEFAULT_ILM_PROCESS_TIME_SECS, ENV_ILM_PROCESS_TIME, ENV_ILM_PROCESS_TIME_DEPRECATED};
-use rustfs_filemeta::{ReplicationStatusType, VersionPurgeStatusType};
+use rustfs_replication::{ReplicationStatusType, VersionPurgeStatusType};
 use s3s::dto::{
     BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule, LifecycleRuleFilter,
     NoncurrentVersionTransition, ObjectLockConfiguration, ObjectLockEnabled, RestoreRequest, Transition,

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

@@ -170,7 +170,7 @@ mod tests {
     use std::sync::Arc;
 
     use rustfs_common::metrics::IlmAction;
-    use rustfs_filemeta::{ReplicationStatusType, VersionPurgeStatusType};
+    use rustfs_replication::{ReplicationStatusType, VersionPurgeStatusType};
     use s3s::dto::{
         BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule, Transition, TransitionStorageClass,
     };

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

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use rustfs_common::metrics::IlmAction;
-use rustfs_filemeta::{ReplicateDecision, ReplicationStatusType};
+use rustfs_replication::{ReplicateDecision, ReplicationStatusType};
 
 use crate::bucket::lifecycle::lifecycle::ObjectOpts;
 use crate::bucket::replication::{ReplicationLifecycleBridge, ReplicationLifecycleConfig};
@@ -70,7 +70,7 @@ mod tests {
     use std::collections::HashMap;
 
     use rustfs_common::metrics::IlmAction;
-    use rustfs_filemeta::{ReplicationStatusType, VersionPurgeStatusType};
+    use rustfs_replication::{ReplicationStatusType, VersionPurgeStatusType};
 
     use super::*;
 

crates/ecstore/src/bucket/replication/replication_filemeta_boundary.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use rustfs_filemeta::{
+pub(crate) use rustfs_replication::{MrfOpKind, MrfReplicateEntry};
+pub(crate) use rustfs_replication::{
     REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, REPLICATE_HEAL, REPLICATE_HEAL_DELETE, REPLICATE_INCOMING_DELETE,
     ReplicateDecision, ReplicateObjectInfo, ReplicateTargetDecision, ReplicatedInfos, ReplicatedTargetInfo, ReplicationAction,
     ReplicationState, ReplicationStatusType, ReplicationType, ReplicationWorkerOperation, ResyncDecision, ResyncTargetDecision,
     VersionPurgeStatusType, get_replication_state, parse_replicate_decision, replication_statuses_map, target_reset_header,
     version_purge_statuses_map,
 };
-pub(crate) use rustfs_replication::{MrfOpKind, MrfReplicateEntry};

crates/ecstore/src/client/object_handlers_common.rs

@@ -27,8 +27,8 @@ use crate::bucket::versioning_sys::BucketVersioningSys;
 use crate::object_api::ObjectOptions;
 use crate::storage_api_contracts::object::{ObjectOperations as _, ObjectToDelete};
 use crate::store::ECStore;
-use rustfs_filemeta::ReplicationState;
 use rustfs_lock::MAX_DELETE_LIST;
+use rustfs_replication::ReplicationState;
 
 pub async fn delete_object_versions(api: &Arc<ECStore>, bucket: &str, to_del: &[ObjectToDelete], _lc_event: lifecycle::Event) {
     let version_suspended = match BucketVersioningSys::get(bucket).await {

crates/ecstore/src/object_api/types.rs

@@ -790,7 +790,8 @@ fn versions_after_marker(file_infos: &rustfs_filemeta::FileInfoVersions, marker:
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rustfs_filemeta::{FileInfo, FileMeta, MetaCacheEntry, ReplicationState, TRANSITION_COMPLETE};
+    use rustfs_filemeta::{FileInfo, FileMeta, MetaCacheEntry, TRANSITION_COMPLETE};
+    use rustfs_replication::ReplicationState;
 
     #[test]
     fn versions_after_marker_handles_null_version_marker() {

crates/ecstore/src/set_disk/mod.rs

@@ -6847,9 +6847,9 @@ mod tests {
     use rustfs_filemeta::ErasureInfo;
     use rustfs_filemeta::FileMeta;
     use rustfs_filemeta::MetaCacheEntry;
-    use rustfs_filemeta::ReplicationState;
     use rustfs_lock::client::local::LocalClient;
     use rustfs_lock::{LockError, LockInfo, LockResponse, LockStats};
+    use rustfs_replication::ReplicationState;
     use serial_test::serial;
     use std::collections::HashMap;
     use tempfile::TempDir;

crates/replication/src/lib.rs

@@ -20,3 +20,10 @@ pub use resync::{
     BucketReplicationResyncStatus, Error, Result, ResyncOpts, ResyncStatusType, TargetReplicationResyncStatus,
     decode_resync_file, encode_resync_file,
 };
+pub use rustfs_filemeta::{
+    REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, REPLICATE_HEAL, REPLICATE_HEAL_DELETE, REPLICATE_INCOMING_DELETE,
+    ReplicateDecision, ReplicateObjectInfo, ReplicateTargetDecision, ReplicatedInfos, ReplicatedTargetInfo, ReplicationAction,
+    ReplicationState, ReplicationStatusType, ReplicationType, ReplicationWorkerOperation, ResyncDecision, ResyncTargetDecision,
+    VersionPurgeStatusType, get_replication_state, parse_replicate_decision, replication_statuses_map, target_reset_header,
+    version_purge_statuses_map,
+};

crates/scanner/Cargo.toml

@@ -44,6 +44,7 @@ time = { workspace = true }
 chrono = { workspace = true }
 rmp-serde = { workspace = true }
 rustfs-filemeta = { workspace = true }
+rustfs-replication = { workspace = true }
 tokio-util = { workspace = true }
 rustfs-ecstore = { workspace = true }
 rustfs-storage-api = { workspace = true }

crates/scanner/src/scanner_folder.rs

@@ -41,7 +41,8 @@ use rustfs_common::metrics::{
     IlmAction, Metric, Metrics, ScannerReplicationRepairKind, ScannerSourceWorkUpdate, ScannerWorkSource, UpdateCurrentPathFn,
     current_path_updater, global_metrics,
 };
-use rustfs_filemeta::{MetaCacheEntries, MetaCacheEntry, MetadataResolutionParams, ReplicationStatusType};
+use rustfs_filemeta::{MetaCacheEntries, MetaCacheEntry, MetadataResolutionParams};
+use rustfs_replication::ReplicationStatusType;
 use rustfs_utils::path::{SLASH_SEPARATOR, path_join_buf};
 use s3s::dto::{BucketLifecycleConfiguration, ObjectLockConfiguration};
 use time::OffsetDateTime;
@@ -2836,7 +2837,8 @@ mod tests {
 
     use super::*;
     use crate::{DiskOption, Endpoint, new_disk};
-    use rustfs_filemeta::{FileInfo, FileMeta, VersionPurgeStatusType};
+    use rustfs_filemeta::{FileInfo, FileMeta};
+    use rustfs_replication::VersionPurgeStatusType;
     use serial_test::serial;
     #[cfg(unix)]
     use std::os::unix::fs::{PermissionsExt, symlink};

crates/scanner/src/storage_api.rs

@@ -15,7 +15,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use rustfs_filemeta::{ReplicateObjectInfo, ReplicationStatusType, ReplicationType, VersionPurgeStatusType};
+use rustfs_replication::{ReplicateObjectInfo, ReplicationStatusType, ReplicationType, VersionPurgeStatusType};
 use serde::{Deserialize, Serialize};
 
 pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::BucketTargetSys as EcstoreBucketTargetSys;