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

finish v1 registry refactor

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-07-12 13:48:44 -04:00
parent c14437e54a
commit 8435c254c3
3 changed files with 65 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

19
endpoints/v1/tag.py
View file

@ -3,11 +3,13 @@ import json
from flask import abort, request, jsonify, make_response, session
from util.names import TAG_ERROR, TAG_REGEX
from auth.auth import process_auth
from auth.permissions import (ReadRepositoryPermission,
ModifyRepositoryPermission)
from data import model
from data.model import v1
from endpoints.common import parse_repository_name
from endpoints.decorators import anon_protect
from endpoints.v1 import v1_bp
@ -25,7 +27,7 @@ def get_tags(namespace_name, repo_name):
permission = ReadRepositoryPermission(namespace_name, repo_name)
if permission.can() or model.repository.repository_is_public(namespace_name, repo_name):
tags = model.tag.list_repository_tags(namespace_name, repo_name)
tags = v1.list_tags(namespace_name, repo_name)
tag_map = {tag.name: tag.image.docker_image_id for tag in tags}
return jsonify(tag_map)
@ -40,12 +42,11 @@ def get_tag(namespace_name, repo_name, tag):
permission = ReadRepositoryPermission(namespace_name, repo_name)
if permission.can() or model.repository.repository_is_public(namespace_name, repo_name):
try:
tag_image = model.tag.get_tag_image(namespace_name, repo_name, tag)
except model.DataModelException:
image_id = v1.find_image_id_by_tag(namespace_name, repo_name, tag)
if image_id is None:
abort(404)
resp = make_response('"%s"' % tag_image.docker_image_id)
resp = make_response('"%s"' % image_id)
resp.headers['Content-Type'] = 'application/json'
return resp
@ -63,14 +64,14 @@ def put_tag(namespace_name, repo_name, tag):
if not TAG_REGEX.match(tag):
abort(400, TAG_ERROR)
docker_image_id = json.loads(request.data)
model.tag.create_or_update_tag(namespace_name, repo_name, tag, docker_image_id)
image_id = json.loads(request.data)
v1.create_or_update_tag(namespace_name, repo_name, image_id, tag)
# Store the updated tag.
if 'pushed_tags' not in session:
session['pushed_tags'] = {}
session['pushed_tags'][tag] = docker_image_id
session['pushed_tags'][tag] = image_id
return make_response('Created', 200)
@ -85,7 +86,7 @@ def delete_tag(namespace_name, repo_name, tag):
permission = ModifyRepositoryPermission(namespace_name, repo_name)
if permission.can():
model.tag.delete_tag(namespace_name, repo_name, tag)
v1.delete_tag(namespace_name, repo_name, tag)
track_and_log('delete_tag', model.repository.get_repository(namespace_name, repo_name),
tag=tag)
return make_response('Deleted', 200)