From 63603679a59824a17b4cf8abba225af4d7346920 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 13 Oct 2025 14:50:55 +0200 Subject: [PATCH] remove obsolete comment Signed-off-by: Christian Richter --- services/proxy/pkg/middleware/security.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/proxy/pkg/middleware/security.go b/services/proxy/pkg/middleware/security.go index 0765b3117..c81c791ee 100644 --- a/services/proxy/pkg/middleware/security.go +++ b/services/proxy/pkg/middleware/security.go @@ -27,15 +27,7 @@ func loadCSPConfig(presetYamlContent, customYamlContent []byte) (*config.CSP, er // substitute env vars and load to struct gofig.WithOptions(gofig.ParseEnv) gofig.AddDriver(yaml.Driver) - - // TODO: merge all sources into one struct - // ATM it is untested how this merger behaves with multiple sources - // it might be better to load preset and custom separately and then merge structs - // or load preset first and then custom to override values - // especially in hindsight that there will be autoloaded config files from webapps - // in the future - // TIL: gofig does not merge, it overwrites values from later sources - + presetMap := map[string]interface{}{} err := yamlv3.Unmarshal(presetYamlContent, &presetMap) if err != nil {