Backup_Repos/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-05-08 12:34:43 +02:00
Code Issues Projects Releases Wiki Activity

fix: stabilize unknown-param test and set MinIO region

Browse source
This commit is contained in:
g-roliveira 2026-02-16 13:14:12 -03:00
parent 2b60e58565
commit 5996a78f32
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View file

@ -291,6 +291,7 @@ jobs:
VW_S3_MINIO_ENDPOINT: "http://127.0.0.1:9000"
VW_S3_MINIO_BUCKET: "vaultwarden-test"
VW_S3_MINIO_ROOT: "/vaultwarden-integration"
VW_S3_MINIO_REGION: "auto"
VW_S3_MINIO_ACCESS_KEY: "minioadmin"
VW_S3_MINIO_SECRET_KEY: "minioadmin"
run: |

13
src/config.rs
View file

@ -1695,10 +1695,13 @@ mod s3_tests {
#[test]
fn test_parse_s3_config_rejects_unknown_parameter() {
let error =
parse_s3_config_for_path("s3://vw/path?unknown_param=value").expect_err("unknown params should fail");
let error_string = error.to_string();
assert!(error_string.contains("Unknown S3 OpenDAL parameter"));
let error = parse_s3_config_for_path("s3://vw/path?region=auto&unknown_param=value")
.expect_err("unknown params should fail");
let error_message = error.message().to_string();
assert!(
error_message.contains("Unknown S3 OpenDAL parameter") && error_message.contains("unknown_param"),
"error message: {error_message}"
);
}
#[test]
@ -1712,9 +1715,11 @@ mod s3_tests {
}
let access_key = std::env::var("VW_S3_MINIO_ACCESS_KEY").unwrap_or_else(|_| "minioadmin".to_string());
let secret_key = std::env::var("VW_S3_MINIO_SECRET_KEY").unwrap_or_else(|_| "minioadmin".to_string());
let region = std::env::var("VW_S3_MINIO_REGION").unwrap_or_else(|_| "auto".to_string());
let mut query = url::form_urlencoded::Serializer::new(String::new());
query.append_pair("endpoint", &endpoint);
query.append_pair("region", &region);
query.append_pair("enable_virtual_host_style", "false");
query.append_pair("default_storage_class", "STANDARD");
query.append_pair("access_key_id", &access_key);