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

Fixes #8679

1 files changed, 10 insertions, 2 deletions

diff --git a/common/maps/params.go b/common/maps/params.go
index 7e94d593b..e5a1bd07d 100644
--- a/common/maps/params.go
+++ b/common/maps/params.go
@@ -226,7 +226,7 @@ func toMergeStrategy(v interface{}) ParamsMergeStrategy {
 // PrepareParams
 // * makes all the keys in the given map lower cased and will do so
 // * This will modify the map given.
-// * Any nested map[interface{}]interface{} will be converted to Params.
+// * Any nested map[interface{}]interface{}, map[string]interface{},map[string]string  will be converted to Params.
 // * Any _merge value will be converted to proper type and value.
 func PrepareParams(m Params) {
 	for k, v := range m {
@@ -236,7 +236,7 @@ func PrepareParams(m Params) {
 			v = toMergeStrategy(v)
 			retyped = true
 		} else {
-			switch v.(type) {
+			switch vv := v.(type) {
 			case map[interface{}]interface{}:
 				var p Params = cast.ToStringMap(v)
 				v = p
@@ -247,6 +247,14 @@ func PrepareParams(m Params) {
 				v = p
 				PrepareParams(p)
 				retyped = true
+			case map[string]string:
+				p := make(Params)
+				for k, v := range vv {
+					p[k] = v
+				}
+				v = p
+				PrepareParams(p)
+				retyped = true
 			}
 		}