Fix for hard merge

endpoints/api/tag.py

@@ -10,7 +10,7 @@ from endpoints.api import (resource, nickname, require_repo_read, require_repo_w
                            parse_args, query_param, truthy_bool, disallow_for_app_repositories)
 from endpoints.api.tag_models_interface import Repository
 from endpoints.api.tag_models_pre_oci import pre_oci_model as model
-from endpoints.exception import NotFound
+from endpoints.exception import NotFound, InvalidRequest
 from endpoints.v2.manifest import _generate_and_store_manifest
 from util.names import TAG_ERROR, TAG_REGEX
 
@@ -53,7 +53,7 @@ class ListRepositoryTags(RepositoryParamResource):
 class RepositoryTag(RepositoryParamResource):
   """ Resource for managing repository tags. """
   schemas = {
-    'MoveTag': {
+    'ChangeTag': {
       'type': 'object',
       'description': 'Makes changes to a specific tag',
       'properties': {
@@ -61,7 +61,7 @@ class RepositoryTag(RepositoryParamResource):
           'type': ['string', 'null'],
           'description': '(If specified) Image identifier to which the tag should point',
         },
-        'image': {
+        'expiration': {
           'type': ['number', 'null'],
           'description': '(If specified) The expiration for the image',
         },
@@ -71,8 +71,8 @@ class RepositoryTag(RepositoryParamResource):
 
   @require_repo_write
   @disallow_for_app_repositories
-  @nickname('changeTagImage')
-  @validate_json_request('MoveTag')
+  @nickname('changeTag')
+  @validate_json_request('ChangeTag')
   def put(self, namespace, repository, tag):
     """ Change which image a tag points to or create a new tag."""
 
@@ -106,12 +106,16 @@ class RepositoryTag(RepositoryParamResource):
            'namespace': namespace,
            'expiration_date': expiration_date,
            'old_expiration_date': existing_end_ts
-         }, repo=repo)
+         }, repo_name=repository)
       else:
-       abort(400, 'Could not update tag expiration; Tag has probably changed')
+        raise InvalidRequest('Could not update tag expiration; Tag has probably changed')
 
     if 'image' in request.get_json():
       image_id = request.get_json()['image']
+      image = model.get_repository_image(namespace, repository, image_id)
+      if image is None:
+        raise NotFound()
+
       original_image_id = model.get_repo_tag_image(repo, tag)
       model.create_or_update_tag(namespace, repository, tag, image_id)