toolshed/abra
4
2
Fork 18
Code Issues 22 Pull Requests 3 Packages Releases 40 Activity

refactor: remove count from secret generation functions

Browse Source
This commit is contained in:
Apfelwurm
2025-03-18 12:35:30 +01:00
parent 6ab3628894
commit d3c9c39f13
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/secret/secret.go
View File

@ -48,9 +48,9 @@ type Secret struct {
} }
// GeneratePasswords generates passwords. // GeneratePasswords generates passwords.
func GeneratePasswords(count, length uint, charset string) ([]string, error) { func GeneratePasswords(length uint, charset string) ([]string, error) {
passwords, err := passgen.GeneratePasswords( passwords, err := passgen.GeneratePasswords(
count, 1,
length, length,
charset, charset,
) )
@ -64,9 +64,9 @@ func GeneratePasswords(count, length uint, charset string) ([]string, error) {
} }
// GeneratePassphrases generates human readable and rememberable passphrases. // GeneratePassphrases generates human readable and rememberable passphrases.
func GeneratePassphrases(count uint) ([]string, error) { func GeneratePassphrases() ([]string, error) {
passphrases, err := passgen.GeneratePassphrases( passphrases, err := passgen.GeneratePassphrases(
count, 1,
passgen.PassphraseWordCountDefault, passgen.PassphraseWordCountDefault,
rune('-'), rune('-'),
passgen.PassphraseCasingDefault, passgen.PassphraseCasingDefault,
@ -195,7 +195,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server) log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server)
if secret.Length > 0 { if secret.Length > 0 {
passwords, err := GeneratePasswords(1, uint(secret.Length), secret.Charset) passwords, err := GeneratePasswords(uint(secret.Length), secret.Charset)
if err != nil { if err != nil {
ch <- err ch <- err
return return
@ -215,7 +215,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
defer mutex.Unlock() defer mutex.Unlock()
secretsGenerated[secretName] = passwords[0] secretsGenerated[secretName] = passwords[0]
} else { } else {
passphrases, err := GeneratePassphrases(1) passphrases, err := GeneratePassphrases()
if err != nil { if err != nil {
ch <- err ch <- err
return return