gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-07-26 08:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 2827 lifecycle days next midnight (#2833)

Browse Source 
Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
cxymds
2026-05-06 23:00:53 +08:00
committed by GitHub
parent b10db403b6
commit 70be0804ee
3 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/utils/src/envs.rs
+46 -1
View File
@@ -365,6 +365,23 @@ pub fn get_env_opt_u16(key: &str) -> Option<u16> {
pub fn get_env_i32(key: &str, default: i32) -> i32 {
parse_env_value(key).unwrap_or(default)
}
/// Retrieve an i32 environment variable with deprecated aliases and a default fallback.
///
/// Canonical `key` takes precedence over deprecated aliases when both are present.
pub fn get_env_i32_with_aliases(key: &str, deprecated: &[&str], default: i32) -> i32 {
let Some((used_key, value)) = resolve_env_with_aliases(key, deprecated) else {
return default;
};
value.parse::<i32>().unwrap_or_else(|_| {
log_once(&format!("env_invalid_i32:{used_key}"), || {
format!("Invalid i32 value for {used_key}: {value}. Using default behavior.")
});
default
})
}
/// Retrieve an environment variable as a specific type, returning None if not set or parsing fails.
/// 32-bit type: signed i32
///
@@ -664,7 +681,8 @@ pub fn apply_external_env_compat() -> ExternalEnvCompatReport {
#[cfg(test)]
mod tests {
use super::{
apply_external_env_compat, build_external_env_compat_report_from_entries, get_env_bool_with_aliases, get_env_str,
apply_external_env_compat, build_external_env_compat_report_from_entries, get_env_bool_with_aliases,
get_env_i32_with_aliases, get_env_str,
};
fn source_key(suffix: &str) -> String {
@@ -761,6 +779,33 @@ mod tests {
});
}
#[test]
fn i32_alias_value_is_used_when_canonical_missing() {
temp_env::with_var_unset("RUSTFS_TEST_I32", || {
temp_env::with_var("RUSTFS_TEST_I32_LEGACY", Some("12"), || {
assert_eq!(get_env_i32_with_aliases("RUSTFS_TEST_I32", &["RUSTFS_TEST_I32_LEGACY"], 8), 12);
});
});
}
#[test]
fn i32_canonical_value_takes_precedence_over_alias() {
temp_env::with_var("RUSTFS_TEST_I32", Some("9"), || {
temp_env::with_var("RUSTFS_TEST_I32_LEGACY", Some("12"), || {
assert_eq!(get_env_i32_with_aliases("RUSTFS_TEST_I32", &["RUSTFS_TEST_I32_LEGACY"], 8), 9);
});
});
}
#[test]
fn i32_invalid_alias_value_falls_back_to_default() {
temp_env::with_var_unset("RUSTFS_TEST_I32", || {
temp_env::with_var("RUSTFS_TEST_I32_LEGACY", Some("not-an-i32"), || {
assert_eq!(get_env_i32_with_aliases("RUSTFS_TEST_I32", &["RUSTFS_TEST_I32_LEGACY"], 8), 8);
});
});
}
#[test]
fn apply_external_env_compat_copies_missing_rustfs_keys() {
temp_env::with_var("MINIO_ROOT_USER", Some("compat-admin"), || {