commit 8021c002f63ac2e2d935850594e9d436eb8dfe3e
author Jakub Josef <jakub.josef@gmail.com> Mon Mar 27 15:41:28 2017 +0200
committer Jakub Josef <jakub.josef@gmail.com> Mon Mar 27 15:41:28 2017 +0200
tree e8bfae46a363e640dc60042caf0e4a2b16c6351b
parent b77c081d8e01b5cc741fb074cd6b3f480db9abaa

Removed extra informations in salt exceptions, fixed escaping.

Change-Id: Ie11765caa33a7ad91bcb55b7bd695e40e16d7d62

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index be7dbb4..2d97913 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -139,7 +139,7 @@
     if (output == true) {
         printSaltStateResult(out)
     }
-    checkResult(out, failOnError)
+    checkResult(out, failOnError, !output)
     return out
 }
 
@@ -181,7 +181,7 @@
     if (output == true) {
         printSaltStateResult(out)
     }
-    checkResult(out, failOnError)
+    checkResult(out, failOnError, !output)
     return out
 }
 
@@ -264,9 +264,10 @@
  * Check result for errors and throw exception if any found
  *
  * @param result    Parsed response of Salt API
- * @param failOnError Do you want to throw exception if salt-call fails
+ * @param failOnError Do you want to throw exception if salt-call fails (optional, default true)
+ * @param printStateOnError Do you want to print failed state on error (optional, default true)
  */
-def checkResult(result, failOnError = true) {
+def checkResult(result, failOnError = true, printStateOnError = true) {
     def common = new com.mirantis.mk.Common()
     if(result != null){
         if(result['return']){
@@ -299,10 +300,16 @@
                                    input message: "False result on ${nodeKey} found, resource ${prettyResource}. \nDo you want to continue?"
                                 }
                             }else{
+                                def errorMsg
+                                if(printStateOnError){
+                                    errorMsg = "Salt state on node ${nodeKey} failed: ${resource}. State output: ${node}"
+                                }else{
+                                    errorMsg = "Salt state on node ${nodeKey} failed. Look on error upper."
+                                }
                                 if (failOnError) {
-                                    throw new Exception("Salt state on node ${nodeKey} failed: ${resource}. State output: ${node}")
+                                    throw new Exception(errorMsg)
                                 } else {
-                                    common.errorMsg("Salt state on node ${nodeKey} failed: ${resource}. State output: ${node}")
+                                    common.errorMsg(errorMsg)
                                 }
                             }
                         }
@@ -358,17 +365,17 @@
                                 }
                                 if(!resource["result"] || (resource["result"] instanceof String && resource["result"] != "true")){
                                     if(resource["result"] != null){
-                                        outputResources.add(String.format("Resource: %s\n\\u001B[31m%s\\u001B[0m", resKey, common.prettyPrint(resource)))
+                                        outputResources.add(String.format("Resource: %s\n\u001B[31m%s\u001B[0m", resKey, common.prettyPrint(resource)))
                                     }else{
-                                        outputResources.add(String.format("Resource: %s\n\\u001B[33m%s\\u001B[0m", resKey, common.prettyPrint(resource)))
+                                        outputResources.add(String.format("Resource: %s\n\u001B[33m%s\u001B[0m", resKey, common.prettyPrint(resource)))
                                     }
                                 }else{
                                     if(!onlyChanges || resource.changes.size() > 0){
-                                        outputResources.add(String.format("Resource: %s\n\\u001B[32m%s\\u001B[0m", resKey, common.prettyPrint(resource)))
+                                        outputResources.add(String.format("Resource: %s\n\u001B[32m%s\u001B[0m", resKey, common.prettyPrint(resource)))
                                     }
                                 }
                             }else{
-                                outputResources.add(String.format("Resource: %s\n\\u001B[36m%s\\u001B[0m", resKey, common.prettyPrint(resource)))
+                                outputResources.add(String.format("Resource: %s\n\u001B[36m%s\u001B[0m", resKey, common.prettyPrint(resource)))
                             }
                         }
                         wrap([$class: 'AnsiColorBuildWrapper']) {