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

Merge branch 'powerdnsplugin_01' of github.com:Netflix/lemur into powerdnsplugin_01

Browse Source
This commit is contained in:
csine-nflx
2020-02-03 19:04:05 -08:00
parent 53f81fb09f fecb5b6252
commit c38e651eb0
16 changed files with 129 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/plugins/lemur_adcs/plugin.py
View File

@ -46,7 +46,7 @@ class ADCSIssuerPlugin(IssuerPlugin):
)
current_app.logger.info("Requesting CSR: {0}".format(csr))
current_app.logger.info("Issuer options: {0}".format(issuer_options))
cert, req_id = (
cert = (
ca_server.get_cert(csr, adcs_template, encoding="b64")
.decode("utf-8")
.replace("\r\n", "\n")
@ -54,7 +54,7 @@ class ADCSIssuerPlugin(IssuerPlugin):
chain = (
ca_server.get_ca_cert(encoding="b64").decode("utf-8").replace("\r\n", "\n")
)
return cert, chain, req_id
return cert, chain, None
def revoke_certificate(self, certificate, comments):
raise NotImplementedError("Not implemented\n", self, certificate, comments)

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

@ -212,7 +212,7 @@ class AWSSourcePlugin(SourcePlugin):
if not regions:
regions = ec2.get_regions(account_number=account_number)
else:
regions = regions.split(",")
regions = "".join(regions.split()).split(",")
for region in regions:
elbs = elb.get_all_elbs(account_number=account_number, region=region)