commit f92cf4f4d197e48b656359c1ff0684c80b1eb509
author Vasyl Saienko <vsaienko@mirantis.com> Wed Jul 10 12:39:25 2019 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Wed Jul 10 12:44:23 2019 +0300
tree 5a1ee0fd6168e05e9736a978b3381122c8ad4b76
parent 232d3a36af97e4f1dbb606fc47e116ee42ba2a2a

Fix mergeMaps adding list to empty map

The patch fixes case when trying to add list to non existed
in original map key.

Related-Prod: PROD-31855

Change-Id: I937ed705b1e0186dfe17d40cd552c51b1bcf956d

src/com/mirantis/mk/Common.groovy

diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy
index 9a350c2..c0059bb 100644
--- a/src/com/mirantis/mk/Common.groovy
+++ b/src/com/mirantis/mk/Common.groovy
@@ -460,10 +460,14 @@
     }
     else if (overrides.length == 1) {
         overrides[0]?.each { k, v ->
-            if (v in Map && onto[k] in Map){
-                mergeMaps((Map) onto[k], (Map) v)
-            } else if (v in List) {
-                onto[k] += v
+            if (k in onto.keySet()) {
+                if (v in Map && onto[k] in Map){
+                    mergeMaps((Map) onto[k], (Map) v)
+                } else if (v in List) {
+                    onto[k] += v
+                } else {
+                    onto[k] = v
+                }
             } else {
                 onto[k] = v
             }