From 2938fdd580578b5d7f65b569cd131cdd85c61670 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Fri, 7 Aug 2015 08:21:53 +0800 Subject: [PATCH] radosgw-admin: Create --secret-key alias for --secret Fixes: #5821 Signed-off-by: Yuan Zhou --- src/rgw/rgw_admin.cc | 5 +++-- src/test/cli/radosgw-admin/help.t | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 1140cbdbbc5f..1bb28809f25f 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -117,7 +117,8 @@ void _usage() cout << " --subuser= subuser name\n"; cout << " --access-key= S3 access key\n"; cout << " --email=\n"; - cout << " --secret= specify secret key\n"; + cout << " --secret/--secret-key=\n"; + cout << " specify secret key\n"; cout << " --gen-access-key generate random access key (for S3)\n"; cout << " --gen-secret generate random secret key\n"; cout << " --key-type= key type, options are: swift, s3\n"; @@ -1171,7 +1172,7 @@ int main(int argc, char **argv) access_key = val; } else if (ceph_argparse_witharg(args, i, &val, "--subuser", (char*)NULL)) { subuser = val; - } else if (ceph_argparse_witharg(args, i, &val, "--secret", (char*)NULL)) { + } else if (ceph_argparse_witharg(args, i, &val, "--secret", "--secret-key", (char*)NULL)) { secret_key = val; } else if (ceph_argparse_witharg(args, i, &val, "-e", "--email", (char*)NULL)) { user_email = val; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index 33aee1d5eb33..a3d49aab3ec3 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -74,7 +74,8 @@ --subuser= subuser name --access-key= S3 access key --email= - --secret= specify secret key + --secret/--secret-key= + specify secret key --gen-access-key generate random access key (for S3) --gen-secret generate random secret key --key-type= key type, options are: swift, s3 -- 2.47.3