daemon/images: imageKey() accept string

To reduce some type-juggling :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

daemon/images/image.go

@@ -49,7 +49,7 @@ type manifest struct {
 func (i *ImageService) manifestMatchesPlatform(ctx context.Context, img *image.Image, platform specs.Platform) (bool, error) {
 	logger := logrus.WithField("image", img.ID).WithField("desiredPlatform", platforms.Format(platform))
 
-	ls, leaseErr := i.leases.ListResources(ctx, leases.Lease{ID: imageKey(img.ID().Digest())})
+	ls, leaseErr := i.leases.ListResources(ctx, leases.Lease{ID: imageKey(img.ID().String())})
 	if leaseErr != nil {
 		logger.WithError(leaseErr).Error("Error looking up image leases")
 		return false, leaseErr

daemon/images/store.go

@@ -17,8 +17,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func imageKey(dgst digest.Digest) string {
-	return "moby-image-" + dgst.String()
+const imageKeyPrefix = "moby-image-"
+
+func imageKey(dgst string) string {
+	return imageKeyPrefix + dgst
 }
 
 // imageStoreWithLease wraps the configured image store with one that deletes the lease
@@ -36,7 +38,7 @@ type imageStoreWithLease struct {
 
 func (s *imageStoreWithLease) Delete(id image.ID) ([]layer.Metadata, error) {
 	ctx := namespaces.WithNamespace(context.TODO(), s.ns)
-	if err := s.leases.Delete(ctx, leases.Lease{ID: imageKey(digest.Digest(id))}); err != nil && !c8derrdefs.IsNotFound(err) {
+	if err := s.leases.Delete(ctx, leases.Lease{ID: imageKey(id.String())}); err != nil && !c8derrdefs.IsNotFound(err) {
 		return nil, errors.Wrap(err, "error deleting lease")
 	}
 	return s.Store.Delete(id)
@@ -67,7 +69,7 @@ func (s *imageStoreForPull) Get(ctx context.Context, dgst digest.Digest) ([]byte
 }
 
 func (s *imageStoreForPull) updateLease(ctx context.Context, dgst digest.Digest) error {
-	leaseID := imageKey(dgst)
+	leaseID := imageKey(dgst.String())
 	lease, err := s.leases.Create(ctx, leases.WithID(leaseID))
 	if err != nil {
 		if !c8derrdefs.IsAlreadyExists(err) {

daemon/images/store_test.go

@@ -68,7 +68,7 @@ func TestImageDelete(t *testing.T) {
 		assert.NilError(t, err)
 		defer images.Delete(id)
 
-		leaseID := imageKey(digest.Digest(id))
+		leaseID := imageKey(id.String())
 		_, err = images.leases.Create(ctx, leases.WithID(leaseID))
 		assert.NilError(t, err)
 		defer images.leases.Delete(ctx, leases.Lease{ID: leaseID})