almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Catch ProjectsError and return an error 400 with a message.

Browse Source
This commit is contained in:
Brian C. Lane 2017-11-21 13:38:56 -08:00
parent a1e7e4831d
commit 8fee86a5db
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/pylorax/api/v0.py
View File

@ -25,7 +25,7 @@ from pykickstart.version import makeVersion, RHEL7
from pylorax.api.crossdomain import crossdomain from pylorax.api.crossdomain import crossdomain
from pylorax.api.projects import projects_list, projects_info, projects_depsolve from pylorax.api.projects import projects_list, projects_info, projects_depsolve
from pylorax.api.projects import modules_list, modules_info from pylorax.api.projects import modules_list, modules_info, ProjectsError
from pylorax.api.recipes import list_branch_files, read_recipe_commit, recipe_filename, list_commits from pylorax.api.recipes import list_branch_files, read_recipe_commit, recipe_filename, list_commits
from pylorax.api.recipes import recipe_from_dict, recipe_from_toml, commit_recipe, delete_recipe, revert_recipe from pylorax.api.recipes import recipe_from_dict, recipe_from_toml, commit_recipe, delete_recipe, revert_recipe
from pylorax.api.recipes import tag_recipe_commit, recipe_diff from pylorax.api.recipes import tag_recipe_commit, recipe_diff
@ -263,7 +263,7 @@ def v0_api(api):
old_recipe = read_recipe_commit(api.config["GITLOCK"].repo, "master", recipe_name, from_commit) old_recipe = read_recipe_commit(api.config["GITLOCK"].repo, "master", recipe_name, from_commit)
except Exception as e: except Exception as e:
log.error("(v0_recipes_diff) %s", str(e)) log.error("(v0_recipes_diff) %s", str(e))
return jsonify(status=False, error={"msg":str(e)}), 400 return jsonify(error={"msg":str(e)}), 400
try: try:
if to_commit == "WORKSPACE": if to_commit == "WORKSPACE":
@ -277,7 +277,7 @@ def v0_api(api):
new_recipe = read_recipe_commit(api.config["GITLOCK"].repo, "master", recipe_name, to_commit) new_recipe = read_recipe_commit(api.config["GITLOCK"].repo, "master", recipe_name, to_commit)
except Exception as e: except Exception as e:
log.error("(v0_recipes_diff) %s", str(e)) log.error("(v0_recipes_diff) %s", str(e))
return jsonify(status=False, error={"msg":str(e)}), 400 return jsonify(error={"msg":str(e)}), 400
diff = recipe_diff(old_recipe, new_recipe) diff = recipe_diff(old_recipe, new_recipe)
return jsonify(diff=diff) return jsonify(diff=diff)
@ -292,18 +292,26 @@ def v0_api(api):
except ValueError as e: except ValueError as e:
return jsonify(error={"msg":str(e)}), 400 return jsonify(error={"msg":str(e)}), 400
with api.config["YUMLOCK"].lock: try:
available = projects_list(api.config["YUMLOCK"].yb) with api.config["YUMLOCK"].lock:
projects = take_limits(available, offset, limit) available = projects_list(api.config["YUMLOCK"].yb)
except ProjectsError as e:
log.error("(v0_projects_list) %s", str(e))
return jsonify(error={"msg":str(e)}), 400
projects = take_limits(available, offset, limit)
return jsonify(projects=projects, offset=offset, limit=limit, total=len(available)) return jsonify(projects=projects, offset=offset, limit=limit, total=len(available))
@api.route("/api/v0/projects/info/<project_names>") @api.route("/api/v0/projects/info/<project_names>")
@crossdomain(origin="*") @crossdomain(origin="*")
def v0_projects_info(project_names): def v0_projects_info(project_names):
"""Return detailed information about the listed projects""" """Return detailed information about the listed projects"""
with api.config["YUMLOCK"].lock: try:
projects = projects_info(api.config["YUMLOCK"].yb, project_names.split(",")) with api.config["YUMLOCK"].lock:
projects = projects_info(api.config["YUMLOCK"].yb, project_names.split(","))
except ProjectsError as e:
log.error("(v0_projects_info) %s", str(e))
return jsonify(error={"msg":str(e)}), 400
return jsonify(projects=projects) return jsonify(projects=projects)
@ -311,8 +319,12 @@ def v0_api(api):
@crossdomain(origin="*") @crossdomain(origin="*")
def v0_projects_depsolve(project_names): def v0_projects_depsolve(project_names):
"""Return detailed information about the listed projects""" """Return detailed information about the listed projects"""
with api.config["YUMLOCK"].lock: try:
deps = projects_depsolve(api.config["YUMLOCK"].yb, project_names.split(",")) with api.config["YUMLOCK"].lock:
deps = projects_depsolve(api.config["YUMLOCK"].yb, project_names.split(","))
except ProjectsError as e:
log.error("(v0_projects_depsolve) %s", str(e))
return jsonify(error={"msg":str(e)}), 400
return jsonify(projects=deps) return jsonify(projects=deps)
@ -326,17 +338,25 @@ def v0_api(api):
except ValueError as e: except ValueError as e:
return jsonify(error={"msg":str(e)}), 400 return jsonify(error={"msg":str(e)}), 400
with api.config["YUMLOCK"].lock: try:
available = modules_list(api.config["YUMLOCK"].yb) with api.config["YUMLOCK"].lock:
projects = take_limits(available, offset, limit) available = modules_list(api.config["YUMLOCK"].yb)
except ProjectsError as e:
log.error("(v0_modules_list) %s", str(e))
return jsonify(error={"msg":str(e)}), 400
projects = take_limits(available, offset, limit)
return jsonify(projects=projects, offset=offset, limit=limit, total=len(available)) return jsonify(projects=projects, offset=offset, limit=limit, total=len(available))
@api.route("/api/v0/modules/info/<module_names>") @api.route("/api/v0/modules/info/<module_names>")
@crossdomain(origin="*") @crossdomain(origin="*")
def v0_modules_info(module_names): def v0_modules_info(module_names):
"""Return detailed information about the listed modules""" """Return detailed information about the listed modules"""
with api.config["YUMLOCK"].lock: try:
modules = modules_info(api.config["YUMLOCK"].yb, module_names.split(",")) with api.config["YUMLOCK"].lock:
modules = modules_info(api.config["YUMLOCK"].yb, module_names.split(","))
except ProjectsError as e:
log.error("(v0_modules_info) %s", str(e))
return jsonify(error={"msg":str(e)}), 400
return jsonify(modules=modules) return jsonify(modules=modules)