Issue/55 (#57)

wrapping deploy in try / catch
awslabs · May 29, 2019 · 2148f64 · 2148f64
1 parent f0a9094
commit 2148f64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/servicecatalog_puppet/core.py b/servicecatalog_puppet/core.py
@@ -2,6 +2,7 @@
 import os
 import time
 from threading import Thread
+import traceback
 
 import yaml
 from betterboto import client as betterboto_client
@@ -563,7 +564,6 @@ def process_stream(stream_name, stream, parameters, puppet_account_id, deploymen
             should_deploy = True
 
             if provisioned_product_id:
-                #  [{'Key': 'Path', 'Value': '/human-roles/'}, {'Key': 'RoleName', 'Value': 'DevOps'}]
                 with betterboto_client.CrossAccountClientContextManager(
                         'cloudformation', role, f"cfn-{account}-{region}", region_name=region
                 ) as cloudformation:
@@ -583,19 +583,23 @@ def process_stream(stream_name, stream, parameters, puppet_account_id, deploymen
                         should_deploy = False
 
             if should_deploy:
-                deploy_launch_to_account_and_region(
-                    service_catalog,
-                    launch,
-                    account,
-                    region,
-                    product_id,
-                    provisioning_artifact_id,
-                    provisioned_product_name,
-                    puppet_account_id,
-                    path_id,
-                    params,
-                    launch.get('version'),
-                )
+                try:
+                    deploy_launch_to_account_and_region(
+                        service_catalog,
+                        launch,
+                        account,
+                        region,
+                        product_id,
+                        provisioning_artifact_id,
+                        provisioned_product_name,
+                        puppet_account_id,
+                        path_id,
+                        params,
+                        launch.get('version'),
+                    )
+                except Exception as e:
+                    logger.error(''.join(traceback.format_exception(None, e, e.__traceback__)))
+
 
     logger.info('Finished creating stacks')
 

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setuptools.setup(
     name="aws-service-catalog-puppet",
-    version="0.0.44",
+    version="0.0.45",
     author="Eamonn Faherty",
     author_email="aws-service-catalog-tools@amazon.com",
     description="Making it easier to deploy ServiceCatalog products",