refactor: narrow local compat re-exports (#3711)

rustfs/src/admin/router_storage_compat.rs

@@ -12,4 +12,43 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use crate::admin::storage_compat::*;
+pub(crate) use crate::admin::storage_compat::{
+    AdminReplicationConfigExt, AdminVersioningConfigExt, GLOBAL_BOOT_TIME, PeerRestClient, StorageError,
+    get_global_bucket_monitor, get_global_deployment_id, get_global_notification_sys, get_global_region,
+    read_admin_config_without_migrate,
+};
+
+pub(crate) mod bandwidth {
+    pub(crate) mod monitor {
+        pub(crate) use crate::admin::storage_compat::bandwidth::monitor::BandwidthDetails;
+    }
+}
+
+pub(crate) mod bucket_target_sys {
+    pub(crate) use crate::admin::storage_compat::bucket_target_sys::{
+        AdvancedPutOptions, BucketTargetSys, PutObjectOptions, RemoveObjectOptions, S3ClientError, TargetClient,
+    };
+}
+
+pub(crate) mod metadata {
+    pub(crate) use crate::admin::storage_compat::metadata::BUCKET_TARGETS_FILE;
+}
+
+pub(crate) use crate::admin::storage_compat::metadata_sys;
+
+pub(crate) mod replication {
+    pub(crate) use crate::admin::storage_compat::replication::{
+        BucketReplicationResyncStatus, BucketStats, GLOBAL_REPLICATION_STATS, ObjectOpts, ResyncOpts, get_global_replication_pool,
+    };
+
+    #[cfg(test)]
+    pub(crate) use crate::admin::storage_compat::replication::{ResyncStatusType, TargetReplicationResyncStatus};
+}
+
+pub(crate) mod target {
+    pub(crate) use crate::admin::storage_compat::target::{BucketTarget, BucketTargetType, BucketTargets};
+}
+
+pub(crate) mod versioning_sys {
+    pub(crate) use crate::admin::storage_compat::versioning_sys::BucketVersioningSys;
+}

rustfs/src/admin/service/storage_compat.rs

@@ -12,4 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use crate::admin::storage_compat::*;
+pub(crate) use crate::admin::storage_compat::{
+    Error, STORAGE_CLASS_SUB_SYS, get_global_notification_sys, read_admin_config, read_admin_config_without_migrate,
+    save_admin_config, set_global_storage_class,
+};
+
+#[cfg(test)]
+pub(crate) use crate::admin::storage_compat::init_admin_config_defaults;
+
+#[cfg(test)]
+pub(crate) mod metadata {
+    pub(crate) use crate::admin::storage_compat::metadata::{BUCKET_LIFECYCLE_CONFIG, BUCKET_REPLICATION_CONFIG};
+}
+
+pub(crate) mod storageclass {
+    pub(crate) use crate::admin::storage_compat::storageclass::lookup_config;
+}

rustfs/src/app/context/storage_compat.rs

@@ -12,4 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use crate::app::storage_compat::*;
+pub(crate) use crate::app::storage_compat::{
+    ECStore, EndpointServerPools, TierConfigMgr, get_global_endpoints_opt, get_global_region, get_global_tier_config_mgr,
+    new_object_layer_fn, set_object_store_resolver,
+};
+
+pub(crate) mod metadata_sys {
+    pub(crate) use crate::app::storage_compat::metadata_sys::{BucketMetadataSys, get_global_bucket_metadata_sys};
+}
+
+#[cfg(test)]
+pub(crate) use crate::app::storage_compat::{Endpoint, Endpoints, PoolEndpoints, init_local_disks};

rustfs/src/storage/core_storage_compat.rs

@@ -12,4 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use crate::storage::storage_compat::*;
+pub(crate) use crate::storage::storage_compat::{
+    BUCKET_ACCELERATE_CONFIG, BUCKET_LOGGING_CONFIG, BUCKET_REQUEST_PAYMENT_CONFIG, BUCKET_VERSIONING_CONFIG,
+    BUCKET_WEBSITE_CONFIG, BucketVersioningSys, ECStore, Error, GetObjectReader, OBJECT_LOCK_CONFIG, ObjectInfo, ObjectOptions,
+    PolicySys, PutObjReader, Result, StorageError, StorageReplicationConfigExt, StorageVersioningConfigExt, WriteEncryption,
+    add_object_lock_years, check_retention_for_modification, decode_tags, decode_tags_to_map, delete_bucket_metadata_config,
+    encode_tags, get_bucket_accelerate_config, get_bucket_cors_config, get_bucket_logging_config, get_bucket_metadata,
+    get_bucket_object_lock_config, get_bucket_policy_raw, get_bucket_replication_config, get_bucket_request_payment_config,
+    get_bucket_sse_config, get_bucket_website_config, get_global_region, get_public_access_block_config, is_err_bucket_not_found,
+    is_err_object_not_found, is_err_version_not_found, record_replication_proxy, resolve_object_store_handle, serialize,
+    update_bucket_metadata_config,
+};
+
+#[cfg(test)]
+pub(crate) use crate::storage::storage_compat::{
+    BucketMetadata, DEFAULT_READ_BUFFER_SIZE, bucket_metadata_sys_initialized, get_global_bucket_metadata_sys,
+    set_bucket_metadata,
+};

rustfs/src/storage/rpc/storage_compat.rs

@@ -12,4 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use crate::storage::storage_compat::*;
+pub(crate) use crate::storage::storage_compat::{
+    CollectMetricsOpts, DEFAULT_READ_BUFFER_SIZE, DeleteOptions, DiskError, DiskInfoOptions, DiskStore, FileInfoVersions,
+    LocalPeerS3Client, MetricType, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, ReadMultipleReq, ReadMultipleResp, ReadOptions, Result,
+    SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC, StorageDiskRpcExt, StoragePeerS3ClientExt, UpdateMetadataOpts,
+    WalkDirOptions, all_local_disk_path, collect_local_metrics, find_local_disk_by_ref, get_global_lock_client,
+    get_local_server_property, load_bucket_metadata, reload_transition_tier_config, resolve_object_store_handle,
+    set_bucket_metadata, verify_rpc_signature,
+};
+
+#[cfg(test)]
+pub(crate) use crate::storage::storage_compat::{Error, STORAGE_CLASS_SUB_SYS};