From 8df3db4b97b0a9b14741b02ac3eafc3affeb1214 Mon Sep 17 00:00:00 2001
From: Laura Brehm <laurabrehm@hey.com>
Date: Thu, 20 Apr 2023 16:23:21 +0100
Subject: [PATCH] c8d: add support for removing images by shortID

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
---
 daemon/containerd/image.go        | 47 ++++++++++++++++++-------------
 daemon/containerd/image_delete.go |  8 ++----
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/daemon/containerd/image.go b/daemon/containerd/image.go
index 513278a82f..d15369185e 100644
--- a/daemon/containerd/image.go
+++ b/daemon/containerd/image.go
@@ -218,9 +218,18 @@ func (i *ImageService) size(ctx context.Context, desc ocispec.Descriptor, platfo
 // reference or identifier. Returns the descriptor of
 // the image, which could be a manifest list, manifest, or config.
 func (i *ImageService) resolveDescriptor(ctx context.Context, refOrID string) (ocispec.Descriptor, error) {
+	img, err := i.resolveImage(ctx, refOrID)
+	if err != nil {
+		return ocispec.Descriptor{}, err
+	}
+
+	return img.Target, nil
+}
+
+func (i *ImageService) resolveImage(ctx context.Context, refOrID string) (containerdimages.Image, error) {
 	parsed, err := reference.ParseAnyReference(refOrID)
 	if err != nil {
-		return ocispec.Descriptor{}, errdefs.InvalidParameter(err)
+		return containerdimages.Image{}, errdefs.InvalidParameter(err)
 	}
 
 	is := i.client.ImageService()
@@ -229,16 +238,25 @@ func (i *ImageService) resolveDescriptor(ctx context.Context, refOrID string) (o
 	if ok {
 		imgs, err := is.List(ctx, "target.digest=="+digested.Digest().String())
 		if err != nil {
-			return ocispec.Descriptor{}, errors.Wrap(err, "failed to lookup digest")
+			return containerdimages.Image{}, errors.Wrap(err, "failed to lookup digest")
 		}
 		if len(imgs) == 0 {
-			return ocispec.Descriptor{}, images.ErrImageDoesNotExist{Ref: parsed}
+			return containerdimages.Image{}, images.ErrImageDoesNotExist{Ref: parsed}
 		}
 
-		return imgs[0].Target, nil
+		return imgs[0], nil
 	}
 
 	ref := reference.TagNameOnly(parsed.(reference.Named)).String()
+	img, err := is.Get(ctx, ref)
+	if err == nil {
+		return img, nil
+	} else {
+		// TODO(containerd): error translation can use common function
+		if !cerrdefs.IsNotFound(err) {
+			return containerdimages.Image{}, err
+		}
+	}
 
 	// If the identifier could be a short ID, attempt to match
 	if truncatedID.MatchString(refOrID) {
@@ -248,37 +266,28 @@ func (i *ImageService) resolveDescriptor(ctx context.Context, refOrID string) (o
 		}
 		imgs, err := is.List(ctx, filters...)
 		if err != nil {
-			return ocispec.Descriptor{}, err
+			return containerdimages.Image{}, err
 		}
 
 		if len(imgs) == 0 {
-			return ocispec.Descriptor{}, images.ErrImageDoesNotExist{Ref: parsed}
+			return containerdimages.Image{}, images.ErrImageDoesNotExist{Ref: parsed}
 		}
 		if len(imgs) > 1 {
 			digests := map[digest.Digest]struct{}{}
 			for _, img := range imgs {
 				if img.Name == ref {
-					return img.Target, nil
+					return img, nil
 				}
 				digests[img.Target.Digest] = struct{}{}
 			}
 
 			if len(digests) > 1 {
-				return ocispec.Descriptor{}, errdefs.NotFound(errors.New("ambiguous reference"))
+				return containerdimages.Image{}, errdefs.NotFound(errors.New("ambiguous reference"))
 			}
 		}
 
-		return imgs[0].Target, nil
+		return imgs[0], nil
 	}
 
-	img, err := is.Get(ctx, ref)
-	if err != nil {
-		// TODO(containerd): error translation can use common function
-		if !cerrdefs.IsNotFound(err) {
-			return ocispec.Descriptor{}, err
-		}
-		return ocispec.Descriptor{}, images.ErrImageDoesNotExist{Ref: parsed}
-	}
-
-	return img.Target, nil
+	return containerdimages.Image{}, images.ErrImageDoesNotExist{Ref: parsed}
 }
diff --git a/daemon/containerd/image_delete.go b/daemon/containerd/image_delete.go
index 83d39d36cb..d3c252d591 100644
--- a/daemon/containerd/image_delete.go
+++ b/daemon/containerd/image_delete.go
@@ -44,26 +44,24 @@ import (
 //
 // TODO(thaJeztah): implement ImageDelete "force" options; see https://github.com/moby/moby/issues/43850
 // TODO(thaJeztah): implement ImageDelete "prune" options; see https://github.com/moby/moby/issues/43849
-// TODO(thaJeztah): add support for image delete using image (short)ID; see https://github.com/moby/moby/issues/43854
 // TODO(thaJeztah): image delete should send prometheus counters; see https://github.com/moby/moby/issues/45268
 func (i *ImageService) ImageDelete(ctx context.Context, imageRef string, force, prune bool) ([]types.ImageDeleteResponseItem, error) {
 	parsedRef, err := reference.ParseNormalizedNamed(imageRef)
 	if err != nil {
 		return nil, err
 	}
-	ref := reference.TagNameOnly(parsedRef)
 
-	desc, err := i.resolveDescriptor(ctx, imageRef)
+	img, err := i.resolveImage(ctx, imageRef)
 	if err != nil {
 		return nil, err
 	}
 
-	imgID := string(desc.Digest)
-	err = i.client.ImageService().Delete(ctx, ref.String(), images.SynchronousDelete())
+	err = i.client.ImageService().Delete(ctx, img.Name, images.SynchronousDelete())
 	if err != nil {
 		return nil, err
 	}
 
+	imgID := string(img.Target.Digest)
 	i.LogImageEvent(imgID, imgID, "untag")
 	i.LogImageEvent(imgID, imgID, "delete")