From 937e8a13b3f2000f2a31c2848cb6d8026edf9cad Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 17:57:14 +0100 Subject: [PATCH 01/41] fix loader.go --- internals/config/loader.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/internals/config/loader.go b/internals/config/loader.go index f51fa8f..5d570b2 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -161,3 +161,11 @@ func LoadConfig() { log.Error("Could not Load Config ", ENV.CONFIG_PATH, ": ", err.Error()) } } + +func normalizeEnv(key string, value string) (string, any) { + key = strings.ToLower(key) + key = strings.ReplaceAll(key, "__", ".") + key = strings.ReplaceAll(key, "_", "") + + return key, stringutils.ToType(value) +} From fb378dcf2a170b87bf356d7f4e6a9516ae4f9b11 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 17:57:46 +0100 Subject: [PATCH 02/41] indent --- internals/config/loader.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index 5d570b2..1beb0f5 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -15,12 +15,12 @@ import ( ) var ENV *structure.ENV = &structure.ENV{ - CONFIG_PATH: os.Getenv("CONFIG_PATH"), - DEFAULTS_PATH: os.Getenv("DEFAULTS_PATH"), - TOKENS_DIR: os.Getenv("TOKENS_DIR"), - FAVICON_PATH: os.Getenv("FAVICON_PATH"), - CONFIGS: map[string]*structure.CONFIG{}, - INSECURE: false, + CONFIG_PATH: os.Getenv("CONFIG_PATH"), + DEFAULTS_PATH: os.Getenv("DEFAULTS_PATH"), + TOKENS_DIR: os.Getenv("TOKENS_DIR"), + FAVICON_PATH: os.Getenv("FAVICON_PATH"), + CONFIGS: map[string]*structure.CONFIG{}, + INSECURE: false, } var DEFAULT *structure.CONFIG From 41dc958d926de3823379bee2bbc16ae6664db520 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:37:59 +0100 Subject: [PATCH 03/41] add aliases and update to v0.0.4 of gotl --- go.mod | 4 ++-- go.sum | 6 ++++++ internals/config/loader.go | 14 ++++++++------ internals/config/structure/structure.go | 10 +++++----- internals/config/tokens.go | 2 +- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index d2af6d4..c88e00f 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,9 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.2 +require github.com/codeshelldev/gotl v0.0.4 -require go.uber.org/zap v1.27.0 // indirect +require go.uber.org/zap v1.27.1 // indirect require ( github.com/fsnotify/fsnotify v1.9.0 // indirect diff --git a/go.sum b/go.sum index a51f9a7..20486ac 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ github.com/codeshelldev/gotl v0.0.2 h1:PQbipYHut3DNvwcrdkQmIGo2p6X6a889Glmba/KIeFQ= github.com/codeshelldev/gotl v0.0.2/go.mod h1:OzawxKcFw9QEgbeR5H2UXryhYeeLo8xSLme1r8viE+U= +github.com/codeshelldev/gotl v0.0.3 h1:LjtrG1BlP3fLlJWQ0sfl2P7PfLS09h9bgeANX+nEXCM= +github.com/codeshelldev/gotl v0.0.3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= +github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= @@ -36,6 +40,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= +go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= diff --git a/internals/config/loader.go b/internals/config/loader.go index 1beb0f5..77d1c64 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -42,10 +42,12 @@ func Load() { LoadTokens() + NormalizeConfig("", defaultsConf) + NormalizeConfig("config", userConf) + userConf.LoadEnv(normalizeEnv) - NormalizeConfig(defaultsConf) - NormalizeConfig(userConf) + NormalizeConfig("env", userConf) NormalizeTokens() @@ -85,11 +87,11 @@ func LowercaseKeys(config *configutils.Config) { config.Load(data, "") } -func NormalizeConfig(config *configutils.Config) { - Normalize(config, "", &structure.CONFIG{}) +func NormalizeConfig(id string, config *configutils.Config) { + Normalize(id, config, "", &structure.CONFIG{}) } -func Normalize(config *configutils.Config, path string, structure any) { +func Normalize(id string, config *configutils.Config, path string, structure any) { data := config.Layer.Get(path) old, ok := data.(map[string]any) @@ -103,7 +105,7 @@ func Normalize(config *configutils.Config, path string, structure any) { tmpConf.Load(old, "") // Apply transforms to the new config - tmpConf.ApplyTransformFuncs(structure, "", transformFuncs) + tmpConf.ApplyTransformFuncs(id, structure, "", transformFuncs) // Lowercase actual config LowercaseKeys(config) diff --git a/internals/config/structure/structure.go b/internals/config/structure/structure.go index 38fce9c..148dfcb 100644 --- a/internals/config/structure/structure.go +++ b/internals/config/structure/structure.go @@ -13,17 +13,17 @@ type ENV struct { type CONFIG struct { SERVICE SERVICE `koanf:"service"` API API `koanf:"api"` - SETTINGS SETTINGS `koanf:"settings" aliases:"overrides"` + SETTINGS SETTINGS `koanf:"settings" token>aliases:"overrides"` } type SERVICE struct { - PORT string `koanf:"port"` - LOG_LEVEL string `koanf:"loglevel"` + PORT string `koanf:"port" env>aliases:".port"` + LOG_LEVEL string `koanf:"loglevel" env>aliases:".loglevel"` } type API struct { - URL string `koanf:"url"` - TOKENS []string `koanf:"tokens" aliases:"token"` + URL string `koanf:"url" env>aliases:".apiurl"` + TOKENS []string `koanf:"tokens" env>aliases:".apitokens,.apitoken" aliases:"token"` } type SETTINGS struct { diff --git a/internals/config/tokens.go b/internals/config/tokens.go index ac00219..8ed16df 100644 --- a/internals/config/tokens.go +++ b/internals/config/tokens.go @@ -28,7 +28,7 @@ func NormalizeTokens() { tmpConf := configutils.New() tmpConf.Load(config.Raw(), "") - Normalize(tmpConf, "overrides", &structure.SETTINGS{}) + Normalize("token", tmpConf, "overrides", &structure.SETTINGS{}) data = append(data, tmpConf.Layer.Raw()) } From 892563b9ef3cc9adc3cba17453bc6957a472f2aa Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:44:46 +0100 Subject: [PATCH 04/41] separate env from user-conf --- internals/config/loader.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index 77d1c64..ed5dfc4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -27,6 +27,7 @@ var DEFAULT *structure.CONFIG var defaultsConf *configutils.Config var userConf *configutils.Config +var envConf *configutils.Config var tokenConf *configutils.Config var mainConf *configutils.Config @@ -45,13 +46,13 @@ func Load() { NormalizeConfig("", defaultsConf) NormalizeConfig("config", userConf) - userConf.LoadEnv(normalizeEnv) + envConf.LoadEnv(normalizeEnv) - NormalizeConfig("env", userConf) + NormalizeConfig("env", envConf) NormalizeTokens() - mainConf.MergeLayers(defaultsConf.Layer, userConf.Layer) + mainConf.MergeLayers(defaultsConf.Layer, userConf.Layer, envConf.Layer) mainConf.TemplateConfig() @@ -70,6 +71,7 @@ func Log() { func Clear() { defaultsConf = configutils.New() userConf = configutils.New() + envConf = configutils.New() tokenConf = configutils.New() mainConf = configutils.New() } From 203d68e0d1aaa8b8fff665c80791a03f65c267e7 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:51:38 +0100 Subject: [PATCH 05/41] refactoring --- internals/config/loader.go | 14 ++++++++------ internals/config/tokens.go | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index ed5dfc4..fa8b242 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -49,16 +49,18 @@ func Load() { envConf.LoadEnv(normalizeEnv) NormalizeConfig("env", envConf) - - NormalizeTokens() - mainConf.MergeLayers(defaultsConf.Layer, userConf.Layer, envConf.Layer) + userConf.MergeLayers(envConf.Layer) + + mainConf.MergeLayers(defaultsConf.Layer, userConf.Layer) mainConf.TemplateConfig() - InitTokens() + NormalizeTokens() + + InitConfig() - InitEnv() + InitTokens() log.Info("Finished Loading Configuration") } @@ -130,7 +132,7 @@ func InitReload() { tokenConf.OnReload(reload) } -func InitEnv() { +func InitConfig() { var config structure.CONFIG mainConf.Layer.Unmarshal("", &config) diff --git a/internals/config/tokens.go b/internals/config/tokens.go index 8ed16df..9204737 100644 --- a/internals/config/tokens.go +++ b/internals/config/tokens.go @@ -38,7 +38,7 @@ func NormalizeTokens() { } func InitTokens() { - apiTokens := mainConf.Layer.Strings("api.tokens") + apiTokens := DEFAULT.API.TOKENS var tokenConfigs []structure.CONFIG @@ -61,7 +61,7 @@ func InitTokens() { // Set Blocked Endpoints on Config to User Layer Value // => effectively ignoring Default Layer - mainConf.Layer.Set("settings.access.endpoints", userConf.Layer.Strings("settings.access.endpoints")) + DEFAULT.SETTINGS.ACCESS.ENDPOINTS = userConf.Layer.Strings("settings.access.endpoints") } if len(apiTokens) > 0 { From 4ecdaccf56a9a3e09253b81638f4365e64c3191b Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:55:38 +0100 Subject: [PATCH 06/41] debug gotl --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c88e00f..d4784a6 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4 +require github.com/codeshelldev/gotl v0.0.4-2 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 20486ac..dcd35af 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/codeshelldev/gotl v0.0.2 h1:PQbipYHut3DNvwcrdkQmIGo2p6X6a889Glmba/KIe github.com/codeshelldev/gotl v0.0.2/go.mod h1:OzawxKcFw9QEgbeR5H2UXryhYeeLo8xSLme1r8viE+U= github.com/codeshelldev/gotl v0.0.3 h1:LjtrG1BlP3fLlJWQ0sfl2P7PfLS09h9bgeANX+nEXCM= github.com/codeshelldev/gotl v0.0.3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-2 h1:zCbsSTKE7R5EWVzoZLoiP1I5MItNr28mFwEjgmGMCl0= +github.com/codeshelldev/gotl v0.0.4-2/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= From 5a0fd19c87243699b102167b1803110ffd3b9fb4 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:56:58 +0100 Subject: [PATCH 07/41] formatting --- internals/config/loader.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index fa8b242..03a2209 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -19,8 +19,9 @@ var ENV *structure.ENV = &structure.ENV{ DEFAULTS_PATH: os.Getenv("DEFAULTS_PATH"), TOKENS_DIR: os.Getenv("TOKENS_DIR"), FAVICON_PATH: os.Getenv("FAVICON_PATH"), - CONFIGS: map[string]*structure.CONFIG{}, INSECURE: false, + + CONFIGS: map[string]*structure.CONFIG{}, } var DEFAULT *structure.CONFIG From 966cbd5ed6120f039ff25522374f3e9b20035bdd Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:02:59 +0100 Subject: [PATCH 08/41] debugggginggg --- internals/config/loader.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index 03a2209..9ba9919 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,8 +67,9 @@ func Load() { } func Log() { - log.Dev("Loaded Config:", mainConf.Layer.All()) - log.Dev("Loaded Token Configs:", tokenConf.Layer.All()) + log.Info("Loaded Config:", mainConf.Layer.All()) + log.Info("Loaded Token Configs:", tokenConf.Layer.All()) + log.Info("Parsed Configs: ", ENV) } func Clear() { From dcc7f110cd84d82170bad4616b4cf7133712efe3 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:15:32 +0100 Subject: [PATCH 09/41] update to gotl dev version --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d4784a6..ef14ee8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-2 +require github.com/codeshelldev/gotl v0.0.4-3 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index dcd35af..05f3d06 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/codeshelldev/gotl v0.0.3 h1:LjtrG1BlP3fLlJWQ0sfl2P7PfLS09h9bgeANX+nEX github.com/codeshelldev/gotl v0.0.3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-2 h1:zCbsSTKE7R5EWVzoZLoiP1I5MItNr28mFwEjgmGMCl0= github.com/codeshelldev/gotl v0.0.4-2/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-3 h1:jrsHchBn7FnC6KkSDIoxFlyUVy1y6CLNAS8vEUgqf14= +github.com/codeshelldev/gotl v0.0.4-3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index 9ba9919..fd6cc20 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,6 +67,7 @@ func Load() { } func Log() { + // TODO: back to dev log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 9ff28d8e373ed3adae592316e238caac02a96706 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:22:55 +0100 Subject: [PATCH 10/41] bump gotl --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ef14ee8..5a04b7a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-3 +require github.com/codeshelldev/gotl v0.0.4-4 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 05f3d06..785a2dc 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/codeshelldev/gotl v0.0.4-2 h1:zCbsSTKE7R5EWVzoZLoiP1I5MItNr28mFwEjgmG github.com/codeshelldev/gotl v0.0.4-2/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-3 h1:jrsHchBn7FnC6KkSDIoxFlyUVy1y6CLNAS8vEUgqf14= github.com/codeshelldev/gotl v0.0.4-3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-4 h1:j5MO1GyQrZQU2Hk220VD1bM8FqmwDsPhNv9BQGvTOwU= +github.com/codeshelldev/gotl v0.0.4-4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index fd6cc20..3c2fa82 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: back to dev + // TODO: Change back to `log.Dev()` after testing log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From f48c6986986d33188e35f40462865c7c20e5f9d3 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:28:43 +0100 Subject: [PATCH 11/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 5a04b7a..a7e32d8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-4 +require github.com/codeshelldev/gotl v0.0.4-5 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 785a2dc..b64672f 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/codeshelldev/gotl v0.0.4-3 h1:jrsHchBn7FnC6KkSDIoxFlyUVy1y6CLNAS8vEUg github.com/codeshelldev/gotl v0.0.4-3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-4 h1:j5MO1GyQrZQU2Hk220VD1bM8FqmwDsPhNv9BQGvTOwU= github.com/codeshelldev/gotl v0.0.4-4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-5 h1:r7VJdw7BBAtCMi1rccVzFfM9wXsVGthU6pMVTt5CeQ4= +github.com/codeshelldev/gotl v0.0.4-5/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index 3c2fa82..2c201dc 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` after testing + // TODO: Change back to `log.Dev()` as soon as config parsing works again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From df8bf836c8600d57301cbc3280f3b9c805b4be44 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:40:17 +0100 Subject: [PATCH 12/41] bump gotl version --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a7e32d8..6984ab2 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-5 +require github.com/codeshelldev/gotl v0.0.4-6 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index b64672f..7edeabf 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ github.com/codeshelldev/gotl v0.0.4-4 h1:j5MO1GyQrZQU2Hk220VD1bM8FqmwDsPhNv9BQGv github.com/codeshelldev/gotl v0.0.4-4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-5 h1:r7VJdw7BBAtCMi1rccVzFfM9wXsVGthU6pMVTt5CeQ4= github.com/codeshelldev/gotl v0.0.4-5/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-6 h1:trHHcrnkCJliXm/vIpbNRTGyQehLyd1cUHpnMYUQ3zk= +github.com/codeshelldev/gotl v0.0.4-6/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index 2c201dc..5327b4a 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing works again + // TODO: Change back to `log.Dev()` as soon as config parsing works again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From b33cdbbe22d5fa924c68b393ed292488334d411e Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:48:45 +0100 Subject: [PATCH 13/41] bump gotl version --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6984ab2..2bb125b 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-6 +require github.com/codeshelldev/gotl v0.0.4-7 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 7edeabf..1651259 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/codeshelldev/gotl v0.0.4-5 h1:r7VJdw7BBAtCMi1rccVzFfM9wXsVGthU6pMVTt5 github.com/codeshelldev/gotl v0.0.4-5/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-6 h1:trHHcrnkCJliXm/vIpbNRTGyQehLyd1cUHpnMYUQ3zk= github.com/codeshelldev/gotl v0.0.4-6/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-7 h1:C2uXf+J2uUvSHg6XVQ8xMlqNIrHgRRCBc2D8UZ1QwNU= +github.com/codeshelldev/gotl v0.0.4-7/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index 5327b4a..2c201dc 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing works again. + // TODO: Change back to `log.Dev()` as soon as config parsing works again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From b97466f796cb93a0b167e62665de8a16ac0e1564 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:57:25 +0100 Subject: [PATCH 14/41] bump gotl version --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2bb125b..08fb26d 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-7 +require github.com/codeshelldev/gotl v0.0.4-8 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 1651259..3f1d32b 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/codeshelldev/gotl v0.0.4-6 h1:trHHcrnkCJliXm/vIpbNRTGyQehLyd1cUHpnMYU github.com/codeshelldev/gotl v0.0.4-6/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-7 h1:C2uXf+J2uUvSHg6XVQ8xMlqNIrHgRRCBc2D8UZ1QwNU= github.com/codeshelldev/gotl v0.0.4-7/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-8 h1:HlLUtm2ckgm3T5mhEmhqWBVJbLURIYr7U50BHH5uwpM= +github.com/codeshelldev/gotl v0.0.4-8/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index 2c201dc..d652a2d 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing works again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 97fcd0b92ee6f9a1e39c0adc480c5fd0624d22cc Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:04:12 +0100 Subject: [PATCH 15/41] bump gotl for bugfix --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 08fb26d..4df468c 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-8 +require github.com/codeshelldev/gotl v0.0.4-9 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 3f1d32b..9bd2a3e 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/codeshelldev/gotl v0.0.4-7 h1:C2uXf+J2uUvSHg6XVQ8xMlqNIrHgRRCBc2D8UZ1 github.com/codeshelldev/gotl v0.0.4-7/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-8 h1:HlLUtm2ckgm3T5mhEmhqWBVJbLURIYr7U50BHH5uwpM= github.com/codeshelldev/gotl v0.0.4-8/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-9 h1:yU2jBngMghrjdRHTG7hfbKwqXCacyAFTN/r8GT07kU4= +github.com/codeshelldev/gotl v0.0.4-9/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index d652a2d..a71a0c4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 85cdc8db2585c088e87041d362878174a65518c6 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:09:34 +0100 Subject: [PATCH 16/41] fix token config normilization --- internals/config/tokens.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internals/config/tokens.go b/internals/config/tokens.go index 9204737..716b977 100644 --- a/internals/config/tokens.go +++ b/internals/config/tokens.go @@ -28,7 +28,7 @@ func NormalizeTokens() { tmpConf := configutils.New() tmpConf.Load(config.Raw(), "") - Normalize("token", tmpConf, "overrides", &structure.SETTINGS{}) + Normalize("token", tmpConf, "", &structure.SETTINGS{}) data = append(data, tmpConf.Layer.Raw()) } From 6e69c706f18c4f60d25911f47c0f948525b620be Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:14:30 +0100 Subject: [PATCH 17/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4df468c..0a93803 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-9 +require github.com/codeshelldev/gotl v0.0.4-10 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 9bd2a3e..7495594 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/codeshelldev/gotl v0.0.4-8 h1:HlLUtm2ckgm3T5mhEmhqWBVJbLURIYr7U50BHH5 github.com/codeshelldev/gotl v0.0.4-8/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-9 h1:yU2jBngMghrjdRHTG7hfbKwqXCacyAFTN/r8GT07kU4= github.com/codeshelldev/gotl v0.0.4-9/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-10 h1:JAAZGng+Qsnx1ptLgcKl50IumJ/5+n2LNz3mTrGeGFQ= +github.com/codeshelldev/gotl v0.0.4-10/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= From eecbd14127fba082081042f5d00cec281f9962a9 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:47:10 +0100 Subject: [PATCH 18/41] bump gotl for refactor --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 0a93803..9be1970 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-10 +require github.com/codeshelldev/gotl v0.0.4-11 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 7495594..24e47ab 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/codeshelldev/gotl v0.0.4-9 h1:yU2jBngMghrjdRHTG7hfbKwqXCacyAFTN/r8GT0 github.com/codeshelldev/gotl v0.0.4-9/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-10 h1:JAAZGng+Qsnx1ptLgcKl50IumJ/5+n2LNz3mTrGeGFQ= github.com/codeshelldev/gotl v0.0.4-10/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-11 h1:eWd27FCACTFDrNDoAAApYrw6DMtHpiYeW16QOER7yfU= +github.com/codeshelldev/gotl v0.0.4-11/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index a71a0c4..d652a2d 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From f63351082d2f9a297e502becc3afb54a72bd53bc Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:53:18 +0100 Subject: [PATCH 19/41] bump gotl version for hotfix --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9be1970..a814c99 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-11 +require github.com/codeshelldev/gotl v0.0.4-12 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 24e47ab..0086af0 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ github.com/codeshelldev/gotl v0.0.4-10 h1:JAAZGng+Qsnx1ptLgcKl50IumJ/5+n2LNz3mTr github.com/codeshelldev/gotl v0.0.4-10/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-11 h1:eWd27FCACTFDrNDoAAApYrw6DMtHpiYeW16QOER7yfU= github.com/codeshelldev/gotl v0.0.4-11/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-12 h1:Histq/lsT70+kcvllb96fFki4IBsAnClCyhcKnDjQ88= +github.com/codeshelldev/gotl v0.0.4-12/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index d652a2d..a71a0c4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 26b45236b11541b8d38e77e74d35141a5c1488e9 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:58:07 +0100 Subject: [PATCH 20/41] bump gotl version for another hotfix --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a814c99..ee5d06a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-12 +require github.com/codeshelldev/gotl v0.0.4-13 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 0086af0..d22d4ae 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/codeshelldev/gotl v0.0.4-11 h1:eWd27FCACTFDrNDoAAApYrw6DMtHpiYeW16QOE github.com/codeshelldev/gotl v0.0.4-11/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-12 h1:Histq/lsT70+kcvllb96fFki4IBsAnClCyhcKnDjQ88= github.com/codeshelldev/gotl v0.0.4-12/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-13 h1:FUQVX1fKxD0Jokz7XbRFfcqkmI9UmFEkptfo4F1ZJjM= +github.com/codeshelldev/gotl v0.0.4-13/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index a71a0c4..d652a2d 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 98f5f2162eb8f9911edbff84c47dbaa4d388becc Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Mon, 1 Dec 2025 21:05:41 +0100 Subject: [PATCH 21/41] bump gotl for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ee5d06a..1b45d20 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-13 +require github.com/codeshelldev/gotl v0.0.4-14 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index d22d4ae..3a9ab60 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/codeshelldev/gotl v0.0.4-12 h1:Histq/lsT70+kcvllb96fFki4IBsAnClCyhcKn github.com/codeshelldev/gotl v0.0.4-12/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-13 h1:FUQVX1fKxD0Jokz7XbRFfcqkmI9UmFEkptfo4F1ZJjM= github.com/codeshelldev/gotl v0.0.4-13/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-14 h1:vGw9+71cRqoejwAmw31BKj5khdrsmXHpxMqy4oHqGlk= +github.com/codeshelldev/gotl v0.0.4-14/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index d652a2d..a71a0c4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 8ab127e592bb33bd3c3379e5870e50b674f9f942 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 18:57:04 +0100 Subject: [PATCH 22/41] bump gotl version --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1b45d20..2c04399 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-14 +require github.com/codeshelldev/gotl v0.0.4-15 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 3a9ab60..0d8a784 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,8 @@ github.com/codeshelldev/gotl v0.0.4-13 h1:FUQVX1fKxD0Jokz7XbRFfcqkmI9UmFEkptfo4F github.com/codeshelldev/gotl v0.0.4-13/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-14 h1:vGw9+71cRqoejwAmw31BKj5khdrsmXHpxMqy4oHqGlk= github.com/codeshelldev/gotl v0.0.4-14/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-15 h1:YgpmuwxgNWnKTZ5danx2gP6mgxTWeTVXx9vqtEclxWg= +github.com/codeshelldev/gotl v0.0.4-15/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index a71a0c4..d652a2d 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 4a71cd0ea034d26b60f8bdfa5d408a1fc51433a6 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 19:09:24 +0100 Subject: [PATCH 23/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2c04399..339228c 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-15 +require github.com/codeshelldev/gotl v0.0.4-16 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 0d8a784..2267c98 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/codeshelldev/gotl v0.0.4-14 h1:vGw9+71cRqoejwAmw31BKj5khdrsmXHpxMqy4o github.com/codeshelldev/gotl v0.0.4-14/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-15 h1:YgpmuwxgNWnKTZ5danx2gP6mgxTWeTVXx9vqtEclxWg= github.com/codeshelldev/gotl v0.0.4-15/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-16 h1:2GBPrhgFGTttpOY1mEl3WDGEtQly1bosQqxkmp5Xn0Q= +github.com/codeshelldev/gotl v0.0.4-16/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/internals/config/loader.go b/internals/config/loader.go index d652a2d..a71a0c4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 634fc88a3f8ced1acb827247d3ef956976c96dd5 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 19:19:08 +0100 Subject: [PATCH 24/41] reduce normilization for debugging --- go.mod | 2 +- go.sum | 40 ++------------------------------------ internals/config/loader.go | 6 +++--- internals/config/parser.go | 5 +++++ 4 files changed, 11 insertions(+), 42 deletions(-) diff --git a/go.mod b/go.mod index 339228c..e32ed2e 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-16 +require github.com/codeshelldev/gotl v0.0.4-17 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 2267c98..41affd8 100644 --- a/go.sum +++ b/go.sum @@ -1,39 +1,5 @@ -github.com/codeshelldev/gotl v0.0.2 h1:PQbipYHut3DNvwcrdkQmIGo2p6X6a889Glmba/KIeFQ= -github.com/codeshelldev/gotl v0.0.2/go.mod h1:OzawxKcFw9QEgbeR5H2UXryhYeeLo8xSLme1r8viE+U= -github.com/codeshelldev/gotl v0.0.3 h1:LjtrG1BlP3fLlJWQ0sfl2P7PfLS09h9bgeANX+nEXCM= -github.com/codeshelldev/gotl v0.0.3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-2 h1:zCbsSTKE7R5EWVzoZLoiP1I5MItNr28mFwEjgmGMCl0= -github.com/codeshelldev/gotl v0.0.4-2/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-3 h1:jrsHchBn7FnC6KkSDIoxFlyUVy1y6CLNAS8vEUgqf14= -github.com/codeshelldev/gotl v0.0.4-3/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-4 h1:j5MO1GyQrZQU2Hk220VD1bM8FqmwDsPhNv9BQGvTOwU= -github.com/codeshelldev/gotl v0.0.4-4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-5 h1:r7VJdw7BBAtCMi1rccVzFfM9wXsVGthU6pMVTt5CeQ4= -github.com/codeshelldev/gotl v0.0.4-5/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-6 h1:trHHcrnkCJliXm/vIpbNRTGyQehLyd1cUHpnMYUQ3zk= -github.com/codeshelldev/gotl v0.0.4-6/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-7 h1:C2uXf+J2uUvSHg6XVQ8xMlqNIrHgRRCBc2D8UZ1QwNU= -github.com/codeshelldev/gotl v0.0.4-7/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-8 h1:HlLUtm2ckgm3T5mhEmhqWBVJbLURIYr7U50BHH5uwpM= -github.com/codeshelldev/gotl v0.0.4-8/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-9 h1:yU2jBngMghrjdRHTG7hfbKwqXCacyAFTN/r8GT07kU4= -github.com/codeshelldev/gotl v0.0.4-9/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-10 h1:JAAZGng+Qsnx1ptLgcKl50IumJ/5+n2LNz3mTrGeGFQ= -github.com/codeshelldev/gotl v0.0.4-10/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-11 h1:eWd27FCACTFDrNDoAAApYrw6DMtHpiYeW16QOER7yfU= -github.com/codeshelldev/gotl v0.0.4-11/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-12 h1:Histq/lsT70+kcvllb96fFki4IBsAnClCyhcKnDjQ88= -github.com/codeshelldev/gotl v0.0.4-12/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-13 h1:FUQVX1fKxD0Jokz7XbRFfcqkmI9UmFEkptfo4F1ZJjM= -github.com/codeshelldev/gotl v0.0.4-13/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-14 h1:vGw9+71cRqoejwAmw31BKj5khdrsmXHpxMqy4oHqGlk= -github.com/codeshelldev/gotl v0.0.4-14/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-15 h1:YgpmuwxgNWnKTZ5danx2gP6mgxTWeTVXx9vqtEclxWg= -github.com/codeshelldev/gotl v0.0.4-15/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4-16 h1:2GBPrhgFGTttpOY1mEl3WDGEtQly1bosQqxkmp5Xn0Q= -github.com/codeshelldev/gotl v0.0.4-16/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= -github.com/codeshelldev/gotl v0.0.4 h1:W2cup8Pw9LzFLxmS5QUzY+NSE3ZgiRSUM7FiGd6qJrI= -github.com/codeshelldev/gotl v0.0.4/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-17 h1:t5yeLEOJbEu5kBBzlhpp7VoFgnBIKMtX6UM8IbwrrsA= +github.com/codeshelldev/gotl v0.0.4-17/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= @@ -68,8 +34,6 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= diff --git a/internals/config/loader.go b/internals/config/loader.go index a71a0c4..0af2c99 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -44,8 +44,8 @@ func Load() { LoadTokens() - NormalizeConfig("", defaultsConf) - NormalizeConfig("config", userConf) + //NormalizeConfig("", defaultsConf) + //NormalizeConfig("config", userConf) envConf.LoadEnv(normalizeEnv) @@ -57,7 +57,7 @@ func Load() { mainConf.TemplateConfig() - NormalizeTokens() + //NormalizeTokens() InitConfig() diff --git a/internals/config/parser.go b/internals/config/parser.go index 0222cdd..afb4f50 100644 --- a/internals/config/parser.go +++ b/internals/config/parser.go @@ -2,6 +2,8 @@ package config import ( "strings" + + "github.com/codeshelldev/gotl/pkg/logger" ) var transformFuncs = map[string]func(string, any) (string, any) { @@ -12,13 +14,16 @@ var transformFuncs = map[string]func(string, any) (string, any) { } func keepTransform(key string, value any) (string, any) { + logger.Info(key) return key, value } func lowercaseTransform(key string, value any) (string, any) { + logger.Info(key) return strings.ToLower(key), value } func uppercaseTransform(key string, value any) (string, any) { + logger.Info(key) return strings.ToUpper(key), value } \ No newline at end of file From 11c306136e6f6c6c0cf6058f8d1a52ca7aaa88ca Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 19:22:46 +0100 Subject: [PATCH 25/41] switch to debugging config --- internals/config/loader.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index 0af2c99..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -44,12 +44,12 @@ func Load() { LoadTokens() - //NormalizeConfig("", defaultsConf) + NormalizeConfig("", defaultsConf) //NormalizeConfig("config", userConf) envConf.LoadEnv(normalizeEnv) - NormalizeConfig("env", envConf) + //NormalizeConfig("env", envConf) userConf.MergeLayers(envConf.Layer) From cc76502e6b6aa504d8224dc158a6db20a07865f3 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 19:36:31 +0100 Subject: [PATCH 26/41] bump gotl version for bugfix --- go.mod | 2 +- go.sum | 4 ++-- internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e32ed2e..d56cfe3 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-17 +require github.com/codeshelldev/gotl v0.0.4-18 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 41affd8..0571244 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/codeshelldev/gotl v0.0.4-17 h1:t5yeLEOJbEu5kBBzlhpp7VoFgnBIKMtX6UM8IbwrrsA= -github.com/codeshelldev/gotl v0.0.4-17/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-18 h1:Uv7803qOcaVI7zVyBmadX2SCObHvbO9LBcBUNWa0Ejg= +github.com/codeshelldev/gotl v0.0.4-18/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 59ab1d30988615e457aa4801bbe094560ed45a4a Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 19:44:04 +0100 Subject: [PATCH 27/41] bump gotl version for hotfix --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d56cfe3..9d8c2d5 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-18 +require github.com/codeshelldev/gotl v0.0.4-19 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 0571244..9002c27 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/codeshelldev/gotl v0.0.4-18 h1:Uv7803qOcaVI7zVyBmadX2SCObHvbO9LBcBUNWa0Ejg= github.com/codeshelldev/gotl v0.0.4-18/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-19 h1:dshnBkR7F8BvzVD2aakk8yFKWB7aZZbAA4TjOLrzyaA= +github.com/codeshelldev/gotl v0.0.4-19/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 5d500e22068ff99ead0ced548896d2b61216ddf2 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 20:39:46 +0100 Subject: [PATCH 28/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9d8c2d5..e0c0199 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-19 +require github.com/codeshelldev/gotl v0.0.4-20 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 9002c27..b7db6da 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/codeshelldev/gotl v0.0.4-18 h1:Uv7803qOcaVI7zVyBmadX2SCObHvbO9LBcBUNW github.com/codeshelldev/gotl v0.0.4-18/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-19 h1:dshnBkR7F8BvzVD2aakk8yFKWB7aZZbAA4TjOLrzyaA= github.com/codeshelldev/gotl v0.0.4-19/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-20 h1:B7tTiiDiCpr/WnkK8O6jj2Q+GIzykNgX4qsvTLWyRzQ= +github.com/codeshelldev/gotl v0.0.4-20/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 576cea7da0763b92f7d91c8208daed78dd85d5e6 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Tue, 2 Dec 2025 20:47:56 +0100 Subject: [PATCH 29/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e0c0199..ec4880a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-20 +require github.com/codeshelldev/gotl v0.0.4-21 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index b7db6da..dd5a930 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/codeshelldev/gotl v0.0.4-19 h1:dshnBkR7F8BvzVD2aakk8yFKWB7aZZbAA4TjOL github.com/codeshelldev/gotl v0.0.4-19/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-20 h1:B7tTiiDiCpr/WnkK8O6jj2Q+GIzykNgX4qsvTLWyRzQ= github.com/codeshelldev/gotl v0.0.4-20/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-21 h1:umeAIi56fmAyWw5fz5eXnrje6pAS1nqlDlKrXGhdp9k= +github.com/codeshelldev/gotl v0.0.4-21/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From c087a0a705cb744b129a2d42ec3e3f53866eca73 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:07:36 +0100 Subject: [PATCH 30/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ec4880a..4c2e222 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-21 +require github.com/codeshelldev/gotl v0.0.4-22 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index dd5a930..96d3324 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/codeshelldev/gotl v0.0.4-20 h1:B7tTiiDiCpr/WnkK8O6jj2Q+GIzykNgX4qsvTL github.com/codeshelldev/gotl v0.0.4-20/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-21 h1:umeAIi56fmAyWw5fz5eXnrje6pAS1nqlDlKrXGhdp9k= github.com/codeshelldev/gotl v0.0.4-21/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-22 h1:wfPxZa5B2HX5rhZlbz3Yl2uukNUGko3ayFVPDcA3rmA= +github.com/codeshelldev/gotl v0.0.4-22/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 0aa10d96272e9779b89a8858c07b4957842f0dde Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:18:07 +0100 Subject: [PATCH 31/41] bump gotl version for bugfix --- go.mod | 2 +- go.sum | 2 ++ internals/config/parser.go | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4c2e222..b8996b7 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-22 +require github.com/codeshelldev/gotl v0.0.4-23 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 96d3324..9725eea 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/codeshelldev/gotl v0.0.4-21 h1:umeAIi56fmAyWw5fz5eXnrje6pAS1nqlDlKrXG github.com/codeshelldev/gotl v0.0.4-21/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-22 h1:wfPxZa5B2HX5rhZlbz3Yl2uukNUGko3ayFVPDcA3rmA= github.com/codeshelldev/gotl v0.0.4-22/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-23 h1:A83kFtHLO8ryPxTsH0bXGsx+upzpDOooPLygCePeD6Y= +github.com/codeshelldev/gotl v0.0.4-23/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/parser.go b/internals/config/parser.go index afb4f50..0222cdd 100644 --- a/internals/config/parser.go +++ b/internals/config/parser.go @@ -2,8 +2,6 @@ package config import ( "strings" - - "github.com/codeshelldev/gotl/pkg/logger" ) var transformFuncs = map[string]func(string, any) (string, any) { @@ -14,16 +12,13 @@ var transformFuncs = map[string]func(string, any) (string, any) { } func keepTransform(key string, value any) (string, any) { - logger.Info(key) return key, value } func lowercaseTransform(key string, value any) (string, any) { - logger.Info(key) return strings.ToLower(key), value } func uppercaseTransform(key string, value any) (string, any) { - logger.Info(key) return strings.ToUpper(key), value } \ No newline at end of file From 465d5ca1b03c7069b033a442b339989ba364a073 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:26:22 +0100 Subject: [PATCH 32/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b8996b7..be93d52 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-23 +require github.com/codeshelldev/gotl v0.0.4-24 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 9725eea..5006a4a 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ github.com/codeshelldev/gotl v0.0.4-22 h1:wfPxZa5B2HX5rhZlbz3Yl2uukNUGko3ayFVPDc github.com/codeshelldev/gotl v0.0.4-22/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-23 h1:A83kFtHLO8ryPxTsH0bXGsx+upzpDOooPLygCePeD6Y= github.com/codeshelldev/gotl v0.0.4-23/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-24 h1:XwOlOA1OKjpCuBG4jWe51aVYYghtgPCBPy03F/UYFcc= +github.com/codeshelldev/gotl v0.0.4-24/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 1239b8955e0d4602fc1d2bba5724b61b642e36c6 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:31:43 +0100 Subject: [PATCH 33/41] bump gotl version for another debug --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index be93d52..6dd1fc0 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-24 +require github.com/codeshelldev/gotl v0.0.4-25 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 5006a4a..58828e3 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/codeshelldev/gotl v0.0.4-23 h1:A83kFtHLO8ryPxTsH0bXGsx+upzpDOooPLygCe github.com/codeshelldev/gotl v0.0.4-23/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-24 h1:XwOlOA1OKjpCuBG4jWe51aVYYghtgPCBPy03F/UYFcc= github.com/codeshelldev/gotl v0.0.4-24/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-25 h1:79FIwopXMuKPqYAE/G1dlso5v5LYnREgAmQCfURjYxM= +github.com/codeshelldev/gotl v0.0.4-25/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 1b44600c05ec3fe09e8683f150730fa0ef8db253 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:46:00 +0100 Subject: [PATCH 34/41] bump gotl version for debugging :( --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6dd1fc0..c186ea0 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-25 +require github.com/codeshelldev/gotl v0.0.4-26 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 58828e3..d430a67 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/codeshelldev/gotl v0.0.4-24 h1:XwOlOA1OKjpCuBG4jWe51aVYYghtgPCBPy03F/ github.com/codeshelldev/gotl v0.0.4-24/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-25 h1:79FIwopXMuKPqYAE/G1dlso5v5LYnREgAmQCfURjYxM= github.com/codeshelldev/gotl v0.0.4-25/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-26 h1:qT+ybh/bauRLE4irt45oAV14mCrkmXBG/zeZqryj3Mo= +github.com/codeshelldev/gotl v0.0.4-26/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 07ffaf66eff54239ba3074e871cbc12b9dc4c297 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:53:12 +0100 Subject: [PATCH 35/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index c186ea0..f3845ae 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-26 +require github.com/codeshelldev/gotl v0.0.4-27 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index d430a67..944b572 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/codeshelldev/gotl v0.0.4-25 h1:79FIwopXMuKPqYAE/G1dlso5v5LYnREgAmQCfU github.com/codeshelldev/gotl v0.0.4-25/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-26 h1:qT+ybh/bauRLE4irt45oAV14mCrkmXBG/zeZqryj3Mo= github.com/codeshelldev/gotl v0.0.4-26/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-27 h1:SV8Oad50uYpwMSdLpS6uOkJlSHrvSKi0KBe0Sf+0TQU= +github.com/codeshelldev/gotl v0.0.4-27/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From dcc4c1f51a7aeac6a7da53f6f4e9d10213cbe64b Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Wed, 3 Dec 2025 18:07:06 +0100 Subject: [PATCH 36/41] bump gotl version for debugging --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f3845ae..d5353c6 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-27 +require github.com/codeshelldev/gotl v0.0.4-28 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 944b572..778db3f 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/codeshelldev/gotl v0.0.4-26 h1:qT+ybh/bauRLE4irt45oAV14mCrkmXBG/zeZqr github.com/codeshelldev/gotl v0.0.4-26/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-27 h1:SV8Oad50uYpwMSdLpS6uOkJlSHrvSKi0KBe0Sf+0TQU= github.com/codeshelldev/gotl v0.0.4-27/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-28 h1:Q1lWa0hcvRp1jVJmWicGNsQyupBy/s7N8gi++Jgvf4E= +github.com/codeshelldev/gotl v0.0.4-28/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 8b67a8498b56881c699c1dc5f7c997bc58b7de0d Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Thu, 4 Dec 2025 18:43:21 +0100 Subject: [PATCH 37/41] bump gotl version for testing --- go.mod | 2 +- go.sum | 2 ++ internals/config/loader.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d5353c6..4352619 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeshelldev/secured-signal-api go 1.25.4 -require github.com/codeshelldev/gotl v0.0.4-28 +require github.com/codeshelldev/gotl v0.0.4-29 require go.uber.org/zap v1.27.1 // indirect diff --git a/go.sum b/go.sum index 778db3f..3df5b8d 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/codeshelldev/gotl v0.0.4-27 h1:SV8Oad50uYpwMSdLpS6uOkJlSHrvSKi0KBe0Sf github.com/codeshelldev/gotl v0.0.4-27/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/codeshelldev/gotl v0.0.4-28 h1:Q1lWa0hcvRp1jVJmWicGNsQyupBy/s7N8gi++Jgvf4E= github.com/codeshelldev/gotl v0.0.4-28/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= +github.com/codeshelldev/gotl v0.0.4-29 h1:c1fRnCQsP7DgqyRgYE2+9jg7FlgGsVAdFbeHX1gxe5A= +github.com/codeshelldev/gotl v0.0.4-29/go.mod h1:Mfb+Lb+DV3DUXdA1sixJb2pLawaJGGFFeC29gUZQLcg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..f790f77 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again. + // TODO: Change back to `log.Dev()` as soon as config parsing is working again log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From bcffffb28efc9eaa6ce500295dc2b720f5846a89 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Thu, 4 Dec 2025 19:05:09 +0100 Subject: [PATCH 38/41] pin alpine to v.3.22 due to busybox error during build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8639ca0..4d3bc6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.22 RUN apk --no-cache add ca-certificates ARG IMAGE_TAG From d7bdd9a9a5cff0faeed30696549fd35199fb7e15 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Thu, 4 Dec 2025 19:05:29 +0100 Subject: [PATCH 39/41] - --- internals/config/loader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index f790f77..f0609fa 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -67,7 +67,7 @@ func Load() { } func Log() { - // TODO: Change back to `log.Dev()` as soon as config parsing is working again + // TODO: Change back to `log.Dev()` as soon as config parsing is working again. log.Info("Loaded Config:", mainConf.Layer.All()) log.Info("Loaded Token Configs:", tokenConf.Layer.All()) log.Info("Parsed Configs: ", ENV) From 5e2ae8ec3dfef378d5a76d19cf9801ede73ec8b4 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Thu, 4 Dec 2025 19:10:05 +0100 Subject: [PATCH 40/41] test full suite --- internals/config/loader.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index f0609fa..a71a0c4 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -45,11 +45,11 @@ func Load() { LoadTokens() NormalizeConfig("", defaultsConf) - //NormalizeConfig("config", userConf) + NormalizeConfig("config", userConf) envConf.LoadEnv(normalizeEnv) - //NormalizeConfig("env", envConf) + NormalizeConfig("env", envConf) userConf.MergeLayers(envConf.Layer) @@ -57,7 +57,7 @@ func Load() { mainConf.TemplateConfig() - //NormalizeTokens() + NormalizeTokens() InitConfig() From aa534edf5b835f15036d92906be1bda4c38c448b Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Thu, 4 Dec 2025 19:11:43 +0100 Subject: [PATCH 41/41] use .Get("") for unflattened view --- internals/config/loader.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internals/config/loader.go b/internals/config/loader.go index a71a0c4..3088914 100644 --- a/internals/config/loader.go +++ b/internals/config/loader.go @@ -68,8 +68,8 @@ func Load() { func Log() { // TODO: Change back to `log.Dev()` as soon as config parsing is working again. - log.Info("Loaded Config:", mainConf.Layer.All()) - log.Info("Loaded Token Configs:", tokenConf.Layer.All()) + log.Info("Loaded Config:", mainConf.Layer.Get("")) + log.Info("Loaded Token Configs:", tokenConf.Layer.Get("")) log.Info("Parsed Configs: ", ENV) }