Update wording and fix a missing prompt (#2329)

This commit is contained in:
Jeff Mitchell authored and GitHub committed 2022-08-05 19:27:14 -04:00
1 parent 9c03ef2105
commit fa17fdf9d7
4 files changed
+11 -13

No files matched your search

+5 -7
View File
@@ -231,6 +231,9 @@ func (c *Command) Client(opt ...Option) (*api.Client, error) {
}
switch {
case opts.withNoTokenValue:
c.client.SetToken("")
case c.FlagRecoveryConfig != "":
wrapper, cleanupFunc, err := wrapper.GetWrapperFromPath(
c.Context,
@@ -286,9 +289,9 @@ func (c *Command) Client(opt ...Option) (*api.Client, error) {
}
c.client.SetToken(token)
case c.FlagToken == "" && os.Getenv(envToken) != "":
case os.Getenv(envToken) != "":
// Backwards compat: allow reading from existing BOUNDARY_TOKEN env var
c.UI.Warn(`Direct usage of BOUNDARY_TOKEN env var is deprecated; please use "-token env://<env var nameL>" format, e.g. "-token env://BOUNDARY_TOKEN" to specify an env var to use.`)
c.UI.Warn(`Direct usage of BOUNDARY_TOKEN env var is deprecated; please use "-token env://<env var name>" format, e.g. "-token env://BOUNDARY_TOKEN" to specify an env var to use.`)
c.client.SetToken(os.Getenv(envToken))
case c.client.Token() == "" && strings.ToLower(c.FlagKeyringType) != "none":
@@ -303,10 +306,6 @@ func (c *Command) Client(opt ...Option) (*api.Client, error) {
}
}
if opts.withNoTokenValue {
c.client.SetToken("")
}
return c.client, nil
}
@@ -414,7 +413,6 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets {
f.StringVar(&StringVar{
Name: "token",
Target: &c.FlagToken,
EnvVar: envToken,
Usage: `A URL pointing to a file on disk (file://) from which a token will be read or an env var (env://) from which the token will be read. Overrides the "token-name" parameter.`,
})