From 42290326767f37f0c6373794bd54ea6f87a8e9bd Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 6 Sep 2023 12:16:16 +0200
Subject: [PATCH] daemon/containerd: use "DiffID" type for diff fields

strong-type the fields with the expected type, to make it more explicit
what we're expecting here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 daemon/containerd/image_builder.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
index 6778194f99..33d5cf70b7 100644
--- a/daemon/containerd/image_builder.go
+++ b/daemon/containerd/image_builder.go
@@ -233,7 +233,7 @@ type rolayer struct {
 	key                string
 	c                  *containerd.Client
 	snapshotter        string
-	diffID             digest.Digest
+	diffID             layer.DiffID
 	contentStoreDigest digest.Digest
 	lease              *leases.Lease
 }
@@ -246,7 +246,7 @@ func (rl *rolayer) DiffID() layer.DiffID {
 	if rl.diffID == "" {
 		return layer.DigestSHA256EmptyTar
 	}
-	return layer.DiffID(rl.diffID)
+	return rl.diffID
 }
 
 func (rl *rolayer) Release() error {
@@ -360,7 +360,7 @@ func (rw *rwlayer) Commit() (_ builder.ROLayer, outErr error) {
 		key:                key,
 		c:                  rw.c,
 		snapshotter:        rw.snapshotter,
-		diffID:             diffID,
+		diffID:             layer.DiffID(diffID),
 		contentStoreDigest: desc.Digest,
 		lease:              &lease,
 	}, nil