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

Merge branch 'rustedbuilds' of https://bitbucket.org/yackob03/quay into rustedbuilds

Browse source
This commit is contained in:
Joseph Schorr 2014-02-24 20:38:57 -05:00
commit ef02e769fb
10 changed files with 175 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

49
endpoints/api.py
View file

@ -29,7 +29,9 @@ from auth.permissions import (ReadRepositoryPermission,
ViewTeamPermission,
UserPermission)
from endpoints.common import common_login, get_route_data, truthy_param
from endpoints.trigger import BuildTrigger, TriggerActivationException, EmptyRepositoryException
from endpoints.trigger import (BuildTrigger, TriggerActivationException,
TriggerDeactivationException, EmptyRepositoryException)
from util.cache import cache_control
from datetime import datetime, timedelta
@ -1144,7 +1146,7 @@ def build_status_view(build_obj, can_write=False):
'started': build_obj.started,
'display_name': build_obj.display_name,
'status': status,
'resource_key': build_obj.resource_key if can_write else None,
'job_config': json.loads(build_obj.job_config) if can_write else None,
'is_writer': can_write,
'trigger': trigger_view(build_obj.trigger),
}
@ -1234,11 +1236,13 @@ def request_repo_build(namespace, repository):
logger.debug('User requested repository initialization.')
dockerfile_id = request.get_json()['file_id']
# Check if the dockerfile resource has already been used. If so, then it can only be reused if the
# user has access to the repository for which it was used.
# Check if the dockerfile resource has already been used. If so, then it
# can only be reused if the user has access to the repository for which it
# was used.
associated_repository = model.get_repository_for_resource(dockerfile_id)
if associated_repository:
if not ModifyRepositoryPermission(associated_repository.namespace, associated_repository.name):
if not ModifyRepositoryPermission(associated_repository.namespace,
associated_repository.name):
abort(403)
# Start the build.
@ -1248,9 +1252,15 @@ def request_repo_build(namespace, repository):
logger.debug('**********Md5: %s' % display_name)
host = urlparse.urlparse(request.url).netloc
tag = '%s/%s/%s' % (host, repo.namespace, repo.name)
build_request = model.create_repository_build(repo, token, dockerfile_id,
tag, display_name)
repo = '%s/%s/%s' % (host, repo.namespace, repo.name)
job_config = {
'docker_tags': ['latest'],
'build_subdir': '',
'repository': repo,
'resource_key': dockerfile_id,
}
build_request = model.create_repository_build(repo, token, job_config,
display_name)
dockerfile_build_queue.put(json.dumps({
'build_uuid': build_request.uuid,
'namespace': namespace,
@ -1438,15 +1448,15 @@ def activate_build_trigger(namespace, repository, trigger_uuid):
token.code, app.config['URL_HOST'],
path)
handler.activate(trigger.uuid, authed_url, trigger.auth_token,
new_config_dict)
final_config = handler.activate(trigger.uuid, authed_url,
trigger.auth_token, new_config_dict)
except TriggerActivationException as e:
token.delete_instance()
abort(400, message = e.msg)
return
# Save the updated config.
trigger.config = json.dumps(new_config_dict)
trigger.config = json.dumps(final_config)
trigger.write_token = token
trigger.save()
@ -1517,7 +1527,22 @@ def list_build_triggers(namespace, repository):
def delete_build_trigger(namespace, repository, trigger_uuid):
permission = AdministerRepositoryPermission(namespace, repository)
if permission.can():
model.delete_build_trigger(namespace, repository, trigger_uuid)
try:
trigger = model.get_build_trigger(namespace, repository, trigger_uuid)
except model.InvalidBuildTriggerException:
abort(404)
return
handler = BuildTrigger.get_trigger_for_service(trigger.service.name)
config_dict = json.loads(trigger.config)
if handler.is_active(config_dict):
try:
handler.deactivate(trigger.auth_token, config_dict)
except TriggerDeactivationException as ex:
# We are just going to eat this error
logger.warning('Trigger deactivation problem.', ex)
trigger.delete_instance()
log_action('delete_repo_trigger', namespace,
{'repo': repository, 'trigger_id': trigger_uuid},
repo=model.get_repository(namespace, repository))