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

Merge pull request #3295 from sirferl/source_options 

make options for sources optional
This commit is contained in:
Hossein Shafagh 2020-12-08 13:19:59 -08:00 committed by GitHub
parent affd077afe 2f5b0fb91a
commit d3d186880b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,15 +77,6 @@ class ADCSSourcePlugin(SourcePlugin):
author = "sirferl" author = "sirferl"
author_url = "https://github.com/sirferl/lemur" author_url = "https://github.com/sirferl/lemur"
options = [
{
"name": "dummy",
"type": "str",
"required": False,
"validation": "/^[0-9]{12,12}$/",
"helpMessage": "Just to prevent error",
}
]
def get_certificates(self, options, **kwargs): def get_certificates(self, options, **kwargs):
adcs_server = current_app.config.get("ADCS_SERVER") adcs_server = current_app.config.get("ADCS_SERVER")

9
lemur/plugins/lemur_entrust/plugin.py
View File

@ -319,15 +319,6 @@ class EntrustSourcePlugin(SourcePlugin):
author = "sirferl" author = "sirferl"
author_url = "https://github.com/sirferl/lemur" author_url = "https://github.com/sirferl/lemur"
options = [
{
"name": "dummy",
"type": "str",
"required": False,
"validation": "/^[0-9]{12,12}$/",
"helpMessage": "Just to prevent error",
}
]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Initialize the issuer with the appropriate details.""" """Initialize the issuer with the appropriate details."""

19
lemur/sources/views.py
View File

@ -156,12 +156,19 @@ class SourcesList(AuthenticatedResource):
:reqheader Authorization: OAuth token to authenticate :reqheader Authorization: OAuth token to authenticate
:statuscode 200: no error :statuscode 200: no error
""" """
return service.create( if "plugin_options" in data["plugin"]:
data["label"], return service.create(
data["plugin"]["slug"], data["label"],
data["plugin"]["plugin_options"], data["plugin"]["slug"],
data["description"], data["plugin"]["plugin_options"],
) data["description"],
)
else:
return service.create(
data["label"],
data["plugin"]["slug"],
data["description"],
)
class Sources(AuthenticatedResource): class Sources(AuthenticatedResource):