From 5996a78f3277ffd447826952c643e02f59f0c084 Mon Sep 17 00:00:00 2001 From: g-roliveira <125938946+g-roliveira@users.noreply.github.com> Date: Mon, 16 Feb 2026 13:14:12 -0300 Subject: [PATCH] fix: stabilize unknown-param test and set MinIO region --- .github/workflows/build.yml | 1 + src/config.rs | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf4ca85a..a5375282 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | diff --git a/src/config.rs b/src/config.rs index a08869ca..497623f0 100644 --- a/src/config.rs +++ b/src/config.rs @@ -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", ®ion); query.append_pair("enable_virtual_host_style", "false"); query.append_pair("default_storage_class", "STANDARD"); query.append_pair("access_key_id", &access_key);