summaryrefslogtreecommitdiff
path: root/internal/config/config.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/config/config.go')
-rw-r--r--internal/config/config.go28
1 files changed, 20 insertions, 8 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index 784c34b..c05d553 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"io"
"os"
+ "unicode"
)
func FromFile[T any](configFile string) (T, error) {
@@ -25,17 +26,28 @@ func FromFile[T any](configFile string) (T, error) {
}
// Set config from envoronment variable if present, e.g. hansWurst from GOS_HANS_WURST
-func FromENV(envKey string, defaultValue ...string) string {
- if value := os.Getenv(envKey); value != "" {
- return value
- }
-
- // Use first non-empty default value.
- for _, value := range defaultValue {
- if value != "" {
+func FromENV(keys ...string) string {
+ for _, key := range keys{
+ if key == "" {
+ continue
+ }
+ if !isAllUpperCase(key) {
+ return key
+ }
+ if value := os.Getenv(key); value != "" {
return value
}
}
return ""
}
+
+func isAllUpperCase(s string) bool {
+ for _, r := range s {
+ if unicode.IsLetter(r) && !unicode.IsUpper(r) {
+ return false
+ }
+ }
+ return true
+}
+