RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43170 from thotz/removeusercaps-in-modifyuser

Browse Source 
rgw: remove dead code for user-caps from RGWOp_User_Modify

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
J. Eric Ivancich 2021-10-27 09:31:12 -04:00 committed by GitHub
commit 71d68c7d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/radosgw/adminops.rst
View File

@ -603,13 +603,6 @@ Request Parameters
:Example: ``s3``
:Required: No
``user-caps``
:Description: User capabilities.
:Type: String
:Example: ``usage=read, write; users=read``
:Required: No
``max-buckets``
:Description: Specify the maximum number of buckets the user can own.

3
src/rgw/rgw_rest_user.cc
View File

@ -257,7 +257,6 @@ void RGWOp_User_Modify::execute(optional_yield y)
std::string access_key;
std::string secret_key;
std::string key_type_str;
std::string caps;
std::string op_mask_str;
std::string default_placement_str;
std::string placement_tags_str;
@ -278,7 +277,6 @@ void RGWOp_User_Modify::execute(optional_yield y)
RESTArgs::get_string(s, "email", email, &email, &email_set);
RESTArgs::get_string(s, "access-key", access_key, &access_key);
RESTArgs::get_string(s, "secret-key", secret_key, &secret_key);
RESTArgs::get_string(s, "user-caps", caps, &caps);
RESTArgs::get_bool(s, "generate-key", false, &gen_key);
RESTArgs::get_bool(s, "suspended", false, &suspended);
RESTArgs::get_int32(s, "max-buckets", RGW_DEFAULT_MAX_BUCKETS, &max_buckets, &quota_set);
@ -301,7 +299,6 @@ void RGWOp_User_Modify::execute(optional_yield y)
if (email_set)
op_state.set_user_email(email);
op_state.set_caps(caps);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);