commit 4901a04c273ff494be6bef0dbffa79de52de78e7
author chnyda <chnyda@mirantis.com> Thu Nov 16 12:14:56 2017 +0100
committer Cedric Hnyda <chnyda@mirantis.com> Thu Nov 16 11:15:19 2017 +0000
tree 1464843d42390a5b4d3d5d4b7860f130fa85e0ae
parent 999fda9ac2b385700ab29a8a4bfe2d04b19c97af

Use new pepper option --json-file to fix escaping problems

Change-Id: I94dabcffb6ce236d37dbcbb9e9942c2fcfd9df7e

src/com/mirantis/mk/Python.groovy

diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 0d2287c..c746ef2 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -302,8 +302,11 @@
     def common = new com.mirantis.mk.Common()
 
     // virtualenv setup
-    requirements = ['salt-pepper']
+    // TODO: once pepper changes are in pypi, reenable these lines
+    // requirements = ['salt-pepper']
+    requirements = []
     setupVirtualenv(path, 'python2', requirements, null, false, true)
+    runVirtualenvCommand(path, "pip install git+https://github.com/chnyda/pepper.git")
 
     // pepperrc creation
     rcFile = "${path}/pepperrc"

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 6cc9a23..dc9bd6f 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -663,8 +663,10 @@
 def runPepperCommand(data, venv)   {
     def python = new com.mirantis.mk.Python()
     def dataStr = new groovy.json.JsonBuilder(data).toString()
-    dataStr = dataStr.replaceAll('"', '\\\\\"').replaceAll('\\$','\\\\\\$');
-    def pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv}/.peppercache --json \"" + dataStr + "\""
+
+    pepperCmdFile = "${venv}/pepper-cmd.json"
+    writeFile file: pepperCmdFile, text: dataStr
+    def pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv}/.peppercache --json-file ${pepperCmdFile}"
 
     if (venv) {
         output = python.runVirtualenvCommand(venv, pepperCmd)