codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: less quotes

Browse Source
This commit is contained in:
cellarspoon
2021-12-25 02:03:09 +01:00
parent 14400d4ed8
commit 3b5354b2a5
26 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/secret/secret.go
View File

@ -34,7 +34,7 @@ func GeneratePasswords(count, length uint) ([]string, error) {
return nil, err
}
logrus.Debugf("generated '%s'", strings.Join(passwords, ", "))
logrus.Debugf("generated %s", strings.Join(passwords, ", "))
return passwords, nil
}
@ -53,7 +53,7 @@ func GeneratePassphrases(count uint) ([]string, error) {
return nil, err
}
logrus.Debugf("generated '%s'", strings.Join(passphrases, ", "))
logrus.Debugf("generated %s", strings.Join(passphrases, ", "))
return passphrases, nil
}
@ -69,7 +69,7 @@ func ReadSecretEnvVars(appEnv config.AppEnv) map[string]string {
}
}
logrus.Debugf("read '%s' as secrets from '%s'", secretEnvVars, appEnv)
logrus.Debugf("read %s as secrets from %s", secretEnvVars, appEnv)
return secretEnvVars
}
@ -79,7 +79,7 @@ func ParseSecretEnvVarName(secretEnvVar string) string {
withoutPrefix := strings.TrimPrefix(secretEnvVar, "SECRET_")
withoutSuffix := strings.TrimSuffix(withoutPrefix, "_VERSION")
name := strings.ToLower(withoutSuffix)
logrus.Debugf("parsed '%s' as name from '%s'", name, secretEnvVar)
logrus.Debugf("parsed %s as name from %s", name, secretEnvVar)
return name
}
@ -89,7 +89,7 @@ func ParseGeneratedSecretName(secret string, appEnv config.App) string {
withoutAppName := strings.TrimPrefix(secret, name)
idx := strings.LastIndex(withoutAppName, "_")
parsed := withoutAppName[:idx]
logrus.Debugf("parsed '%s' as name from '%s'", parsed, secret)
logrus.Debugf("parsed %s as name from %s", parsed, secret)
return parsed
}
@ -97,7 +97,7 @@ func ParseGeneratedSecretName(secret string, appEnv config.App) string {
func ParseSecretEnvVarValue(secret string) (secretValue, error) {
values := strings.Split(secret, "#")
if len(values) == 0 {
return secretValue{}, fmt.Errorf("unable to parse '%s'", secret)
return secretValue{}, fmt.Errorf("unable to parse %s", secret)
}
if len(values) == 1 {
@ -113,7 +113,7 @@ func ParseSecretEnvVarValue(secret string) (secretValue, error) {
}
version := strings.ReplaceAll(values[0], " ", "")
logrus.Debugf("parsed version '%s' and length '%v' from '%s'", version, length, secret)
logrus.Debugf("parsed version %s and length '%v' from %s", version, length, secret)
return secretValue{Version: version, Length: length}, nil
}
@ -132,7 +132,7 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
return
}
secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
logrus.Debugf("attempting to generate and store '%s' on '%s'", secretRemoteName, server)
logrus.Debugf("attempting to generate and store %s on %s", secretRemoteName, server)
if secretValue.Length > 0 {
passwords, err := GeneratePasswords(1, uint(secretValue.Length))
if err != nil {
@ -177,7 +177,7 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
}
}
logrus.Debugf("generated and stored '%s' on '%s'", secrets, server)
logrus.Debugf("generated and stored %s on %s", secrets, server)
return secrets, nil
}