Merge pull request #75 from app-registry/exit_with_helm_errorcode

Exit with same errorcode than helm

Changelog.md

@@ -1,3 +1,8 @@
+## 0.7.3 Released on 2017-09-02
+
+- Fix #72: MacOS build
+- Fix #73: Exit with the same error-code than Helm
+
 ## 0.7.2 Released on 2017-08-13
 
 - Add login/creds per namespaces / repo

appr/commands/command_base.py

@@ -5,7 +5,7 @@
 import json
 import os
 import re
-
+import subprocess
 import requests
 import yaml
 
@@ -143,6 +143,11 @@ def exec_cmd(self, render=True):
                 payload["response"] = content
             self.render_error(payload)
             exit(2)
+        except subprocess.CalledProcessError as exc:
+            payload = {"message": str(exc.output)}
+            self.render_error(payload)
+            exit(exc.returncode)
+
         if render:
             self.render()
 

appr/commands/helm.py

@@ -3,6 +3,7 @@
 import argparse
 import os
 import tempfile
+import subprocess
 from copy import copy
 from appr.commands.command_base import CommandBase
 from appr.commands.pull import PullCmd
@@ -35,7 +36,12 @@ def exec_helm_cmd(self, cmd, options, helm_opts):
         pull_cmd = PullCmd(options)
         pull_cmd.exec_cmd(render=False)
         helm_cli = Helm()
-        output = helm_cli.action(cmd, pull_cmd.path, helm_opts)
+        try:
+            output = helm_cli.action(cmd, pull_cmd.path, helm_opts)
+        except subprocess.CalledProcessError as exc:
+            payload = {"message": str(exc.output)}
+            self.render_error(payload)
+            exit(exc.returncode)
         self.status = {'result': output}
         self.render()
 

appr/plugins/helm.py

@@ -83,7 +83,4 @@ def action(self, cmd, package_path, helm_opts=None):
 
     def _call(self, cmd):
         command = ['helm'] + cmd
-        try:
-            return subprocess.check_output(command, stderr=subprocess.STDOUT)
-        except subprocess.CalledProcessError as exc:
-            return exc.output
+        return subprocess.check_output(command, stderr=subprocess.STDOUT)

setup.py

@@ -37,6 +37,7 @@
 
 extra_requirements = [
     'urllib3[secure]<1.22',
+    'pyopenssl',
     'jinja2>=2.8',
     'jsonpatch',
     'tabulate',