Remove the new- prefix on ca token and ca certificate commands.

Fixes smallstep/step#128

Author: maraino

command/ca/ca.go

@@ -31,8 +31,8 @@ $ step ca root root_ca.crt \
 
 Create a new certificate using a token:
 '''
-$ TOKEN=$(step ca new-token internal.example.com)
-$ step ca new-certificate internal.example.com internal.crt internal.key \
+$ TOKEN=$(step ca token internal.example.com)
+$ step ca certificate internal.example.com internal.crt internal.key \
   --token $TOKEN --ca-url https://ca.smallstep.com --root root_ca.crt
 '''
 

command/ca/certificate.go

@@ -22,13 +22,13 @@ import (
 
 func newCertificateCommand() cli.Command {
 	return cli.Command{
-		Name:   "new-certificate",
+		Name:   "certificate",
 		Action: cli.ActionFunc(newCertificateAction),
 		Usage:  "generate a new certificate pair signed by the root certificate",
-		UsageText: `**step ca new-certificate** <hostname> <crt-file> <key-file>
+		UsageText: `**step ca certificate** <hostname> <crt-file> <key-file>
 		[**--token**=<token>] [**--ca-url**=<uri>] [**--root**=<file>]
 		[**--not-before**=<time|duration>] [**--not-after**=<time|duration>]`,
-		Description: `**step ca new-certificate** command generates a new certificate pair
+		Description: `**step ca certificate** command generates a new certificate pair
 
 ## POSITIONAL ARGUMENTS
 
@@ -45,14 +45,14 @@ func newCertificateCommand() cli.Command {
 
 Request a new certificate for a given domain:
 '''
-$ TOKEN=$(step ca new-token internal.example.com)
-$ step ca new-certificate --token $TOKEN internal.example.com internal.crt internal.key
+$ TOKEN=$(step ca token internal.example.com)
+$ step ca certificate --token $TOKEN internal.example.com internal.crt internal.key
 '''
 
 Request a new certificate with a 1h validity:
 '''
-$ TOKEN=$(step ca new-token internal.example.com)
-$ step ca new-certificate --token $TOKEN --not-after=1h internal.example.com internal.crt internal.key
+$ TOKEN=$(step ca token internal.example.com)
+$ step ca certificate --token $TOKEN --not-after=1h internal.example.com internal.crt internal.key
 '''`,
 		Flags: []cli.Flag{
 			tokenFlag,
@@ -86,13 +86,13 @@ func signCertificateCommand() cli.Command {
 
 Sign a new certificate for the given CSR:
 '''
-$ TOKEN=$(step ca new-token internal.example.com)
+$ TOKEN=$(step ca token internal.example.com)
 $ step ca sign --token $TOKEN internal.csr internal.crt
 '''
 
 Sign a new certificate with a 1h validity:
 '''
-$ TOKEN=$(step ca new-token internal.example.com)
+$ TOKEN=$(step ca token internal.example.com)
 $ step ca sign --token $TOKEN --not-after=1h internal.csr internal.crt
 '''`,
 		Flags: []cli.Flag{

command/ca/token.go

@@ -28,14 +28,14 @@ type provisionersSelect struct {
 
 func newTokenCommand() cli.Command {
 	return cli.Command{
-		Name:   "new-token",
+		Name:   "token",
 		Action: cli.ActionFunc(newTokenAction),
 		Usage:  "generates an OTT granting access to the CA",
-		UsageText: `**step ca new-token** <hostname>
+		UsageText: `**step ca token** <hostname>
 		[--**kid**=<kid>] [--**issuer**=<issuer>] [**--ca-url**=<uri>] [**--root**=<file>]
 		[**--not-before**=<time|duration>] [**--not-after**=<time|duration>]
 		[**--password-file**=<file>] [**--output-file**=<file>] [**--key**=<file>]`,
-		Description: `**step ca new-token** command generates a one-time token granting access to the
+		Description: `**step ca token** command generates a one-time token granting access to the
 certificates authority.
 
 ## POSITIONAL ARGUMENTS
@@ -51,33 +51,33 @@ certificates authority.
 
 Get a new token for a DNS:
 '''
-$ step ca new-token internal.example.com
+$ step ca token internal.example.com
 '''
 
 Get a new token for an IP address:
 '''
-$ step ca new-token 192.168.10.10
+$ step ca token 192.168.10.10
 '''
 
 Get a new token that would be valid not, but expires in 30 minutes:
 '''
-$ step ca new-token --not-after 30m internal.example.com
+$ step ca token --not-after 30m internal.example.com
 '''
 
 Get a new token that is not valid for 30 and expires 5 minutes after that:
 '''
-$ step ca new-token --not-before 30m --not-after 35m internal.example.com
+$ step ca token --not-before 30m --not-after 35m internal.example.com
 '''
 
 Get a new token signed with the given private key, the public key must be
 configured in the certificate authority:
 '''
-$ step ca new-token internal.smallstep.com --key token.key
+$ step ca token internal.smallstep.com --key token.key
 '''
 
 Get a new token for a specific provisioner kid, ca-url and root:
 '''
-$ step ca new-token internal.example.com \
+$ step ca token internal.example.com \
     --kid 4vn46fbZT68Uxfs9LBwHkTvrjEvxQqx-W8nnE-qDjts \
     --ca-url https://ca.example.com \
     --root /path/to/root_ca.crt internal.example.com