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

Add error IDs for unknown modules and unknown projects.

Browse Source 
(cherry picked from commit 2adcfc9563)
This commit is contained in:
Chris Lumens 2018-08-08 17:16:00 -04:00
parent 56da204f13
commit a1803c218f
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/api/errors.py
View File

@ -35,5 +35,11 @@ UNKNOWN_BLUEPRINT = "UnknownBlueprint"
# Returned from the API when a commit that was requested does not exist. # Returned from the API when a commit that was requested does not exist.
UNKNOWN_COMMIT = "UnknownCommit" UNKNOWN_COMMIT = "UnknownCommit"
# Returned from the API when a module that was requested does not exist.
UNKNOWN_MODULE = "UnknownModule"
# Returned from the API when a project that was requested does not exist.
UNKNOWN_PROJECT = "UnknownProject"
# Returned from the API when a UUID that was requested does not exist. # Returned from the API when a UUID that was requested does not exist.
UNKNOWN_UUID = "UnknownUUID" UNKNOWN_UUID = "UnknownUUID"

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

@ -1508,6 +1508,11 @@ def v0_api(api):
log.error("(v0_projects_info) %s", str(e)) log.error("(v0_projects_info) %s", str(e))
return jsonify(status=False, errors=[str(e)]), 400 return jsonify(status=False, errors=[str(e)]), 400
if not projects:
msg = "one of the requested projects does not exist: %s" % project_names
log.error("(v0_projects_info) %s", msg)
return jsonify(status=False, errors=[{"id": UNKNOWN_PROJECT, "msg": msg}]), 400
return jsonify(projects=projects) return jsonify(projects=projects)
@api.route("/api/v0/projects/depsolve", defaults={'project_names': ""}) @api.route("/api/v0/projects/depsolve", defaults={'project_names': ""})
@ -1526,6 +1531,11 @@ def v0_api(api):
log.error("(v0_projects_depsolve) %s", str(e)) log.error("(v0_projects_depsolve) %s", str(e))
return jsonify(status=False, errors=[str(e)]), 400 return jsonify(status=False, errors=[str(e)]), 400
if not deps:
msg = "one of the requested projects does not exist: %s" % project_names
log.error("(v0_projects_depsolve) %s", msg)
return jsonify(status=False, errors=[{"id": UNKNOWN_PROJECT, "msg": msg}]), 400
return jsonify(projects=deps) return jsonify(projects=deps)
@api.route("/api/v0/projects/source/list") @api.route("/api/v0/projects/source/list")
@ -1690,6 +1700,11 @@ def v0_api(api):
log.error("(v0_modules_list) %s", str(e)) log.error("(v0_modules_list) %s", str(e))
return jsonify(status=False, errors=[str(e)]), 400 return jsonify(status=False, errors=[str(e)]), 400
if module_names and not available:
msg = "one of the requested modules does not exist: %s" % module_names
log.error("(v0_modules_list) %s", msg)
return jsonify(status=False, errors=[{"id": UNKNOWN_MODULE, "msg": msg}]), 400
modules = take_limits(available, offset, limit) modules = take_limits(available, offset, limit)
return jsonify(modules=modules, offset=offset, limit=limit, total=len(available)) return jsonify(modules=modules, offset=offset, limit=limit, total=len(available))
@ -1711,7 +1726,7 @@ def v0_api(api):
if not modules: if not modules:
msg = "one of the requested modules does not exist: %s" % module_names msg = "one of the requested modules does not exist: %s" % module_names
log.error("(v0_modules_info) %s", msg) log.error("(v0_modules_info) %s", msg)
return jsonify(status=False, errors=[msg]), 400 return jsonify(status=False, errors=[{"id": UNKNOWN_MODULE, "msg": msg}]), 400
return jsonify(modules=modules) return jsonify(modules=modules)