vikunja/vikunja
8
54
Fork 94
Code Issues 101 Pull Requests 31 Packages Releases 37 Activity

chore(config): append .file to config values when reading
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kolaente 2024-11-18 10:35:02 +01:00
parent 05349ddb5c
commit 1db1333d8a
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/config/config.go
View File

@ -421,7 +421,10 @@ func InitDefaultConfig() {
AutoTLSRenewBefore.setDefault("720h") // 30days in hours
}
func getConfigValueFromFile(configKey string) string {
func GetConfigValueFromFile(configKey string) string {
if !strings.HasSuffix(configKey, ".file") {
configKey += ".file"
}
var valuePath = viper.GetString(configKey)
if valuePath == "" {
return ""
@ -433,7 +436,7 @@ func getConfigValueFromFile(configKey string) string {
contents, err := os.ReadFile(valuePath)
if err == nil {
return string(contents)
return strings.Trim(string(contents), "\n")
}
log.Fatalf("Failed to read the config file at %s for key %s: %v", valuePath, configKey, err)
@ -448,7 +451,7 @@ func readConfigValuesFromFiles() {
continue
}
// Env is evaluated manually at runtime, so we need to check this for each key
value := getConfigValueFromFile(key + ".file")
value := GetConfigValueFromFile(key)
if value != "" {
viper.Set(strings.TrimSuffix(key, ".file"), value)
}