Add cert name to check-pki-certs command
Adds a table column for the certificate name. Each row of data will now be printed with the file name, certificate name, and certificate expiration date. Change-Id: I088ba2e794f33cd858f36275d00dd431862f1c25
This commit is contained in:
parent
cf10929ddc
commit
87d24d530a
@ -235,7 +235,7 @@ def check_cert_expiry(site_name, duration=60):
|
|||||||
pki_util = PKIUtility(duration=duration)
|
pki_util = PKIUtility(duration=duration)
|
||||||
# Create a table to output expired/expiring certs for this site.
|
# Create a table to output expired/expiring certs for this site.
|
||||||
cert_table = PrettyTable()
|
cert_table = PrettyTable()
|
||||||
cert_table.field_names = ['cert_name', 'expiration_date']
|
cert_table.field_names = ['file', 'cert_name', 'expiration_date']
|
||||||
|
|
||||||
s = definition.site_files(site_name)
|
s = definition.site_files(site_name)
|
||||||
for doc in s:
|
for doc in s:
|
||||||
@ -250,7 +250,11 @@ def check_cert_expiry(site_name, duration=60):
|
|||||||
cert = result['data']
|
cert = result['data']
|
||||||
cert_info = pki_util.check_expiry(cert)
|
cert_info = pki_util.check_expiry(cert)
|
||||||
if cert_info['expired'] is True:
|
if cert_info['expired'] is True:
|
||||||
cert_table.add_row([doc, cert_info['expiry_date']])
|
cert_table.add_row(
|
||||||
|
[
|
||||||
|
doc, result['metadata']['name'],
|
||||||
|
cert_info['expiry_date']
|
||||||
|
])
|
||||||
|
|
||||||
# Return table of cert names and expiration dates that are expiring
|
# Return table of cert names and expiration dates that are expiring
|
||||||
return cert_table.get_string()
|
return cert_table.get_string()
|
||||||
|
Loading…
Reference in New Issue
Block a user