Merge pull request #202 from airbnb/ryandeivert-bug-fix-200

[cli][bug] fixing bug related terraform not being installed. resolves #200

stream_alert_cli/helpers.py

@@ -59,6 +59,9 @@ def run_command(runner_args, **kwargs):
     except subprocess.CalledProcessError as err:
         LOGGER_CLI.error('%s\n%s', error_message, err.cmd)
         return False
+    except OSError as err:
+        LOGGER_CLI.error('%s\n%s (%s)', error_message, err.strerror, runner_args[0])
+        return False
 
     return True
 

stream_alert_cli/runner.py

@@ -84,9 +84,9 @@ def lambda_handler(options):
 
 def terraform_check():
     """Verify that Terraform is configured correctly"""
-    prereqs_message = ('Terraform not found! Please install and add to'
+    prereqs_message = ('Terraform not found! Please install and add to '
                        'your $PATH:\n'
-                       '$ export PATH=$PATH:/usr/local/terraform/bin')
+                       '\t$ export PATH=$PATH:/usr/local/terraform/bin')
     run_command(['terraform', 'version'],
                 error_message=prereqs_message,
                 quiet=True)
@@ -95,7 +95,8 @@ def terraform_check():
 def terraform_handler(options):
     """Handle all Terraform CLI operations"""
     # verify terraform is installed
-    terraform_check()
+    if not terraform_check():
+        return
     # use a named tuple to match the 'processor' attribute in the argparse options
     deploy_opts = namedtuple('DeployOptions', ['processor'])