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

refactor(api/tag): remove try/catch

Browse source
This commit is contained in:
EvB 2017-05-03 16:48:12 -04:00
parent eb9db0c53b
commit 6e894d5f24
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
endpoints/api/tag.py
View file

@ -112,16 +112,13 @@ class RepositoryTag(RepositoryParamResource):
model.tag.create_or_update_tag(namespace, repository, tag, image_id) model.tag.create_or_update_tag(namespace, repository, tag, image_id)
username = get_authenticated_user().username username = get_authenticated_user().username
tag_data = {'username': username, 'repo': repository, 'tag': tag, 'namespace': namespace, log_action('move_tag' if original_image_id else 'create_tag', namespace,
'image': image_id, 'original_image': original_image_id} {'username': username, 'repo': repository, 'tag': tag,
'namespace': namespace, 'image': image_id,
'original_image': original_image_id},
repo=model.repository.get_repository(namespace, repository))
log_action('move_tag' if original_image_id else 'create_tag', namespace, tag_data, _generate_and_store_manifest(namespace, repository, tag)
repo=model.repository.get_repository(namespace, repository))
try:
_generate_and_store_manifest(namespace, repository, tag)
except:
# log and move on since we'll attempt to store manifest on first pull as well
logger.exception('unable to store manifest for tag', extra=tag_data)
return 'Updated', 201 return 'Updated', 201
@ -244,12 +241,7 @@ class RestoreTag(RepositoryParamResource):
existing_image = model.tag.restore_tag_to_manifest(repo, tag, manifest_digest) existing_image = model.tag.restore_tag_to_manifest(repo, tag, manifest_digest)
else: else:
existing_image = model.tag.restore_tag_to_image(repo, tag, image_id) existing_image = model.tag.restore_tag_to_image(repo, tag, image_id)
try: _generate_and_store_manifest(namespace, repository, tag)
_generate_and_store_manifest(namespace, repository, tag)
except:
# log and move on since we'll attempt to store manifest on first pull as well
logger.exception('unable to store manifest for tag', extra=log_data)
if existing_image is not None: if existing_image is not None:
log_data['original_image'] = existing_image.docker_image_id log_data['original_image'] = existing_image.docker_image_id

10
endpoints/api/test/test_tag.py
View file

@ -32,7 +32,7 @@ def create_or_update_tag():
@pytest.fixture() @pytest.fixture()
def generate_manifest(): def generate_manifest():
def mock_callable(namespace, repository, tag): def mock_callable(namespace, repository, tag):
if tag is 'generatemanifestfail': if tag == 'generatemanifestfail':
raise Exception('test_failure') raise Exception('test_failure')
with patch('endpoints.api.tag._generate_and_store_manifest', side_effect=mock_callable) as mk: with patch('endpoints.api.tag._generate_and_store_manifest', side_effect=mock_callable) as mk:
yield mk yield mk
@ -47,11 +47,15 @@ def authd_client(client):
('image1', '.INVALID-TAG-NAME', 400), ('image1', '.INVALID-TAG-NAME', 400),
('image1', 'INVALID-TAG_NAME-BECAUSE-THIS-IS-WAY-WAY-TOO-LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG', 400), ('image1', 'INVALID-TAG_NAME-BECAUSE-THIS-IS-WAY-WAY-TOO-LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG', 400),
('nonexistantimage', 'newtag', 404), ('nonexistantimage', 'newtag', 404),
('image1', 'generatemanifestfail', 201), ('image1', 'generatemanifestfail', None),
('image1', 'existing-tag', 201), ('image1', 'existing-tag', 201),
('image1', 'newtag', 201), ('image1', 'newtag', 201),
]) ])
def test_move_tag(test_image, test_tag, expected_status, get_repo_image, get_repo_tag_image, create_or_update_tag, generate_manifest, authd_client): def test_move_tag(test_image, test_tag, expected_status, get_repo_image, get_repo_tag_image, create_or_update_tag, generate_manifest, authd_client):
params = {'repository': 'devtable/repo', 'tag': test_tag} params = {'repository': 'devtable/repo', 'tag': test_tag}
request_body = {'image': test_image} request_body = {'image': test_image}
conduct_api_call(authd_client, RepositoryTag, 'put', params, request_body, expected_status) if expected_status is None:
with pytest.raises(Exception):
conduct_api_call(authd_client, RepositoryTag, 'put', params, request_body, expected_status)
else:
conduct_api_call(authd_client, RepositoryTag, 'put', params, request_body, expected_status)