refactor: prune admin app compat aliases (#3690)

2026-08-09 14:49:25 +00:00 · 2026-06-21 16:40:40 +08:00
parent 84d662c312
commit 9d510e9d5b
5 changed files with 243 additions and 24 deletions
@@ -12,11 +12,69 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+pub(crate) mod bandwidth {
+    pub(crate) mod monitor {
+        pub(crate) use rustfs_ecstore::api::bucket::bandwidth::monitor::BandwidthDetails;
+    }
+}
+pub(crate) mod bucket_target_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::{
+        AdvancedPutOptions, BucketTargetError, BucketTargetSys, PutObjectOptions, RemoveObjectOptions, S3ClientError,
+        TargetClient,
+    };
+}
+pub(crate) mod lifecycle {
+    pub(crate) mod bucket_lifecycle_ops {
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_ops::GLOBAL_TransitionState;
+    }
+
+    pub(crate) mod tier_last_day_stats {
+        #[cfg(test)]
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::tier_last_day_stats::LastDayTierStats;
+    }
+}
+pub(crate) mod metadata {
+    pub(crate) use rustfs_ecstore::api::bucket::metadata::{
+        BUCKET_CORS_CONFIG, BUCKET_LIFECYCLE_CONFIG, BUCKET_NOTIFICATION_CONFIG, BUCKET_POLICY_CONFIG, BUCKET_QUOTA_CONFIG_FILE,
+        BUCKET_REPLICATION_CONFIG, BUCKET_SSECONFIG, BUCKET_TAGGING_CONFIG, BUCKET_TARGETS_FILE, BUCKET_VERSIONING_CONFIG,
+        BucketMetadata, OBJECT_LOCK_CONFIG, table_catalog_path_hash,
+    };
+}
+pub(crate) mod metadata_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::metadata_sys::{
+        BucketMetadataSys, delete, get, get_bucket_policy, get_bucket_targets_config, get_config_from_disk, get_lifecycle_config,
+        get_notification_config, get_object_lock_config, get_quota_config, get_replication_config, get_sse_config,
+        get_tagging_config, get_versioning_config, list_bucket_targets, update,
+    };
+}
+pub(crate) mod quota {
+    pub(crate) mod checker {
+        pub(crate) use rustfs_ecstore::api::bucket::quota::checker::QuotaChecker;
+    }
+
+    pub(crate) use rustfs_ecstore::api::bucket::quota::{BucketQuota, QuotaError, QuotaOperation};
+}
+pub(crate) mod replication {
+    pub(crate) use rustfs_ecstore::api::bucket::replication::{
+        BucketReplicationResyncStatus, BucketStats, GLOBAL_REPLICATION_STATS, ObjectOpts, ReplicationConfigurationExt,
+        ResyncOpts, get_global_replication_pool,
+    };
+    #[cfg(test)]
+    pub(crate) use rustfs_ecstore::api::bucket::replication::{ResyncStatusType, TargetReplicationResyncStatus};
+}
+pub(crate) mod target {
+    pub(crate) use rustfs_ecstore::api::bucket::target::{ARN, BucketTarget, BucketTargetType, BucketTargets, Credentials};
+}
+pub(crate) mod utils {
+    pub(crate) use rustfs_ecstore::api::bucket::utils::{deserialize, is_valid_object_prefix, serialize};
+}
+pub(crate) mod versioning {
+    pub(crate) use rustfs_ecstore::api::bucket::versioning::VersioningApi;
+}
+pub(crate) mod versioning_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::versioning_sys::BucketVersioningSys;
+}
 pub(crate) use rustfs_ecstore::api::bucket::lifecycle::tier_last_day_stats::DailyAllTierStats;
-pub(crate) use rustfs_ecstore::api::bucket::{
-    bandwidth, bucket_target_sys, lifecycle, metadata, metadata_sys, quota, replication, target, utils, versioning,
-    versioning_sys,
-};
 pub(crate) use rustfs_ecstore::api::capacity::is_reserved_or_invalid_bucket;
 pub(crate) use rustfs_ecstore::api::client::admin_handler_utils::AdminError;
 pub(crate) use rustfs_ecstore::api::config::com::{
@@ -24,7 +82,12 @@ pub(crate) use rustfs_ecstore::api::config::com::{
    read_config_without_migrate as read_admin_config_without_migrate, save_config as save_admin_config,
    save_server_config as save_admin_server_config,
 };
-pub(crate) use rustfs_ecstore::api::config::{init as init_admin_config_defaults, set_global_storage_class, storageclass};
+pub(crate) mod storageclass {
+    pub(crate) use rustfs_ecstore::api::config::storageclass::{
+        INLINE_BLOCK_ENV, OPTIMIZE_ENV, RRS, RRS_ENV, STANDARD, STANDARD_ENV, lookup_config,
+    };
+}
+pub(crate) use rustfs_ecstore::api::config::{init as init_admin_config_defaults, set_global_storage_class};
 pub(crate) use rustfs_ecstore::api::data_usage::load_data_usage_from_backend;
 pub(crate) use rustfs_ecstore::api::disk::RUSTFS_META_BUCKET;
 #[cfg(test)]
@@ -13,18 +13,124 @@
 // limitations under the License.

 pub(crate) use rustfs_ecstore::api::admin::get_server_info;
-pub(crate) use rustfs_ecstore::api::bucket::{
-    bucket_target_sys, lifecycle, metadata, metadata_sys, object_lock, policy_sys, quota, replication, tagging, target, utils,
-    versioning, versioning_sys,
-};
+pub(crate) mod bucket_target_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::BucketTargetSys;
+}
+pub(crate) mod lifecycle {
+    pub(crate) mod bucket_lifecycle_audit {
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_audit::LcEventSrc;
+    }
+
+    pub(crate) mod bucket_lifecycle_ops {
+        #[cfg(test)]
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_ops::init_background_expiry;
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_ops::{
+            GLOBAL_ExpiryState, RestoreRequestOps, enqueue_expiry_for_existing_objects, enqueue_transition_for_existing_objects,
+            enqueue_transition_immediate, post_restore_opts, validate_transition_tier,
+        };
+    }
+
+    pub(crate) mod lifecycle_contract {
+        #[cfg(test)]
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::lifecycle::IlmAction;
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::lifecycle::{
+            Event, Lifecycle, ObjectOpts, TRANSITION_COMPLETE, TransitionOptions, expected_expiry_time,
+        };
+    }
+    pub(crate) use lifecycle_contract as lifecycle;
+
+    pub(crate) mod tier_delete_journal {
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::tier_delete_journal::persist_tier_delete_journal_entry;
+    }
+
+    pub(crate) mod tier_sweeper {
+        pub(crate) use rustfs_ecstore::api::bucket::lifecycle::tier_sweeper::{
+            transitioned_delete_journal_entry, transitioned_force_delete_journal_entry,
+        };
+    }
+}
+pub(crate) mod metadata {
+    #[cfg(test)]
+    pub(crate) use rustfs_ecstore::api::bucket::metadata::OBJECT_LOCK_CONFIG;
+    pub(crate) use rustfs_ecstore::api::bucket::metadata::{
+        BUCKET_CORS_CONFIG, BUCKET_LIFECYCLE_CONFIG, BUCKET_NOTIFICATION_CONFIG, BUCKET_POLICY_CONFIG,
+        BUCKET_PUBLIC_ACCESS_BLOCK_CONFIG, BUCKET_REPLICATION_CONFIG, BUCKET_SSECONFIG, BUCKET_TAGGING_CONFIG,
+        BUCKET_TARGETS_FILE, BUCKET_VERSIONING_CONFIG,
+    };
+}
+pub(crate) mod metadata_sys {
+    #[cfg(test)]
+    pub(crate) use rustfs_ecstore::api::bucket::metadata_sys::init_bucket_metadata_sys;
+    pub(crate) use rustfs_ecstore::api::bucket::metadata_sys::{
+        BucketMetadataSys, delete, get_bucket_policy, get_bucket_policy_raw, get_bucket_targets_config, get_cors_config,
+        get_global_bucket_metadata_sys, get_lifecycle_config, get_notification_config, get_object_lock_config,
+        get_public_access_block_config, get_replication_config, get_sse_config, get_tagging_config, update,
+    };
+}
+pub(crate) mod object_api_utils {
+    pub(crate) use rustfs_ecstore::api::client::object_api_utils::to_s3s_etag;
+}
+pub(crate) mod object_lock {
+    pub(crate) mod objectlock {
+        pub(crate) use rustfs_ecstore::api::bucket::object_lock::objectlock::{
+            get_object_legalhold_meta, get_object_retention_meta,
+        };
+    }
+
+    pub(crate) mod objectlock_sys {
+        pub(crate) use rustfs_ecstore::api::bucket::object_lock::objectlock_sys::{
+            BucketObjectLockSys, check_object_lock_for_deletion, is_retention_active,
+        };
+    }
+
+    pub(crate) use rustfs_ecstore::api::bucket::object_lock::ObjectLockApi;
+}
+pub(crate) mod policy_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::policy_sys::PolicySys;
+}
+pub(crate) mod quota {
+    pub(crate) mod checker {
+        pub(crate) use rustfs_ecstore::api::bucket::quota::checker::QuotaChecker;
+    }
+
+    pub(crate) use rustfs_ecstore::api::bucket::quota::QuotaOperation;
+}
+pub(crate) mod replication {
+    pub(crate) use rustfs_ecstore::api::bucket::replication::{
+        DeletedObjectReplicationInfo, ObjectOpts, ReplicationConfigurationExt, check_replicate_delete,
+        get_must_replicate_options, must_replicate, schedule_replication, schedule_replication_delete,
+    };
+}
+pub(crate) mod tagging {
+    pub(crate) use rustfs_ecstore::api::bucket::tagging::decode_tags;
+}
+pub(crate) mod target {
+    #[cfg(test)]
+    pub(crate) use rustfs_ecstore::api::bucket::target::BucketTarget;
+    pub(crate) use rustfs_ecstore::api::bucket::target::{BucketTargetType, BucketTargets};
+}
+pub(crate) mod utils {
+    pub(crate) use rustfs_ecstore::api::bucket::utils::serialize;
+}
+pub(crate) mod versioning {
+    pub(crate) use rustfs_ecstore::api::bucket::versioning::VersioningApi;
+}
+pub(crate) mod versioning_sys {
+    pub(crate) use rustfs_ecstore::api::bucket::versioning_sys::BucketVersioningSys;
+}
 pub(crate) use rustfs_ecstore::api::capacity::{
    PoolDecommissionInfo, PoolStatus, get_total_usable_capacity, get_total_usable_capacity_free,
 };
-pub(crate) use rustfs_ecstore::api::client::object_api_utils;
 #[cfg(test)]
-pub(crate) use rustfs_ecstore::api::client::transition_api;
+pub(crate) mod transition_api {
+    pub(crate) use rustfs_ecstore::api::client::transition_api::{ReadCloser, ReaderImpl};
+}
 pub(crate) use rustfs_ecstore::api::compression::{MIN_DISK_COMPRESSIBLE_SIZE, is_disk_compressible};
-pub(crate) use rustfs_ecstore::api::config::storageclass;
+pub(crate) mod storageclass {
+    pub(crate) use rustfs_ecstore::api::config::storageclass::STANDARD;
+    #[cfg(test)]
+    pub(crate) use rustfs_ecstore::api::config::storageclass::STANDARD_IA;
+}
 pub(crate) use rustfs_ecstore::api::data_usage::{
    apply_bucket_usage_memory_overlay, load_data_usage_from_backend, record_bucket_object_delete_memory,
    record_bucket_object_write_memory,