testing changes

Author: CodeShellDev

utils/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 
@@ -17,6 +18,7 @@ import (
 
 var defaultsLayer = koanf.New(".")
 var userLayer = koanf.New(".")
+var tokensLayer = koanf.New(".")
 
 var config *koanf.Koanf
 
@@ -31,6 +33,12 @@ func LoadFile(path string, config *koanf.Koanf, parser koanf.Parser) (koanf.Prov
 		return nil, err
 	}
 
+	WatchFile(path, f)
+
+	return f, err
+}
+
+func WatchFile(path string, f *file.File) {
 	f.Watch(func(event any, err error) {
 		if err != nil {
 			return
@@ -43,32 +51,30 @@ func LoadFile(path string, config *koanf.Koanf, parser koanf.Parser) (koanf.Prov
 
 		Load()
 	})
-
-	return f, err
 }
 
-func LoadDir(dir string, parser koanf.Parser) []map[string]any {
+func LoadDir(path string, dir string, config *koanf.Koanf, parser koanf.Parser) []map[string]any {
     files, err := filepath.Glob(filepath.Join(dir, "*.yml"))
 
     if err != nil {
         return nil
     }
 
-	data := []map[string]any{}
-
-    for _, file := range files {
+	for i, f := range files {
 		tmp := koanf.New(".")
 
-        _, err := LoadFile(file, tmp, parser)
+		LoadFile(f, config, parser)
 
-		if err != nil {
-			return nil
+		wrapper := map[string]any{
+			path: map[string]any{
+				strconv.Itoa(i): tmp.Raw(),
+			},
 		}
 
-		data = append(data, tmp.All())
-    }
+		config.Load(confmap.Provider(wrapper, ""), nil); 
+	}
 
-    return data
+    return nil
 }
 
 func LoadEnv(config *koanf.Koanf) (koanf.Provider, error) {

utils/config/token-config.go

@@ -3,28 +3,34 @@ package config
 import (
 	"strconv"
 
-	middlewareTypes "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares/types"
 	"github.com/codeshelldev/secured-signal-api/utils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 	"github.com/knadh/koanf/parsers/yaml"
 )
 
-var tokens []map[string]any
+type TOKEN_CONFIG_ struct {
+	TOKENS		[]string 	`koanf:"tokens"`
+	OVERRIDES 	SETTING_	`koanf:"overrides"`
+}
 
 func LoadTokens() {
 	log.Debug("Loading Configs ", ENV.TOKENS_DIR)
 
-	tokens = LoadDir(ENV.TOKENS_DIR, yaml.Parser())
+	LoadDir("tokenConfigs", ENV.TOKENS_DIR, tokensLayer, yaml.Parser())
 
-	log.Dev(utils.ToJson(tokens))
+	log.Dev(utils.ToJson(tokensLayer.All()))
 }
 
 func InitTokens() {
 	apiTokens := config.Strings("api.tokens")
 
-	log.Dev(utils.ToJson(tokens))
+	var tokenConfigs []TOKEN_CONFIG_
+
+	tokensLayer.Unmarshal("tokenConfigs", &tokenConfigs)
+
+	log.Dev(utils.ToJson(tokenConfigs))
 
-	overrides := ParseTokenConfigs(tokens)
+	overrides := ParseTokenConfigs(tokenConfigs)
 
 	for token, override := range overrides {
 		apiTokens = append(apiTokens, token)
@@ -51,16 +57,12 @@ func InitTokens() {
 	}
 }
 
-func ParseTokenConfigs(configs []map[string]any) (map[string]SETTING_) {
+func ParseTokenConfigs(configs []TOKEN_CONFIG_) (map[string]SETTING_) {
 	settings := map[string]SETTING_{}
 
 	for _, config := range configs {
-		for _, token := range config["tokens"].([]string) {
-			settings[token] = SETTING_{
-				BLOCKED_ENDPOINTS: config["override.blockedendpoints"].([]string),
-				VARIABLES: config["overrides.variables"].(map[string]any),
-				MESSAGE_ALIASES: config["overrides.messagealiases"].([]middlewareTypes.MessageAlias),
-			}
+		for _, token := range config.TOKENS {
+			settings[token] = config.OVERRIDES
 		}
 	}