Fixed #406 -- return error detail if sudo fails in knife bootstrap.

Author: mboersma

api/exceptions.py

@@ -0,0 +1,17 @@
+"""
+Deis exception classes.
+"""
+
+from __future__ import unicode_literals
+
+from rest_framework.exceptions import APIException
+from rest_framework import status
+
+
+class BuildNodeError(APIException):
+    """Indicates a problem in building or bootstrapping a node."""
+
+    status_code = status.HTTP_401_UNAUTHORIZED
+
+    def __init__(self, detail=None):
+        self.detail = detail

api/tasks.py

@@ -6,6 +6,7 @@
 
 from deis import settings
 from provider import import_provider_module
+from .exceptions import BuildNodeError
 
 # import user-defined config management module
 CM = importlib.import_module(settings.CM_MODULE)
@@ -32,7 +33,10 @@ def build_node(node):
     node.fqdn = fqdn
     node.metadata = metadata
     node.save()
-    CM.bootstrap_node(node.flat())
+    try:
+        CM.bootstrap_node(node.flat())
+    except RuntimeError as err:
+        raise BuildNodeError(str(err))
 
 
 @task

client/deis.py

@@ -2011,10 +2011,9 @@ def main():
     cmd, help_flag = parse_args(cmd)
     # print help if it was asked for
     if help_flag:
-        if cmd != 'help':
-            if cmd in dir(cli):
-                print(trim(getattr(cli, cmd).__doc__))
-                return
+        if cmd != 'help' and cmd in dir(cli):
+            print(trim(getattr(cli, cmd).__doc__))
+            return
         docopt(__doc__, argv=['--help'])
     # unless cmd needs to use sys.argv directly
     if hasattr(cli, cmd):
@@ -2036,6 +2035,8 @@ def main():
         print('{} {}'.format(resp.status_code, resp.reason))
         try:
             msg = resp.json()
+            if 'detail' in msg:
+                msg = "Detail:\n{}".format(msg['detail'])
         except:
             msg = resp.text
         print(msg)

cm/chef.py

@@ -111,8 +111,8 @@ def bootstrap_node(node):
             output = f.read()
         print(output)
         # raise an exception if bootstrap failed
-        if rc != 0:
-            raise RuntimeError('Node Bootstrap Error')
+        if rc != 0 or 'incorrect password' in output:
+            raise RuntimeError('Node Bootstrap Error:\n' + output)
     # remove temp files from filesystem
     finally:
         os.remove(pk_path)

docs/server/api.exceptions.rst

@@ -0,0 +1,13 @@
+:description: Python API Reference for the Deis api.exceptions module
+:keywords: deis, api.exceptions, python, api
+
+==============
+api.exceptions
+==============
+
+.. contents::
+    :local:
+.. currentmodule:: api.exceptions
+
+.. automodule:: api.exceptions
+    :members:

docs/server/index.rst

@@ -15,6 +15,7 @@ Server Reference
     rest
 
     api.admin
+    api.exceptions
     api.fields
     api.models
     api.routers