From: Yuan Zhou <yuan.zhou@intel.com>
Date: Fri, 7 Aug 2015 00:21:53 +0000 (+0800)
Subject: radosgw-admin: Create --secret-key alias for --secret
X-Git-Tag: v10.0.0~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2938fdd580578b5d7f65b569cd131cdd85c61670;p=ceph.git

radosgw-admin: Create --secret-key alias for --secret

Fixes: #5821
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 1140cbdbbc5..1bb28809f25 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -117,7 +117,8 @@ void _usage()
   cout << "   --subuser=<name>          subuser name\n";
   cout << "   --access-key=<key>        S3 access key\n";
   cout << "   --email=<email>\n";
-  cout << "   --secret=<key>            specify secret key\n";
+  cout << "   --secret/--secret-key=<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=<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 33aee1d5eb3..a3d49aab3ec 100644
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -74,7 +74,8 @@
      --subuser=<name>          subuser name
      --access-key=<key>        S3 access key
      --email=<email>
-     --secret=<key>            specify secret key
+     --secret/--secret-key=<key>
+                               specify secret key
      --gen-access-key          generate random access key (for S3)
      --gen-secret              generate random secret key
      --key-type=<type>         key type, options are: swift, s3