From 05f92994edc5270825bf10ed4ed4b35caaaf1cad Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 23 Oct 2018 02:44:57 -0400 Subject: [PATCH] Change deprecation warning to 1.1 --- command/auth.go | 6 +++--- command/commands.go | 2 +- command/operator_init.go | 4 ++-- command/operator_rekey.go | 6 +++--- command/ssh.go | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/command/auth.go b/command/auth.go index 78daf6d53d..4890478153 100644 --- a/command/auth.go +++ b/command/auth.go @@ -74,7 +74,7 @@ func (c *AuthCommand) Run(args []string) int { c.UI.Warn(wrapAtLength( "WARNING! The -methods flag is deprecated. Please use "+ "\"vault auth list\" instead. This flag will be removed in "+ - "Vault 0.12.") + "\n") + "Vault 1.1.") + "\n") } return (&AuthListCommand{ BaseCommand: &BaseCommand{ @@ -87,7 +87,7 @@ func (c *AuthCommand) Run(args []string) int { c.UI.Warn(wrapAtLength( "WARNING! The -method-help flag is deprecated. Please use "+ "\"vault auth help\" instead. This flag will be removed in "+ - "Vault 0.12.") + "\n") + "Vault 1.1.") + "\n") } // Parse the args to pull out the method, suppressing any errors because // there could be other flags that we don't care about. @@ -114,7 +114,7 @@ func (c *AuthCommand) Run(args []string) int { "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 "+ - "compatibility will be removed in Vault 0.12.") + "\n") + "compatibility will be removed in Vault 1.1.") + "\n") } return (&LoginCommand{ BaseCommand: &BaseCommand{ diff --git a/command/commands.go b/command/commands.go index 17199f04b0..dc3daa0d18 100644 --- a/command/commands.go +++ b/command/commands.go @@ -204,7 +204,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 Vault 0.12.", + "instead. This command will be removed in Vault 1.1.", c.Old, c.New))) c.UI.Warn("") diff --git a/command/operator_init.go b/command/operator_init.go index a16462c711..2a0c0cb24f 100644 --- a/command/operator_init.go +++ b/command/operator_init.go @@ -246,14 +246,14 @@ func (c *OperatorInitCommand) Run(args []string) int { if c.flagAuto { if Format(c.UI) == "table" { c.UI.Warn(wrapAtLength("WARNING! -auto is deprecated. Please use " + - "-consul-auto instead. This will be removed in Vault 0.12.")) + "-consul-auto instead. This will be removed in Vault 1.1.")) } c.flagConsulAuto = true } if c.flagCheck { if Format(c.UI) == "table" { c.UI.Warn(wrapAtLength("WARNING! -check is deprecated. Please use " + - "-status instead. This will be removed in Vault 0.12.")) + "-status instead. This will be removed in Vault 1.1.")) } c.flagStatus = true } diff --git a/command/operator_rekey.go b/command/operator_rekey.go index 2544a20bb2..1ff5f736e2 100644 --- a/command/operator_rekey.go +++ b/command/operator_rekey.go @@ -282,7 +282,7 @@ func (c *OperatorRekeyCommand) Run(args []string) int { if Format(c.UI) == "table" { c.UI.Warn(wrapAtLength( "WARNING! The -delete flag is deprecated. Please use -backup-delete " + - "instead. This flag will be removed in Vault 0.12.")) + "instead. This flag will be removed in Vault 1.1.")) } c.flagBackupDelete = true } @@ -290,7 +290,7 @@ func (c *OperatorRekeyCommand) Run(args []string) int { if Format(c.UI) == "table" { c.UI.Warn(wrapAtLength( "WARNING! The -retrieve flag is deprecated. Please use -backup-retrieve " + - "instead. This flag will be removed in Vault 0.12.")) + "instead. This flag will be removed in Vault 1.1.")) } c.flagBackupRetrieve = true } @@ -298,7 +298,7 @@ func (c *OperatorRekeyCommand) Run(args []string) int { if Format(c.UI) == "table" { c.UI.Warn(wrapAtLength( "WARNING! The -recovery-key flag is deprecated. Please use -target=recovery " + - "instead. This flag will be removed in Vault 0.12.")) + "instead. This flag will be removed in Vault 1.1.")) } c.flagTarget = "recovery" } diff --git a/command/ssh.go b/command/ssh.go index 6b9999740b..8bd90628d5 100644 --- a/command/ssh.go +++ b/command/ssh.go @@ -294,7 +294,7 @@ 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 the API response. This will be removed in the Vault 0.12.")) + "on the API response. This will be removed in the Vault 1.1.")) role, err := c.defaultRole(c.flagMountPoint, ip) if err != nil { @@ -321,7 +321,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 Vault 0.12.")) + "will be removed in Vault 1.1.")) secret, cred, err := c.generateCredential(username, ip) if err != nil { // This is _very_ hacky, but is the only sane backwards-compatible way