config: Fix merge of config with map[string]string values.

Fixes #8679

1 files changed, 14 insertions, 6 deletions

diff --git a/config/defaultConfigProvider.go b/config/defaultConfigProvider.go
index d9c9db7f1..fd32c08a6 100644
--- a/config/defaultConfigProvider.go
+++ b/config/defaultConfigProvider.go
@@ -163,10 +163,9 @@ func (c *defaultConfigProvider) Set(k string, v interface{}) {
 	}
 
 	switch vv := v.(type) {
-	case map[string]interface{}:
-		var p maps.Params = vv
+	case map[string]interface{}, map[interface{}]interface{}, map[string]string:
+		p := maps.MustToParamsAndPrepare(vv)
 		v = p
-		maps.PrepareParams(p)
 	}
 
 	key, m := c.getNestedKeyAndMap(k, true)
@@ -183,6 +182,16 @@ func (c *defaultConfigProvider) Set(k string, v interface{}) {
 	m[key] = v
 }
 
+// SetDefaults will set values from params if not already set.
+func (c *defaultConfigProvider) SetDefaults(params maps.Params) {
+	maps.PrepareParams(params)
+	for k, v := range params {
+		if _, found := c.root[k]; !found {
+			c.root[k] = v
+		}
+	}
+}
+
 func (c *defaultConfigProvider) Merge(k string, v interface{}) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
@@ -226,10 +235,9 @@ func (c *defaultConfigProvider) Merge(k string, v interface{}) {
 	}
 
 	switch vv := v.(type) {
-	case map[string]interface{}:
-		var p maps.Params = vv
+	case map[string]interface{}, map[interface{}]interface{}, map[string]string:
+		p := maps.MustToParamsAndPrepare(vv)
 		v = p
-		maps.PrepareParams(p)
 	}
 
 	key, m := c.getNestedKeyAndMap(k, true)