refactor: remove remaining compatibility bridges (#3738)

This commit is contained in:
Zhengchao An
2026-06-22 16:53:14 +08:00
committed by GitHub
parent a66350b645
commit b63b076275
37 changed files with 324 additions and 691 deletions
+1 -4
View File
@@ -1,10 +1,7 @@
#![no_main]
#[path = "bucket_validation/storage_compat.rs"]
mod storage_compat;
use libfuzzer_sys::fuzz_target;
use self::storage_compat::{
use rustfs_ecstore::api::bucket::utils::{
check_bucket_and_object_names, check_list_objs_args, check_valid_bucket_name_strict, is_meta_bucketname,
};
@@ -1,36 +0,0 @@
// Copyright 2024 RustFS Team
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use rustfs_ecstore::api::bucket as ecstore_bucket;
use rustfs_ecstore::api::error as ecstore_error;
pub(crate) fn check_bucket_and_object_names(bucket: &str, object: &str) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_bucket_and_object_names(bucket, object)
}
pub(crate) fn check_list_objs_args(
bucket: &str,
prefix: &str,
marker: &Option<String>,
) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_list_objs_args(bucket, prefix, marker)
}
pub(crate) fn check_valid_bucket_name_strict(bucket_name: &str) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_valid_bucket_name_strict(bucket_name)
}
pub(crate) fn is_meta_bucketname(name: &str) -> bool {
ecstore_bucket::utils::is_meta_bucketname(name)
}
+3 -4
View File
@@ -1,10 +1,9 @@
#![no_main]
#[path = "path_containment/storage_compat.rs"]
mod storage_compat;
use libfuzzer_sys::fuzz_target;
use self::storage_compat::{check_object_name_for_length_and_slash, has_bad_path_component, is_valid_object_prefix};
use rustfs_ecstore::api::bucket::utils::{
check_object_name_for_length_and_slash, has_bad_path_component, is_valid_object_prefix,
};
use rustfs_utils::path::{clean, path_join};
use std::path::{Path, PathBuf};
@@ -1,31 +0,0 @@
// Copyright 2024 RustFS Team
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use rustfs_ecstore::api::bucket as ecstore_bucket;
use rustfs_ecstore::api::error as ecstore_error;
pub(crate) fn check_object_name_for_length_and_slash(
bucket: &str,
object: &str,
) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_object_name_for_length_and_slash(bucket, object)
}
pub(crate) fn has_bad_path_component(path: &str) -> bool {
ecstore_bucket::utils::has_bad_path_component(path)
}
pub(crate) fn is_valid_object_prefix(object: &str) -> bool {
ecstore_bucket::utils::is_valid_object_prefix(object)
}