From 432205756e8c4575b2a1138a6ef6b1e173bee721 Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Tue, 17 Sep 2019 17:52:53 +0200
Subject: [PATCH] improvement: better error output when ext commands fail (e.g.
 kubectl)

---
 garden-service/src/util/ext-tools.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/garden-service/src/util/ext-tools.ts b/garden-service/src/util/ext-tools.ts
index e00b44df27..d679233d09 100644
--- a/garden-service/src/util/ext-tools.ts
+++ b/garden-service/src/util/ext-tools.ts
@@ -283,8 +283,16 @@ export class BinaryCmd extends Library {
   }
 
   async stdout(params: ExecParams) {
-    const res = await this.exec(params)
-    return res.stdout
+    try {
+      const res = await this.exec(params)
+      return res.stdout
+    } catch (err) {
+      // Add log output to error
+      if (err.all) {
+        err.message += "\n\n" + err.all
+      }
+      throw err
+    }
   }
 
   async json(params: ExecParams) {