HSM -> Auto Unseal in init help output

This commit is contained in:
Jeff Mitchell
2019-03-07 15:10:50 -05:00
parent 0b7a43a446
commit 92988f36a1

View File

@@ -26,7 +26,7 @@ type OperatorInitCommand struct {
flagPGPKeys []string flagPGPKeys []string
flagRootTokenPGPKey string flagRootTokenPGPKey string
// HSM // Auto Unseal
flagRecoveryShares int flagRecoveryShares int
flagRecoveryThreshold int flagRecoveryThreshold int
flagRecoveryPGPKeys []string flagRecoveryPGPKeys []string
@@ -161,8 +161,8 @@ func (c *OperatorInitCommand) Flags() *FlagSets {
"registered.", "registered.",
}) })
// HSM Options // Auto Unseal Options
f = set.NewFlagSet("HSM Options") f = set.NewFlagSet("Auto Unseal Options")
f.IntVar(&IntVar{ f.IntVar(&IntVar{
Name: "recovery-shares", Name: "recovery-shares",
@@ -170,7 +170,7 @@ func (c *OperatorInitCommand) Flags() *FlagSets {
Default: 5, Default: 5,
Completion: complete.PredictAnything, Completion: complete.PredictAnything,
Usage: "Number of key shares to split the recovery key into. " + Usage: "Number of key shares to split the recovery key into. " +
"This is only used in HSM mode.", "This is only used in auto-unseal mode.",
}) })
f.IntVar(&IntVar{ f.IntVar(&IntVar{
@@ -179,7 +179,7 @@ func (c *OperatorInitCommand) Flags() *FlagSets {
Default: 3, Default: 3,
Completion: complete.PredictAnything, Completion: complete.PredictAnything,
Usage: "Number of key shares required to reconstruct the recovery key. " + Usage: "Number of key shares required to reconstruct the recovery key. " +
"This is only used in HSM mode.", "This is only used in Auto Unseal mode.",
}) })
f.VarFlag(&VarFlag{ f.VarFlag(&VarFlag{
@@ -187,7 +187,7 @@ func (c *OperatorInitCommand) Flags() *FlagSets {
Value: (*pgpkeys.PubKeyFilesFlag)(&c.flagRecoveryPGPKeys), Value: (*pgpkeys.PubKeyFilesFlag)(&c.flagRecoveryPGPKeys),
Completion: complete.PredictAnything, Completion: complete.PredictAnything,
Usage: "Behaves like -pgp-keys, but for the recovery key shares. This " + Usage: "Behaves like -pgp-keys, but for the recovery key shares. This " +
"is only used in HSM mode.", "is only used in Auto Unseal mode.",
}) })
return set return set