fix: use removal flag with correct help
This commit is contained in:
parent
2555096510
commit
d5f30a3ae4
|
@ -27,6 +27,13 @@ var allSecretsFlag = &cli.BoolFlag{
|
||||||
Usage: "Generate all secrets",
|
Usage: "Generate all secrets",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var rmAllSecrets bool
|
||||||
|
var rmAllSecretsFlag = &cli.BoolFlag{
|
||||||
|
Name: "all, a",
|
||||||
|
Destination: &rmAllSecrets,
|
||||||
|
Usage: "Remove all secrets",
|
||||||
|
}
|
||||||
|
|
||||||
var appSecretGenerateCommand = cli.Command{
|
var appSecretGenerateCommand = cli.Command{
|
||||||
Name: "generate",
|
Name: "generate",
|
||||||
Aliases: []string{"g"},
|
Aliases: []string{"g"},
|
||||||
|
@ -178,7 +185,7 @@ var appSecretRmCommand = cli.Command{
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
allSecretsFlag,
|
rmAllSecretsFlag,
|
||||||
internal.PassRemoveFlag,
|
internal.PassRemoveFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
|
@ -195,11 +202,11 @@ Example:
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
secrets := secret.ReadSecretEnvVars(app.Env)
|
secrets := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
|
||||||
if c.Args().Get(1) != "" && allSecrets {
|
if c.Args().Get(1) != "" && rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Args().Get(1) == "" && !allSecrets {
|
if c.Args().Get(1) == "" && !rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue