normalize VARIABLES

Author: CodeShellDev

utils/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 
@@ -94,10 +95,6 @@ func LoadEnv(config *koanf.Koanf) (koanf.Provider, error) {
 	return e, err
 }
 
-func mergeConfig(path string, mergeInto *koanf.Koanf, mergeFrom *koanf.Koanf) {
-	mergeInto.MergeAt(mergeFrom, path)
-}
-
 func templateConfig(config *koanf.Koanf) {
 	data := config.All()
 
@@ -138,9 +135,10 @@ func normalizeKeys(config *koanf.Koanf) {
     config.Load(confmap.Provider(data, "."), nil)
 }
 
-func transformChildren(config *koanf.Koanf, prefix string, transform func(key string, value any) (string, any)) error {
+// Transforms Children of path
+func transformChildren(config *koanf.Koanf, path string, transform func(key string, value any) (string, any)) error {
 	var sub map[string]any
-	if err := config.Unmarshal(prefix, &sub); err != nil {
+	if err := config.Unmarshal(path, &sub); err != nil {
 		return err
 	}
 
@@ -152,16 +150,38 @@ func transformChildren(config *koanf.Koanf, prefix string, transform func(key st
 	}
 
 	config.Load(confmap.Provider(map[string]any{
-		prefix: map[string]any{},
+		path: map[string]any{},
 	}, "."), nil)
 
 	config.Load(confmap.Provider(map[string]any{
-		prefix: transformed,
+		path: transformed,
 	}, "."), nil)
 
 	return nil
 }
 
+// Does the same thing as transformChildren() but does it for each Array Item inside of root and transforms subPath
+func transformChildrenUnderArray(config *koanf.Koanf, root string, subPath string, transform func(key string, value any) (string, any)) error {
+	var tokens []map[string]any
+
+	err := config.Unmarshal(root, &tokens)
+
+	if err != nil {
+		return err
+	}
+
+	for i := range tokens {
+		p := root + "." + strconv.Itoa(i) + "." + subPath
+
+		if err := transformChildren(config, p, transform); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+
 func normalizeEnv(key string, value string) (string, any) {
 	key = strings.ToLower(key)
 	key = strings.ReplaceAll(key, "__", ".")

utils/config/loader.go

@@ -53,8 +53,6 @@ func InitEnv() {
 
 	ENV.API_URL = config.String("api.url")
 
-	InitTokens()
-
 	defaultSettings := ENV.SETTINGS["*"]
 
 	config.Unmarshal("messagealiases", &defaultSettings.MESSAGE_ALIASES)
@@ -81,6 +79,8 @@ func Load() {
 
 	config = mergeLayers()
 
+	InitTokens()
+
 	normalizeKeys(config)
 
 	templateConfig(config)

utils/config/token-config.go

@@ -2,8 +2,8 @@ package config
 
 import (
 	"strconv"
+	"strings"
 
-	"github.com/codeshelldev/secured-signal-api/utils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 	"github.com/knadh/koanf/parsers/yaml"
 )
@@ -17,20 +17,20 @@ func LoadTokens() {
 	log.Debug("Loading Configs ", ENV.TOKENS_DIR)
 
 	LoadDir("tokenConfigs", ENV.TOKENS_DIR, tokensLayer, yaml.Parser())
-
-	log.Dev(utils.ToJson(tokensLayer.All()))
 }
 
 func InitTokens() {
 	apiTokens := config.Strings("api.tokens")
 
 	var tokenConfigs []TOKEN_CONFIG_
 
-	tokensLayer.Unmarshal("tokenConfigs", &tokenConfigs)
+	transformChildrenUnderArray(config, "tokenConfigs", "override.variables", func(key string, value any) (string, any) {
+		return strings.ToUpper(key), value
+	})
 
-	log.Dev(utils.ToJson(tokenConfigs))
+	tokensLayer.Unmarshal("tokenConfigs", &tokenConfigs)
 
-	overrides := ParseTokenConfigs(tokenConfigs)
+	overrides := parseTokenConfigs(tokenConfigs)
 
 	for token, override := range overrides {
 		apiTokens = append(apiTokens, token)
@@ -57,7 +57,7 @@ func InitTokens() {
 	}
 }
 
-func ParseTokenConfigs(configs []TOKEN_CONFIG_) (map[string]SETTING_) {
+func parseTokenConfigs(configs []TOKEN_CONFIG_) (map[string]SETTING_) {
 	settings := map[string]SETTING_{}
 
 	for _, config := range configs {