fix(ecstore): migrate test-only client import (#6678)

This commit is contained in:
Zhengchao An
2026-08-26 22:26:02 +08:00
committed by GitHub
parent 38e93f553d
commit fda93adafe
2 changed files with 8 additions and 1 deletions
+2 -1
View File
@@ -700,7 +700,6 @@ mod tests {
validate_durable_ilm_record, validate_durable_ilm_record,
}, },
bucket::metadata::{BUCKET_LIFECYCLE_CONFIG, BUCKET_VERSIONING_CONFIG}, bucket::metadata::{BUCKET_LIFECYCLE_CONFIG, BUCKET_VERSIONING_CONFIG},
client::transition_api::ReaderImpl,
config::com, config::com,
core::pools::DecomBucketInfo, core::pools::DecomBucketInfo,
data_movement::SourceCleanupDeleteBarrier, data_movement::SourceCleanupDeleteBarrier,
@@ -750,6 +749,8 @@ mod tests {
#[cfg(feature = "test-util")] #[cfg(feature = "test-util")]
use rustfs_protos::{TIER_MUTATION_RPC_PROTOCOL_VERSION, TierMutationRpcPhase}; use rustfs_protos::{TIER_MUTATION_RPC_PROTOCOL_VERSION, TierMutationRpcPhase};
use rustfs_rio::{Checksum, ChecksumType}; use rustfs_rio::{Checksum, ChecksumType};
#[cfg(feature = "test-util")]
use rustfs_s3_client::transition_api::ReaderImpl;
use rustfs_utils::{ use rustfs_utils::{
CompressionAlgorithm, CompressionAlgorithm,
http::{SUFFIX_COMPRESSION, insert_str}, http::{SUFFIX_COMPRESSION, insert_str},
@@ -641,6 +641,12 @@ for ecstore_private_module in \
"mod ${ecstore_private_module};" \ "mod ${ecstore_private_module};" \
"ECStore legacy ${ecstore_private_module} root module crate-private visibility" "ECStore legacy ${ecstore_private_module} root module crate-private visibility"
done done
ECSTORE_CLIENT_SHIM_IMPORT_HITS_FILE="${TMP_DIR}/ecstore_client_shim_import_hits.txt"
if rg -n --no-heading --glob '*.rs' 'crate::client::|^[[:space:]]+client::' \
"${ROOT_DIR}/crates/ecstore/src" >"${ECSTORE_CLIENT_SHIM_IMPORT_HITS_FILE}"; then
report_failure "ECStore client shim imports must use rustfs_s3_client directly"
cat "${ECSTORE_CLIENT_SHIM_IMPORT_HITS_FILE}" >&2
fi
require_source_line \ require_source_line \
"crates/storage-api/src/lib.rs" \ "crates/storage-api/src/lib.rs" \
"pub use bucket::{BucketInfo, BucketOperations, BucketOptions, DeleteBucketOptions, MakeBucketOptions, SRBucketDeleteOp};" \ "pub use bucket::{BucketInfo, BucketOperations, BucketOptions, DeleteBucketOptions, MakeBucketOptions, SRBucketDeleteOp};" \