From 8097a834faa7901d8012ce8a8e073acd0485ac3a Mon Sep 17 00:00:00 2001
From: Joris De Winne <joris.dewinne@gmail.com>
Date: Fri, 12 Jan 2018 14:57:56 -0800
Subject: [PATCH] Issue #25: Adding a map to process variables

---
 src/main/resources/synthetic.xml                   |  4 +++-
 src/main/resources/xlr/CreateAndStartSubRelease.py | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
index 6d4a1c6..d73963f 100644
--- a/src/main/resources/synthetic.xml
+++ b/src/main/resources/synthetic.xml
@@ -36,8 +36,10 @@
                   description="Name of the newly created subrelease."/>
         <property name="releaseDescription" category="input" label="Release Description" required="false" size="large"
                   description="Description of the subrelease."/>
-        <property name="variables" category="input" required="false"
+        <property name="variables" category="input" required="false" label="variables (deprecated)"
                   description="Comma-separated key-value pairs for the values of variables required by the subrelease, e.g. var1=value1,var2=value2"/>
+        <property name="variableMap" category="input" required="false" label="variables" kind="map_string_string"
+                  description="Map of variables required by the subrelease, where key is the variable name and value the actual value"/>
         <property name="asynch" category="input" required="false" kind="boolean" default="false"
                   description="If [false], the task will wait for the subrelease to finish."/>
         <property name="gateTaskTitle" category="input" required="false" kind="string"
diff --git a/src/main/resources/xlr/CreateAndStartSubRelease.py b/src/main/resources/xlr/CreateAndStartSubRelease.py
index 86d2a01..08e707b 100644
--- a/src/main/resources/xlr/CreateAndStartSubRelease.py
+++ b/src/main/resources/xlr/CreateAndStartSubRelease.py
@@ -8,7 +8,7 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-
+import json
 import sys
 import time
 
@@ -19,18 +19,20 @@ def find_planned_gate_task(tasks):
         if task.getType() == "xlrelease.GateTask" and task["status"] == "PLANNED":
             return task
 
-def process_variables(variables, updatable_variables):
+def process_variables(variables, variable_map, updatable_variables):
     var_map = {}
     if variables is not None:
         for variable in variables.split(','):
             var_map[variable.split('=', 1)[0]]= variable.split('=', 1)[1]
 
+    var_map.update(variable_map)
+
     for updatable_variable in updatable_variables:
         key = str(updatable_variable["key"]).strip("${").strip("}")
         if key in var_map:
             updatable_variable["value"] = var_map[key]
 
-    return str(updatable_variables).replace("u'","'").replace("'", '"').replace("None","null").replace("True","true").replace("False","false")
+    return json.dumps(updatable_variables).replace("None","null").replace("True","true").replace("False","false")
 
 if xlrServer is None:
     print "No server provided."
@@ -43,7 +45,7 @@ def process_variables(variables, updatable_variables):
 
 # Create Release
 updatable_variables = xlr_client.get_updatable_variables(template.id)
-vars = process_variables(variables, updatable_variables)
+vars = process_variables(variables, variableMap, updatable_variables)
 if releaseDescription is None:
     releaseDescription = ""