fran/rustfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: narrow test harness compatibility surfaces (#3592)

Browse Source
This commit is contained in:
安正超
2026-06-19 07:10:52 +08:00
committed by GitHub
parent b14e49e84e
commit b1c6578df1
27 changed files with 384 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/kms_keys.rs
+7 -27
View File
@@ -24,7 +24,7 @@ use hyper::{HeaderMap, Method, StatusCode};
use matchit::Params;
use rustfs_config::MAX_ADMIN_REQUEST_BODY_SIZE;
use rustfs_kms::{KmsError, init_global_kms_service_manager, types::*};
use rustfs_policy::policy::action::{Action, AdminAction, KmsAction};
use rustfs_policy::policy::action::{Action, KmsAction};
use s3s::header::CONTENT_TYPE;
use s3s::{Body, S3Request, S3Response, S3Result, s3_error};
use serde::{Deserialize, Serialize};
@@ -126,27 +126,15 @@ async fn kms_encryption_service_from_context() -> Option<std::sync::Arc<rustfs_k
}
fn kms_create_key_actions() -> Vec<Action> {
// RUSTFS_COMPAT_TODO(S-012): keep legacy KMS create-key grants during KMS policy migration. Remove after KMS admin clients and built-in policies use kms:Configure.
vec![
Action::KmsAction(KmsAction::ConfigureAction),
Action::AdminAction(AdminAction::KMSCreateKeyAdminAction),
]
vec![Action::KmsAction(KmsAction::ConfigureAction)]
}
fn kms_describe_key_actions() -> Vec<Action> {
// RUSTFS_COMPAT_TODO(S-012): keep legacy KMS key-status grants during KMS policy migration. Remove after KMS admin clients and built-in policies use kms:DescribeKey.
vec![
Action::KmsAction(KmsAction::DescribeKeyAction),
Action::AdminAction(AdminAction::KMSKeyStatusAdminAction),
]
vec![Action::KmsAction(KmsAction::DescribeKeyAction)]
}
fn kms_list_keys_actions() -> Vec<Action> {
// RUSTFS_COMPAT_TODO(S-012): keep legacy KMS key-status grants during KMS policy migration. Remove after KMS admin clients and built-in policies use kms:ListKeys.
vec![
Action::KmsAction(KmsAction::ListKeysAction),
Action::AdminAction(AdminAction::KMSKeyStatusAdminAction),
]
vec![Action::KmsAction(KmsAction::ListKeysAction)]
}
fn kms_generate_data_key_actions() -> Vec<Action> {
@@ -403,17 +391,9 @@ mod tests {
#[test]
fn kms_key_auth_actions_use_dedicated_kms_actions() {
let create_actions = kms_create_key_actions();
assert_has_action(&create_actions, Action::KmsAction(KmsAction::ConfigureAction));
assert_has_action(&create_actions, Action::AdminAction(AdminAction::KMSCreateKeyAdminAction));
let describe_actions = kms_describe_key_actions();
assert_has_action(&describe_actions, Action::KmsAction(KmsAction::DescribeKeyAction));
assert_has_action(&describe_actions, Action::AdminAction(AdminAction::KMSKeyStatusAdminAction));
let list_actions = kms_list_keys_actions();
assert_has_action(&list_actions, Action::KmsAction(KmsAction::ListKeysAction));
assert_has_action(&list_actions, Action::AdminAction(AdminAction::KMSKeyStatusAdminAction));
assert_eq!(kms_create_key_actions(), vec![Action::KmsAction(KmsAction::ConfigureAction)]);
assert_eq!(kms_describe_key_actions(), vec![Action::KmsAction(KmsAction::DescribeKeyAction)]);
assert_eq!(kms_list_keys_actions(), vec![Action::KmsAction(KmsAction::ListKeysAction)]);
}
#[test]