refactor: remove count from secret generation functions

pkg/secret/secret.go

@@ -48,9 +48,9 @@ type Secret struct {
 }
 
 // GeneratePasswords generates passwords.
-func GeneratePasswords(count, length uint, charset string) ([]string, error) {
+func GeneratePasswords(length uint, charset string) ([]string, error) {
 	passwords, err := passgen.GeneratePasswords(
-		count,
+		1,
 		length,
 		charset,
 	)
@@ -64,9 +64,9 @@ func GeneratePasswords(count, length uint, charset string) ([]string, error) {
 }
 
 // GeneratePassphrases generates human readable and rememberable passphrases.
-func GeneratePassphrases(count uint) ([]string, error) {
+func GeneratePassphrases() ([]string, error) {
 	passphrases, err := passgen.GeneratePassphrases(
-		count,
+		1,
 		passgen.PassphraseWordCountDefault,
 		rune('-'),
 		passgen.PassphraseCasingDefault,
@@ -155,8 +155,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 				value.Length = length
 			}
 
-			charset := modifierValues["charset"]
-			value.Charset = resolveCharset(charset)
+			value.Charset = resolveCharset(modifierValues["charset"])
 			break
 		}
 		secretValues[secretId] = value
@@ -196,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)
 
 			if secret.Length > 0 {
-				passwords, err := GeneratePasswords(1, uint(secret.Length), secret.Charset)
+				passwords, err := GeneratePasswords(uint(secret.Length), secret.Charset)
 				if err != nil {
 					ch <- err
 					return
@@ -216,7 +215,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 				defer mutex.Unlock()
 				secretsGenerated[secretName] = passwords[0]
 			} else {
-				passphrases, err := GeneratePassphrases(1)
+				passphrases, err := GeneratePassphrases()
 				if err != nil {
 					ch <- err
 					return