vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a problem with initdb and add a limit to the builds API.

Browse source
This commit is contained in:
jakedt 2014-03-05 15:50:32 -05:00
parent 5f0969778e
commit fde96c736a
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/model.py
View file

@ -1395,7 +1395,7 @@ def load_token_data(code):
def get_repository_build(namespace_name, repository_name, build_uuid): def get_repository_build(namespace_name, repository_name, build_uuid):
try: try:
query = list_repository_builds(namespace_name, repository_name) query = list_repository_builds(namespace_name, repository_name, 1)
return query.where(RepositoryBuild.uuid == build_uuid).get() return query.where(RepositoryBuild.uuid == build_uuid).get()
except RepositoryBuild.DoesNotExist: except RepositoryBuild.DoesNotExist:
@ -1403,7 +1403,7 @@ def get_repository_build(namespace_name, repository_name, build_uuid):
raise InvalidRepositoryBuildException(msg) raise InvalidRepositoryBuildException(msg)
def list_repository_builds(namespace_name, repository_name, def list_repository_builds(namespace_name, repository_name, limit,
include_inactive=True): include_inactive=True):
query = (RepositoryBuild query = (RepositoryBuild
.select(RepositoryBuild, RepositoryBuildTrigger, BuildTriggerService) .select(RepositoryBuild, RepositoryBuildTrigger, BuildTriggerService)
@ -1412,7 +1412,8 @@ def list_repository_builds(namespace_name, repository_name,
.join(RepositoryBuildTrigger, JOIN_LEFT_OUTER) .join(RepositoryBuildTrigger, JOIN_LEFT_OUTER)
.join(BuildTriggerService, JOIN_LEFT_OUTER) .join(BuildTriggerService, JOIN_LEFT_OUTER)
.where(Repository.name == repository_name, .where(Repository.name == repository_name,
Repository.namespace == namespace_name)) Repository.namespace == namespace_name)
.limit(limit))
if not include_inactive: if not include_inactive:
query = query.where(RepositoryBuild.phase != 'error', query = query.where(RepositoryBuild.phase != 'error',
@ -1537,11 +1538,6 @@ def list_build_triggers(namespace_name, repository_name):
def list_trigger_builds(namespace_name, repository_name, trigger_uuid, def list_trigger_builds(namespace_name, repository_name, trigger_uuid,
limit=None): limit):
query = (list_repository_builds(namespace_name, repository_name) query = (list_repository_builds(namespace_name, repository_name, limit)
.where(RepositoryBuildTrigger.uuid == trigger_uuid)) .where(RepositoryBuildTrigger.uuid == trigger_uuid))
if limit:
return query.limit(limit)
else:
return query

10
endpoints/api.py
View file

@ -1105,7 +1105,7 @@ def get_repo(namespace, repository):
tag_dict = {tag.name: tag_view(tag) for tag in tags} tag_dict = {tag.name: tag_view(tag) for tag in tags}
can_write = ModifyRepositoryPermission(namespace, repository).can() can_write = ModifyRepositoryPermission(namespace, repository).can()
can_admin = AdministerRepositoryPermission(namespace, repository).can() can_admin = AdministerRepositoryPermission(namespace, repository).can()
active_builds = model.list_repository_builds(namespace, repository, active_builds = model.list_repository_builds(namespace, repository, 1,
include_inactive=False) include_inactive=False)
return jsonify({ return jsonify({
@ -1161,8 +1161,10 @@ def get_repo_builds(namespace, repository):
permission = ReadRepositoryPermission(namespace, repository) permission = ReadRepositoryPermission(namespace, repository)
is_public = model.repository_is_public(namespace, repository) is_public = model.repository_is_public(namespace, repository)
if permission.can() or is_public: if permission.can() or is_public:
limit = request.args.get('limit', 5)
builds = list(model.list_repository_builds(namespace, repository, limit))
can_write = ModifyRepositoryPermission(namespace, repository).can() can_write = ModifyRepositoryPermission(namespace, repository).can()
builds = model.list_repository_builds(namespace, repository)
return jsonify({ return jsonify({
'builds': [build_status_view(build, can_write) for build in builds] 'builds': [build_status_view(build, can_write) for build in builds]
}) })
@ -1501,8 +1503,8 @@ def list_trigger_recent_builds(namespace, repository, trigger_uuid):
permission = AdministerRepositoryPermission(namespace, repository) permission = AdministerRepositoryPermission(namespace, repository)
if permission.can(): if permission.can():
limit = request.args.get('limit', 5) limit = request.args.get('limit', 5)
builds = model.list_trigger_builds(namespace, repository, trigger_uuid, builds = list(model.list_trigger_builds(namespace, repository,
limit) trigger_uuid, limit))
return jsonify({ return jsonify({
'builds': [build_status_view(build, True) for build in builds] 'builds': [build_status_view(build, True) for build in builds]
}) })

2
initdb.py
View file

@ -328,7 +328,7 @@ def populate_database():
'build_subdir': '', 'build_subdir': '',
} }
build = model.create_repository_build(building, token, job_config, build = model.create_repository_build(building, token, job_config,
'701dcc3724fb4f2ea6c31400528343cd' '701dcc3724fb4f2ea6c31400528343cd',
'build-name', trigger) 'build-name', trigger)
build.uuid = 'deadbeef-dead-beef-dead-beefdeadbeef' build.uuid = 'deadbeef-dead-beef-dead-beefdeadbeef'
build.save() build.save()

BIN
test/data/test.db
View file

Binary file not shown.