Skip to content

Commit d19f75f

Browse files
committed
finished testing
1 parent 7186778 commit d19f75f

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

utils/config/config.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"strings"
88
"sync"
99

10-
"github.com/codeshelldev/secured-signal-api/utils"
1110
log "github.com/codeshelldev/secured-signal-api/utils/logger"
1211
"github.com/codeshelldev/secured-signal-api/utils/safestrings"
1312

@@ -185,16 +184,12 @@ func transformChildrenUnderArray(config *koanf.Koanf, root string, subPath strin
185184
"item": data,
186185
}, "."), nil)
187186

188-
log.Dev(utils.ToJson(tmp.All()))
189-
190187
err := transformChildren(tmp, "item." + subPath, transform)
191188

192189
if err != nil {
193190
return err
194191
}
195192

196-
log.Dev(utils.ToJson(tmp.All()))
197-
198193
item := tmp.Get("item")
199194

200195
if item != nil {
@@ -206,9 +201,7 @@ func transformChildrenUnderArray(config *koanf.Koanf, root string, subPath strin
206201
}
207202
}
208203

209-
config.Load(confmap.Provider(map[string]any{
210-
root: map[string]any{},
211-
}, "."), nil)
204+
config.Delete(root)
212205

213206
config.Load(confmap.Provider(map[string]any{
214207
root: transformed,

utils/config/loader.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"strings"
99

1010
middlewareTypes "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares/types"
11-
"github.com/codeshelldev/secured-signal-api/utils"
1211
log "github.com/codeshelldev/secured-signal-api/utils/logger"
1312
"github.com/knadh/koanf/parsers/yaml"
1413
)
@@ -88,9 +87,6 @@ func Load() {
8887
InitEnv()
8988

9089
log.Info("Finished Loading Configuration")
91-
92-
log.Dev(utils.ToJson(config.All()))
93-
log.Dev(utils.ToJson(ENV))
9490
}
9591

9692
func LoadDefaults() {

utils/config/tokens.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"strconv"
55
"strings"
66

7-
"github.com/codeshelldev/secured-signal-api/utils"
87
log "github.com/codeshelldev/secured-signal-api/utils/logger"
98
"github.com/knadh/koanf/parsers/yaml"
109
)
@@ -29,16 +28,10 @@ func InitTokens() {
2928

3029
var tokenConfigs []TOKEN_CONFIG_
3130

32-
err := transformChildrenUnderArray(tokensLayer, "tokenconfigs", "overrides.variables", func(key string, value any) (string, any) {
31+
transformChildrenUnderArray(tokensLayer, "tokenconfigs", "overrides.variables", func(key string, value any) (string, any) {
3332
return strings.ToUpper(key), value
3433
})
3534

36-
if err != nil {
37-
log.Dev(err.Error())
38-
}
39-
40-
log.Dev(utils.ToJson(tokensLayer.All()))
41-
4235
tokensLayer.Unmarshal("tokenconfigs", &tokenConfigs)
4336

4437
overrides := parseTokenConfigs(tokenConfigs)

0 commit comments

Comments
 (0)