Merge branch 'master' into powerdnsplugin_02

2020-03-27 10:27:33 -07:00
parent 0e314d0028 001ad3b8d9
commit 2b7e60399c
4 changed files with 202 additions and 39 deletions
--- a/lemur/plugins/lemur_aws/plugin.py
+++ b/lemur/plugins/lemur_aws/plugin.py
@@ -325,14 +325,17 @@ class AWSDestinationPlugin(DestinationPlugin):
    ]

    def upload(self, name, body, private_key, cert_chain, options, **kwargs):
-        iam.upload_cert(
-            name,
-            body,
-            private_key,
-            self.get_option("path", options),
-            cert_chain=cert_chain,
-            account_number=self.get_option("accountNumber", options),
-        )
+        try:
+            iam.upload_cert(
+                name,
+                body,
+                private_key,
+                self.get_option("path", options),
+                cert_chain=cert_chain,
+                account_number=self.get_option("accountNumber", options),
+            )
+        except ClientError:
+            sentry.captureException()

    def deploy(self, elb_name, account, region, certificate):
        pass