Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Hossein Shafagh 2020-03-23 20:31:16 -07:00 committed by GitHub
parent edf1f9c6ad 001ad3b8d9
commit 88c40aa93c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lemur/certificates/models.py
View File

@ -445,6 +445,9 @@ def update_destinations(target, value, initiator):
""" """
destination_plugin = plugins.get(value.plugin_name) destination_plugin = plugins.get(value.plugin_name)
status = FAILURE_METRIC_STATUS status = FAILURE_METRIC_STATUS
if target.expired:
return
try: try:
if target.private_key or not destination_plugin.requires_key: if target.private_key or not destination_plugin.requires_key:
destination_plugin.upload( destination_plugin.upload(

3
lemur/plugins/lemur_aws/plugin.py
View File

@ -325,6 +325,7 @@ class AWSDestinationPlugin(DestinationPlugin):
] ]
def upload(self, name, body, private_key, cert_chain, options, **kwargs): def upload(self, name, body, private_key, cert_chain, options, **kwargs):
try:
iam.upload_cert( iam.upload_cert(
name, name,
body, body,
@ -333,6 +334,8 @@ class AWSDestinationPlugin(DestinationPlugin):
cert_chain=cert_chain, cert_chain=cert_chain,
account_number=self.get_option("accountNumber", options), account_number=self.get_option("accountNumber", options),
) )
except ClientError:
sentry.captureException()
def deploy(self, elb_name, account, region, certificate): def deploy(self, elb_name, account, region, certificate):
pass pass