Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit f5e8173

Browse files
committed
Set default value for charset flag and remove check for empty charset
1 parent 0284847 commit f5e8173

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

internals/secrethub/generate.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ var (
2626
ErrCannotUseLengthArgAndFlag = errGenerate.Code("length_arg_and_flag").Error("length cannot be provided as an argument and a flag at the same time")
2727
ErrCouldNotFindCharSet = errGenerate.Code("charset_not_found").ErrorPref("could not find charset: %s")
2828
ErrMinFlagInvalidInteger = errGenerate.Code("min_flag_invalid_int").ErrorPref("second part of --min flag is not an integer: %s")
29-
ErrCharsetSizeNonPositive = errGenerate.Code("charset_size_non_positive").Error("charset size must be > 0")
3029
ErrInvalidMinFlag = errGenerate.Code("min_flag_invalid").ErrorPref("min flag must be of the form <charset name>:<minimum count>, invalid min flag: %s")
3130
)
3231

@@ -67,7 +66,7 @@ func (cmd *GenerateSecretCommand) Register(r command.Registerer) {
6766
clause.Flag("length", "The length of the generated secret. Defaults to "+strconv.Itoa(defaultLength)).PlaceHolder(strconv.Itoa(defaultLength)).Short('l').SetValue(&cmd.lengthFlag)
6867
clause.Flag("min", "<charset>:<n> Ensure that the resulting password contains at least n characters from the given character set.").SetValue(&cmd.mins)
6968
clause.Flag("clip", "Copy the generated value to the clipboard. The clipboard is automatically cleared after "+units.HumanDuration(cmd.clearClipboardAfter)+".").Short('c').BoolVar(&cmd.copyToClipboard)
70-
clause.Flag("charset", "Define the set of characters to randomly choose a password from. Defaults to alphanumeric.").SetValue(&cmd.charsetFlag)
69+
clause.Flag("charset", "Define the set of characters to randomly choose a password from. Defaults to alphanumeric.").Default("alphanumeric").SetValue(&cmd.charsetFlag)
7170
clause.Flag("symbols", "Include symbols in secret.").Short('s').Hidden().SetValue(&cmd.symbolsFlag)
7271
clause.Arg("rand-command", "").Hidden().StringVar(&cmd.secondArg)
7372
clause.Arg("length", "").Hidden().SetValue(&cmd.lengthArg)
@@ -87,10 +86,6 @@ func (cmd *GenerateSecretCommand) before() error {
8786
charset = charset.Add(randchar.Symbols)
8887
}
8988

90-
if charset.Size() <= 0 {
91-
return ErrCharsetSizeNonPositive
92-
}
93-
9489
cmd.generator, err = randchar.NewRand(charset, cmd.mins.v...)
9590
if err != nil {
9691
return err

0 commit comments

Comments
 (0)