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

Minor errors. (#484)

This commit is contained in:
kevgliss 2016-11-10 14:34:45 -08:00 committed by GitHub
parent 89470a0ce0
commit 94d619cfa6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemur/plugins/lemur_digicert/plugin.py
View File

@ -74,7 +74,7 @@ def get_issuance(options):
:param options: :param options:
:return: :return:
""" """
if not options['validity_end']: if not options.get('validity_end'):
options['validity_end'] = arrow.utcnow().replace(years=current_app.config.get('DIGICERT_DEFAULT_VALIDITY', 1)) options['validity_end'] = arrow.utcnow().replace(years=current_app.config.get('DIGICERT_DEFAULT_VALIDITY', 1))
validity_years = determine_validity_years(options['validity_end']) validity_years = determine_validity_years(options['validity_end'])
@ -149,12 +149,12 @@ def verify_configuration():
raise Exception("No Digicert intermediate found. Ensure that 'DIGICERT_INTERMEDIATE is set in Lemur conf.") raise Exception("No Digicert intermediate found. Ensure that 'DIGICERT_INTERMEDIATE is set in Lemur conf.")
@retry(stop_max_attempt_number=10, wait_fixed=100000) @retry(stop_max_attempt_number=10, wait_fixed=10000)
def get_certificate_id(session, base_url, order_id): def get_certificate_id(session, base_url, order_id):
"""Retrieve certificate order id from Digicert API.""" """Retrieve certificate order id from Digicert API."""
order_url = "{0}/services/v2/order/certificate/{1}".format(base_url, order_id) order_url = "{0}/services/v2/order/certificate/{1}".format(base_url, order_id)
response_data = handle_response(session.get(order_url)) response_data = handle_response(session.get(order_url))
if response_data['status'] == 'issued': if response_data['status'] != 'issued':
raise Exception("Order not in issued state.") raise Exception("Order not in issued state.")
return response_data['certificate']['id'] return response_data['certificate']['id']