gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-10 15:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics

Browse Source 
# Conflicts:
#	crates/utils/Cargo.toml
#	ecstore/src/store_list_objects.rs
#	iam/src/manager.rs
#	rustfs/src/admin/rpc.rs
This commit is contained in:
houseme
2025-06-20 12:58:47 +08:00
parent d3cc36f6e0 3721c93a55
commit 48d530cb13
38 changed files with 676 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iam/src/sys.rs
+1 -3
View File
@@ -2,15 +2,13 @@ use crate::error::Error as IamError;
use crate::error::is_err_no_such_account;
use crate::error::is_err_no_such_temp_account;
use crate::error::{Error, Result};
use crate::get_global_action_cred;
use crate::manager::IamCache;
use crate::manager::extract_jwt_claims;
use crate::manager::get_default_policyes;
use crate::store::MappedPolicy;
use crate::store::Store;
use crate::store::UserType;
// use ecstore::utils::crypto::base64_decode;
// use ecstore::utils::crypto::base64_encode;
use ecstore::global::get_global_action_cred;
use madmin::AddOrUpdateUserReq;
use madmin::GroupDesc;
use policy::arn::ARN;