gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-25 21:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: import x-amz-checksum header names from the shared constants (#6193)

Browse Source 
Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
Zhengchao An
2026-08-18 13:27:38 +08:00
committed by GitHub
parent 9ef059c908
commit 60eb139db9
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/client/api_get_options.rs
+2 -1
View File
@@ -20,6 +20,7 @@
#![allow(clippy::all)] #![allow(clippy::all)]
use http::{HeaderMap, HeaderName, HeaderValue}; use http::{HeaderMap, HeaderName, HeaderValue};
use rustfs_utils::http::headers::AMZ_CHECKSUM_MODE;
use std::collections::HashMap; use std::collections::HashMap;
use time::OffsetDateTime; use time::OffsetDateTime;
use tracing::warn; use tracing::warn;
@@ -76,7 +77,7 @@ impl GetObjectOptions {
} }
} }
if self.checksum { if self.checksum {
headers.insert(HeaderName::from_static("x-amz-checksum-mode"), HeaderValue::from_static("ENABLED")); headers.insert(HeaderName::from_static(AMZ_CHECKSUM_MODE), HeaderValue::from_static("ENABLED"));
} }
headers headers
} }
crates/ecstore/src/client/transition_api.rs
+10 -6
View File
@@ -54,6 +54,10 @@ use rustfs_config::MAX_S3_CLIENT_RESPONSE_SIZE;
use rustfs_rio::HashReader; use rustfs_rio::HashReader;
use rustfs_utils::HashAlgorithm; use rustfs_utils::HashAlgorithm;
use rustfs_utils::{ use rustfs_utils::{
http::headers::{
AMZ_CHECKSUM_CRC32, AMZ_CHECKSUM_CRC32C, AMZ_CHECKSUM_CRC64NVME, AMZ_CHECKSUM_MODE, AMZ_CHECKSUM_SHA1,
AMZ_CHECKSUM_SHA256,
},
net::get_endpoint_url, net::get_endpoint_url,
retry::{DEFAULT_RETRY_CAP, DEFAULT_RETRY_UNIT, MAX_JITTER, MAX_RETRY, RetryTimer}, retry::{DEFAULT_RETRY_CAP, DEFAULT_RETRY_UNIT, MAX_JITTER, MAX_RETRY, RetryTimer},
}; };
@@ -1383,12 +1387,12 @@ pub(crate) fn to_object_info_for_provider(
}; };
// Extract checksums // Extract checksums
let checksum_crc32 = get_header("x-amz-checksum-crc32"); let checksum_crc32 = get_header(AMZ_CHECKSUM_CRC32);
let checksum_crc32c = get_header("x-amz-checksum-crc32c"); let checksum_crc32c = get_header(AMZ_CHECKSUM_CRC32C);
let checksum_sha1 = get_header("x-amz-checksum-sha1"); let checksum_sha1 = get_header(AMZ_CHECKSUM_SHA1);
let checksum_sha256 = get_header("x-amz-checksum-sha256"); let checksum_sha256 = get_header(AMZ_CHECKSUM_SHA256);
let checksum_crc64nvme = get_header("x-amz-checksum-crc64nvme"); let checksum_crc64nvme = get_header(AMZ_CHECKSUM_CRC64NVME);
let checksum_mode = get_header("x-amz-checksum-mode"); let checksum_mode = get_header(AMZ_CHECKSUM_MODE);
// Build and return the ObjectInfo struct // Build and return the ObjectInfo struct
Ok(ObjectInfo { Ok(ObjectInfo {
rustfs/src/admin/router.rs
+15 -16
View File
@@ -67,6 +67,9 @@ use rustfs_policy::policy::action::{Action, S3Action};
use rustfs_s3_types::EventName; use rustfs_s3_types::EventName;
use rustfs_signer::pre_sign_v4; use rustfs_signer::pre_sign_v4;
use rustfs_utils::egress::{OutboundDnsResolver, OutboundPolicy}; use rustfs_utils::egress::{OutboundDnsResolver, OutboundPolicy};
use rustfs_utils::http::headers::{
AMZ_CHECKSUM_CRC32, AMZ_CHECKSUM_CRC32C, AMZ_CHECKSUM_CRC64NVME, AMZ_CHECKSUM_SHA1, AMZ_CHECKSUM_SHA256, AMZ_CHECKSUM_TYPE,
};
use rustfs_utils::http::{ use rustfs_utils::http::{
SUFFIX_SOURCE_DELETEMARKER, SUFFIX_SOURCE_MTIME, SUFFIX_SOURCE_REPLICATION_CHECK, SUFFIX_SOURCE_REPLICATION_REQUEST, SUFFIX_SOURCE_DELETEMARKER, SUFFIX_SOURCE_MTIME, SUFFIX_SOURCE_REPLICATION_CHECK, SUFFIX_SOURCE_REPLICATION_REQUEST,
SUFFIX_SOURCE_VERSION_ID, get_source_scheme, insert_header, SUFFIX_SOURCE_VERSION_ID, get_source_scheme, insert_header,
@@ -1031,28 +1034,24 @@ fn build_get_object_response_headers(output: &GetObjectOutput, base_headers: &He
)?; )?;
} }
if let Some(checksum_crc32) = &output.checksum_crc32 { if let Some(checksum_crc32) = &output.checksum_crc32 {
insert_string_header(&mut headers, HeaderName::from_static("x-amz-checksum-crc32"), checksum_crc32.clone())?; insert_string_header(&mut headers, HeaderName::from_static(AMZ_CHECKSUM_CRC32), checksum_crc32.clone())?;
} }
if let Some(checksum_crc32c) = &output.checksum_crc32c { if let Some(checksum_crc32c) = &output.checksum_crc32c {
insert_string_header(&mut headers, HeaderName::from_static("x-amz-checksum-crc32c"), checksum_crc32c.clone())?; insert_string_header(&mut headers, HeaderName::from_static(AMZ_CHECKSUM_CRC32C), checksum_crc32c.clone())?;
} }
if let Some(checksum_crc64nvme) = &output.checksum_crc64nvme { if let Some(checksum_crc64nvme) = &output.checksum_crc64nvme {
insert_string_header( insert_string_header(&mut headers, HeaderName::from_static(AMZ_CHECKSUM_CRC64NVME), checksum_crc64nvme.clone())?;
&mut headers,
HeaderName::from_static("x-amz-checksum-crc64nvme"),
checksum_crc64nvme.clone(),
)?;
} }
if let Some(checksum_sha1) = &output.checksum_sha1 { if let Some(checksum_sha1) = &output.checksum_sha1 {
insert_string_header(&mut headers, HeaderName::from_static("x-amz-checksum-sha1"), checksum_sha1.clone())?; insert_string_header(&mut headers, HeaderName::from_static(AMZ_CHECKSUM_SHA1), checksum_sha1.clone())?;
} }
if let Some(checksum_sha256) = &output.checksum_sha256 { if let Some(checksum_sha256) = &output.checksum_sha256 {
insert_string_header(&mut headers, HeaderName::from_static("x-amz-checksum-sha256"), checksum_sha256.clone())?; insert_string_header(&mut headers, HeaderName::from_static(AMZ_CHECKSUM_SHA256), checksum_sha256.clone())?;
} }
if let Some(checksum_type) = &output.checksum_type { if let Some(checksum_type) = &output.checksum_type {
insert_string_header( insert_string_header(
&mut headers, &mut headers,
HeaderName::from_static("x-amz-checksum-type"), HeaderName::from_static(AMZ_CHECKSUM_TYPE),
checksum_type.as_str().to_string(), checksum_type.as_str().to_string(),
)?; )?;
} }
@@ -1114,12 +1113,12 @@ fn clear_object_lambda_variant_headers(headers: &mut HeaderMap) {
http::header::ETAG, http::header::ETAG,
http::header::LAST_MODIFIED, http::header::LAST_MODIFIED,
http::header::EXPIRES, http::header::EXPIRES,
HeaderName::from_static("x-amz-checksum-crc32"), HeaderName::from_static(AMZ_CHECKSUM_CRC32),
HeaderName::from_static("x-amz-checksum-crc32c"), HeaderName::from_static(AMZ_CHECKSUM_CRC32C),
HeaderName::from_static("x-amz-checksum-crc64nvme"), HeaderName::from_static(AMZ_CHECKSUM_CRC64NVME),
HeaderName::from_static("x-amz-checksum-sha1"), HeaderName::from_static(AMZ_CHECKSUM_SHA1),
HeaderName::from_static("x-amz-checksum-sha256"), HeaderName::from_static(AMZ_CHECKSUM_SHA256),
HeaderName::from_static("x-amz-checksum-type"), HeaderName::from_static(AMZ_CHECKSUM_TYPE),
HeaderName::from_static("x-amz-tagging-count"), HeaderName::from_static("x-amz-tagging-count"),
HeaderName::from_static("x-amz-request-route"), HeaderName::from_static("x-amz-request-route"),
HeaderName::from_static("x-amz-request-token"), HeaderName::from_static("x-amz-request-token"),