From 74d86260ab1566b3dfdddf45a15a3d587e9d8418 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Wed, 23 May 2018 09:56:05 -0400
Subject: [PATCH] Add missing flags to KV commands and simplify boilerplate

---
 command/commands.go | 366 +++++++++-----------------------------------
 1 file changed, 74 insertions(+), 292 deletions(-)

diff --git a/command/commands.go b/command/commands.go
index 7b9e4a60e58c..4bf2ba7e736f 100644
--- a/command/commands.go
+++ b/command/commands.go
@@ -211,359 +211,211 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
 		},
 	}
 
+	getBaseCommand := func() *BaseCommand {
+		return &BaseCommand{
+			UI:          ui,
+			tokenHelper: runOpts.TokenHelper,
+			flagAddress: runOpts.Address,
+		}
+	}
+
 	Commands = map[string]cli.CommandFactory{
 		"audit": func() (cli.Command, error) {
 			return &AuditCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"audit disable": func() (cli.Command, error) {
 			return &AuditDisableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"audit enable": func() (cli.Command, error) {
 			return &AuditEnableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"audit list": func() (cli.Command, error) {
 			return &AuditListCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"auth tune": func() (cli.Command, error) {
 			return &AuthTuneCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"auth": func() (cli.Command, error) {
 			return &AuthCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
-				Handlers: loginHandlers,
+				BaseCommand: getBaseCommand(),
+				Handlers:    loginHandlers,
 			}, nil
 		},
 		"auth disable": func() (cli.Command, error) {
 			return &AuthDisableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"auth enable": func() (cli.Command, error) {
 			return &AuthEnableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"auth help": func() (cli.Command, error) {
 			return &AuthHelpCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
-				Handlers: loginHandlers,
+				BaseCommand: getBaseCommand(),
+				Handlers:    loginHandlers,
 			}, nil
 		},
 		"auth list": func() (cli.Command, error) {
 			return &AuthListCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"delete": func() (cli.Command, error) {
 			return &DeleteCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"lease": func() (cli.Command, error) {
 			return &LeaseCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"lease renew": func() (cli.Command, error) {
 			return &LeaseRenewCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"lease revoke": func() (cli.Command, error) {
 			return &LeaseRevokeCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"list": func() (cli.Command, error) {
 			return &ListCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"login": func() (cli.Command, error) {
 			return &LoginCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
-				Handlers: loginHandlers,
+				BaseCommand: getBaseCommand(),
+				Handlers:    loginHandlers,
 			}, nil
 		},
 		"operator": func() (cli.Command, error) {
 			return &OperatorCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator generate-root": func() (cli.Command, error) {
 			return &OperatorGenerateRootCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator init": func() (cli.Command, error) {
 			return &OperatorInitCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator key-status": func() (cli.Command, error) {
 			return &OperatorKeyStatusCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator rekey": func() (cli.Command, error) {
 			return &OperatorRekeyCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator rotate": func() (cli.Command, error) {
 			return &OperatorRotateCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator seal": func() (cli.Command, error) {
 			return &OperatorSealCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator step-down": func() (cli.Command, error) {
 			return &OperatorStepDownCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"operator unseal": func() (cli.Command, error) {
 			return &OperatorUnsealCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"path-help": func() (cli.Command, error) {
 			return &PathHelpCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy": func() (cli.Command, error) {
 			return &PolicyCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy delete": func() (cli.Command, error) {
 			return &PolicyDeleteCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy fmt": func() (cli.Command, error) {
 			return &PolicyFmtCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy list": func() (cli.Command, error) {
 			return &PolicyListCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy read": func() (cli.Command, error) {
 			return &PolicyReadCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"policy write": func() (cli.Command, error) {
 			return &PolicyWriteCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"read": func() (cli.Command, error) {
 			return &ReadCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets": func() (cli.Command, error) {
 			return &SecretsCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets disable": func() (cli.Command, error) {
 			return &SecretsDisableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets enable": func() (cli.Command, error) {
 			return &SecretsEnableCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets list": func() (cli.Command, error) {
 			return &SecretsListCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets move": func() (cli.Command, error) {
 			return &SecretsMoveCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"secrets tune": func() (cli.Command, error) {
 			return &SecretsTuneCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"server": func() (cli.Command, error) {
@@ -583,193 +435,123 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
 		},
 		"ssh": func() (cli.Command, error) {
 			return &SSHCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"status": func() (cli.Command, error) {
 			return &StatusCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token": func() (cli.Command, error) {
 			return &TokenCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token create": func() (cli.Command, error) {
 			return &TokenCreateCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token capabilities": func() (cli.Command, error) {
 			return &TokenCapabilitiesCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token lookup": func() (cli.Command, error) {
 			return &TokenLookupCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token renew": func() (cli.Command, error) {
 			return &TokenRenewCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"token revoke": func() (cli.Command, error) {
 			return &TokenRevokeCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"unwrap": func() (cli.Command, error) {
 			return &UnwrapCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"version": func() (cli.Command, error) {
 			return &VersionCommand{
 				VersionInfo: version.GetVersion(),
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"write": func() (cli.Command, error) {
 			return &WriteCommand{
-				BaseCommand: &BaseCommand{
-					UI:          ui,
-					tokenHelper: runOpts.TokenHelper,
-					flagAddress: runOpts.Address,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv": func() (cli.Command, error) {
 			return &KVCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv put": func() (cli.Command, error) {
 			return &KVPutCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv patch": func() (cli.Command, error) {
 			return &KVPatchCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv get": func() (cli.Command, error) {
 			return &KVGetCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv delete": func() (cli.Command, error) {
 			return &KVDeleteCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv list": func() (cli.Command, error) {
 			return &KVListCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv destroy": func() (cli.Command, error) {
 			return &KVDestroyCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv undelete": func() (cli.Command, error) {
 			return &KVUndeleteCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv enable-versioning": func() (cli.Command, error) {
 			return &KVEnableVersioningCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv metadata": func() (cli.Command, error) {
 			return &KVMetadataCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv metadata put": func() (cli.Command, error) {
 			return &KVMetadataPutCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv metadata get": func() (cli.Command, error) {
 			return &KVMetadataGetCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"kv metadata delete": func() (cli.Command, error) {
 			return &KVMetadataDeleteCommand{
-				BaseCommand: &BaseCommand{
-					UI: ui,
-				},
+				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 	}