modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 11:48:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use function for validating optional params to reduce code duplicity

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-02-23 20:48:45 +01:00
parent 62e26ba652
commit 7799515994
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module_build_service/views.py
View File

@@ -97,14 +97,18 @@ class ModuleBuildAPI(MethodView):
raise Unauthorized("%s is not in any of %r, only %r" % (
username, conf.allowed_groups, groups))
if "multipart/form-data" in request.headers.get("Content-Type"):
module = self.post_file(username)
else:
module = self.post_scm(username)
def validate_optional_params(params):
forbidden_params = [k for k in params if k not in models.ModuleBuild.__table__.columns]
if forbidden_params:
raise ValidationError('The request contains unspecified parameters: {}'.format(", ".join(forbidden_params)))
kwargs = {"username": username, "validate_optional_params": validate_optional_params}
module = (self.post_file(**kwargs) if "multipart/form-data" in request.headers.get("Content-Type") else
self.post_scm(**kwargs))
return jsonify(module.json()), 201
def post_scm(self, username):
def post_scm(self, username, validate_optional_params):
try:
r = json.loads(request.get_data().decode("utf-8"))
except:
@@ -124,20 +128,14 @@ class ModuleBuildAPI(MethodView):
log.error("The submitted scmurl %r is not valid" % url)
raise Unauthorized("The submitted scmurl %s is not valid" % url)
forbidden_params = [k for k in r if k not in models.ModuleBuild.__table__.columns]
if forbidden_params:
raise ValidationError('The request contains unspecified parameters: {}'.format(", ".join(forbidden_params)))
validate_optional_params(r)
optional_params = {k: v for k, v in r.items() if k != "scmurl"}
return submit_module_build_from_scm(username, url, allow_local_url=False, optional_params=optional_params)
def post_file(self, username):
def post_file(self, username, validate_optional_params):
if not conf.yaml_submit_allowed:
raise Unauthorized("YAML submission is not enabled")
forbidden_params = [k for k in request.form if k not in models.ModuleBuild.__table__.columns]
if forbidden_params:
raise ValidationError('The request contains unspecified parameters: {}'.format(", ".join(forbidden_params)))
validate_optional_params(request.form)
try:
r = request.files["yaml"]