gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-07 20:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(odm): use app facade for listing wire types

Browse Source
This commit is contained in:
overtrue
2026-09-05 10:07:36 +08:00
parent adf7453497
commit 1e50c328fa
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/app/bucket_list_through.rs
+3 -3
View File
@@ -432,10 +432,10 @@ mod tests {
use crate::app::storage_api::bucket_usecase::bucket::on_demand_migration::{ use crate::app::storage_api::bucket_usecase::bucket::on_demand_migration::{
FilterConfig, OnDemandMigrationConfig, PathStyle, PolicyConfig, Provider, SourceConfig, SourceCredentials, TlsConfig, FilterConfig, OnDemandMigrationConfig, PathStyle, PolicyConfig, Provider, SourceConfig, SourceCredentials, TlsConfig,
}; };
use crate::app::storage_api::bucket_usecase::s3::{ListObjectsV2Input, ListObjectsV2Output, S3Request, S3Response};
use crate::app::storage_api::test::StoragePutObjReader; use crate::app::storage_api::test::StoragePutObjReader;
use crate::app::storage_api::test::contract::bucket::{BucketOperations as _, MakeBucketOptions}; use crate::app::storage_api::test::contract::bucket::{BucketOperations as _, MakeBucketOptions};
use crate::app::storage_api::test::contract::object::ObjectIO as _; use crate::app::storage_api::test::contract::object::ObjectIO as _;
use s3s::{S3Request, dto::ListObjectsV2Input};
use std::time::Duration; use std::time::Duration;
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
@@ -621,7 +621,7 @@ mod tests {
policy: SourceErrorPolicy, policy: SourceErrorPolicy,
resume_source: Option<&str>, resume_source: Option<&str>,
filter_prefix: Option<&str>, filter_prefix: Option<&str>,
) -> (S3Result<s3s::S3Response<s3s::dto::ListObjectsV2Output>>, Vec<String>) { ) -> (S3Result<S3Response<ListObjectsV2Output>>, Vec<String>) {
let store = shared_gating_ecstore().await; let store = shared_gating_ecstore().await;
crate::app::runtime_sources::install_test_app_context(Arc::clone(&store)).await; crate::app::runtime_sources::install_test_app_context(Arc::clone(&store)).await;
let bucket = format!("odm-list-{}", uuid::Uuid::new_v4().simple()); let bucket = format!("odm-list-{}", uuid::Uuid::new_v4().simple());
@@ -842,7 +842,7 @@ mod tests {
}); });
} }
fn assert_source_policy_result(result: S3Result<s3s::S3Response<s3s::dto::ListObjectsV2Output>>, policy: SourceErrorPolicy) { fn assert_source_policy_result(result: S3Result<S3Response<ListObjectsV2Output>>, policy: SourceErrorPolicy) {
match policy { match policy {
SourceErrorPolicy::Propagate => { SourceErrorPolicy::Propagate => {
let error = result.expect_err("propagate must expose malformed pagination"); let error = result.expect_err("propagate must expose malformed pagination");
rustfs/src/app/storage_api.rs
+5 -3
View File
@@ -29,11 +29,13 @@ pub(crate) fn EndpointServerPools(
pub(crate) mod s3 { pub(crate) mod s3 {
#[cfg(test)] #[cfg(test)]
pub(crate) use s3s::dto::{ pub(crate) use s3s::dto::{
BucketVersioningStatus, DeleteMarkerReplication, DeleteMarkerReplicationStatus, Destination, ReplicationConfiguration, BucketVersioningStatus, DeleteMarkerReplication, DeleteMarkerReplicationStatus, Destination, ListObjectsV2Input,
ReplicationRule, ReplicationRuleFilter, ReplicationRuleStatus, ServerSideEncryptionByDefault, ListObjectsV2Output, ReplicationConfiguration, ReplicationRule, ReplicationRuleFilter, ReplicationRuleStatus,
ServerSideEncryptionConfiguration, ServerSideEncryptionRule, Tag, VersioningConfiguration, ServerSideEncryptionByDefault, ServerSideEncryptionConfiguration, ServerSideEncryptionRule, Tag, VersioningConfiguration,
}; };
pub(crate) use s3s::{S3Error, S3ErrorCode, S3Result}; pub(crate) use s3s::{S3Error, S3ErrorCode, S3Result};
#[cfg(test)]
pub(crate) use s3s::{S3Request, S3Response};
} }
pub(crate) mod admin { pub(crate) mod admin {