From 9a7c7a88a3d42f97f22d36481c0dc6ad2297de52 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 17 Jan 2018 19:31:52 -0500 Subject: [PATCH] Change next major release of Vault to 0.11 or later to make it less scary --- command/auth.go | 15 +++++++-------- command/commands.go | 3 +-- command/operator_init.go | 7 +++---- command/operator_rekey.go | 9 +++------ command/ssh.go | 6 +++--- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/command/auth.go b/command/auth.go index fa8cc66268..fac20b15f7 100644 --- a/command/auth.go +++ b/command/auth.go @@ -68,8 +68,8 @@ func (c *AuthCommand) Run(args []string) int { case strings.HasPrefix(arg, "-methods"): c.UI.Warn(wrapAtLength( "WARNING! The -methods flag is deprecated. Please use "+ - "\"vault auth list\" instead. This flag will be removed in the "+ - "next major release of Vault.") + "\n") + "\"vault auth list\" instead. This flag will be removed in "+ + "Vault 0.11 (or later).") + "\n") return (&AuthListCommand{ BaseCommand: &BaseCommand{ UI: c.UI, @@ -79,8 +79,8 @@ func (c *AuthCommand) Run(args []string) int { case strings.HasPrefix(arg, "-method-help"): c.UI.Warn(wrapAtLength( "WARNING! The -method-help flag is deprecated. Please use "+ - "\"vault auth help\" instead. This flag will be removed in the "+ - "next major release of Vault.") + "\n") + "\"vault auth help\" instead. This flag will be removed in "+ + "Vault 0.11 (or later).") + "\n") // Parse the args to pull out the method, surpressing any errors because // there could be other flags that we don't care about. f := flag.NewFlagSet("", flag.ContinueOnError) @@ -103,10 +103,9 @@ func (c *AuthCommand) Run(args []string) int { // passed directly to the new "vault login" command. c.UI.Warn(wrapAtLength( "WARNING! The \"vault auth ARG\" command is deprecated and is now a "+ - "subcommand for interacting with auth methods. To "+ - "authenticate locally to Vault, use \"vault login\" instead. This "+ - "backwards compatability will be removed in the next major release of "+ - "Vault.") + "\n") + "subcommand for interacting with auth methods. To authenticate "+ + "locally to Vault, use \"vault login\" instead. This backwards "+ + "compatability will be removed in Vault 0.11 (or later).") + "\n") return (&LoginCommand{ BaseCommand: &BaseCommand{ UI: c.UI, diff --git a/command/commands.go b/command/commands.go index 465dae748e..ab477148e2 100644 --- a/command/commands.go +++ b/command/commands.go @@ -88,8 +88,7 @@ func (c *DeprecatedCommand) Run(args []string) int { func (c *DeprecatedCommand) warn() { c.UI.Warn(wrapAtLength(fmt.Sprintf( "WARNING! The \"vault %s\" command is deprecated. Please use \"vault %s\" "+ - "instead. This command will be removed in the next major release of "+ - "Vault.", + "instead. This command will be removed in Vault 0.11 (or later).", c.Old, c.New))) c.UI.Warn("") diff --git a/command/operator_init.go b/command/operator_init.go index cf3aaf31db..1002fa70be 100644 --- a/command/operator_init.go +++ b/command/operator_init.go @@ -247,14 +247,13 @@ func (c *OperatorInitCommand) Run(args []string) int { // TODO: remove in 0.9.0 if c.flagAuto { c.UI.Warn(wrapAtLength("WARNING! -auto is deprecated. Please use " + - "-consul-auto instead. This will be removed the next major release " + - "of Vault.")) + "-consul-auto instead. This will be removed in Vault 0.11 " + + "(or later).")) c.flagConsulAuto = true } if c.flagCheck { c.UI.Warn(wrapAtLength("WARNING! -check is deprecated. Please use " + - "-status instead. This will be removed in the next major release " + - "of Vault.")) + "-status instead. This will be removed in Vault 0.11 (or later).")) c.flagStatus = true } diff --git a/command/operator_rekey.go b/command/operator_rekey.go index 595f1f3af9..dd713f157f 100644 --- a/command/operator_rekey.go +++ b/command/operator_rekey.go @@ -261,22 +261,19 @@ func (c *OperatorRekeyCommand) Run(args []string) int { if c.flagDelete { c.UI.Warn(wrapAtLength( "WARNING! The -delete flag is deprecated. Please use -backup-delete " + - "instead. This flag will be removed in the next major release of " + - "Vault.")) + "instead. This flag will be removed in Vault 0.11 (or later).")) c.flagBackupDelete = true } if c.flagRetrieve { c.UI.Warn(wrapAtLength( "WARNING! The -retrieve flag is deprecated. Please use -backup-retrieve " + - "instead. This flag will be removed in the next major release of " + - "Vault.")) + "instead. This flag will be removed in Vault 0.11 (or later).")) c.flagBackupRetrieve = true } if c.flagRecoveryKey { c.UI.Warn(wrapAtLength( "WARNING! The -recovery-key flag is deprecated. Please use -target=recovery " + - "instead. This flag will be removed in the next major release of " + - "Vault.")) + "instead. This flag will be removed in Vault 0.11 (or later).")) c.flagTarget = "recovery" } diff --git a/command/ssh.go b/command/ssh.go index 99939c0e75..c35fbb9cfd 100644 --- a/command/ssh.go +++ b/command/ssh.go @@ -255,8 +255,8 @@ func (c *SSHCommand) Run(args []string) int { "WARNING: No -role specified. Use -role to tell Vault which ssh role " + "to use for authentication. In the future, you will need to tell " + "Vault which role to use. For now, Vault will attempt to guess based " + - "on a the API response. This will be removed in the next major " + - "version of Vault.")) + "on the API response. This will be removed in the Vault 0.11 (or " + + "later.")) role, err := c.defaultRole(c.flagMountPoint, ip) if err != nil { @@ -283,7 +283,7 @@ func (c *SSHCommand) Run(args []string) int { "on the API response. This guess involves creating a temporary " + "credential, reading its type, and then revoking it. To reduce the " + "number of API calls and surface area, specify -mode directly. This " + - "will be removed in the next major version of Vault.")) + "will be removed in Vault 0.11 (or later).")) secret, cred, err := c.generateCredential(username, ip) if err != nil { // This is _very_ hacky, but is the only sane backwards-compatible way