Merge pull request #289 from kurtkanaskie/issue288

Fix for issues #287 and #288
apigee · Sep 19, 2023 · 8991204 · 8991204
2 parents f50e88a + fbf5074
commit 8991204
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/cmd/keyaliases/crtka.go b/cmd/keyaliases/crtka.go
@@ -58,7 +58,7 @@ var CreateCmd = &cobra.Command{
 				ignoreExpiry,
 				ignoreNewLine,
 				selfFile)
-		case "pem":
+		case "keycertfile", "pem":
 			_, err = keyaliases.CreateOrUpdateKeyCert(keystoreName,
 				name,
 				false,
@@ -93,7 +93,7 @@ func init() {
 	CreateCmd.Flags().StringVarP(&name, "alias", "s",
 		"", "Name of the key alias")
 	CreateCmd.Flags().StringVarP(&format, "format", "f",
-		"", "Format of the certificate; selfsignedcert, pem or pkcs12 (file extn is .pfx)")
+		"", "Format of the certificate; selfsignedcert, keycertfile (a.k.a pem), or pkcs12 (file extn is .pfx)")
 	CreateCmd.Flags().StringVarP(&password, "password", "p",
 		"", "PKCS12 password")
 	CreateCmd.Flags().BoolVarP(&ignoreExpiry, "exp", "x",

diff --git a/cmd/keyaliases/csr.go b/cmd/keyaliases/csr.go
@@ -41,7 +41,7 @@ func init() {
 	CsrCmd.Flags().StringVarP(&keystoreName, "key", "k",
 		"", "Name of the key store")
 	CsrCmd.Flags().StringVarP(&aliasName, "alias", "s",
-		"", "Name of the key store")
+		"", "Name of the key alias")
 
 	_ = CsrCmd.MarkFlagRequired("alias")
 	_ = CsrCmd.MarkFlagRequired("key")

diff --git a/cmd/keyaliases/getcert.go b/cmd/keyaliases/getcert.go
@@ -41,7 +41,7 @@ func init() {
 	GetctCmd.Flags().StringVarP(&keystoreName, "key", "k",
 		"", "Name of the key store")
 	GetctCmd.Flags().StringVarP(&aliasName, "alias", "s",
-		"", "Name of the key store")
+		"", "Name of the key alias")
 
 	_ = GetctCmd.MarkFlagRequired("alias")
 	_ = GetctCmd.MarkFlagRequired("key")

diff --git a/cmd/keyaliases/getka.go b/cmd/keyaliases/getka.go
@@ -40,9 +40,8 @@ var GetCmd = &cobra.Command{
 func init() {
 	GetCmd.Flags().StringVarP(&keystoreName, "key", "k",
 		"", "Name of the key store")
-
 	GetCmd.Flags().StringVarP(&aliasName, "alias", "s",
-		"", "Name of the key store")
+		"", "Name of the key alias")
 
 	_ = GetCmd.MarkFlagRequired("alias")
 	_ = GetCmd.MarkFlagRequired("key")

diff --git a/cmd/keystores/impks.go b/cmd/keystores/impks.go
@@ -43,7 +43,7 @@ var (
 
 func init() {
 	ImpCmd.Flags().StringVarP(&filePath, "file", "f",
-		"", "File containing API Products")
+		"", "File containing keystores")
 	ImpCmd.Flags().IntVarP(&conn, "conn", "c",
 		4, "Number of connections")