From f19ad052ea76f9aad6f76d6b07ce381d7d915f6b Mon Sep 17 00:00:00 2001
From: Adam Hughes <9903835+tri-adam@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:54:43 +0000
Subject: [PATCH] refactor: use DeleteObjects to simplify code

---
 pkg/sif/testdata/TestUpdate/AddLayer.golden   | Bin 16648 -> 16278 bytes
 .../testdata/TestUpdate/ReplaceLayers.golden  | Bin 58295 -> 42629 bytes
 pkg/sif/update.go                             |  41 +++++-------------
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/pkg/sif/testdata/TestUpdate/AddLayer.golden b/pkg/sif/testdata/TestUpdate/AddLayer.golden
index ca896742a18fa824afbc92eaae547e97a9140b10..7681233dce910164fa6427d3651766fe0ef1cd84 100644
GIT binary patch
delta 8
PcmeBZVw_gLVVXSv5J3Z`

delta 169
zcmWlTy$ZrG6h`qeTr+pD`SZ4eK8eFknrj1Xl{77al%kWX2%VgK0w2*h9=-$LS?0%m
z^<DPQ8@%4T&&*ZEDt~l+WF_ls<Vu%Pa4LXn0Y;!BG+SY<0yG>**<8CqQ)SdfI<UEr
zl(vdU8gyVt2w)jIHyG&@T2@{e23z~+Y#f41Cm32SlXB`4tQ+4Amqa55kKI3F1U5~F
F=?7btHe>(*

diff --git a/pkg/sif/testdata/TestUpdate/ReplaceLayers.golden b/pkg/sif/testdata/TestUpdate/ReplaceLayers.golden
index 201ba9ceff963e802b5b5064dded53a7bd4562b5..0bc9aa06210e8a8bbd627930f4bca00b1cc48084 100644
GIT binary patch
delta 9
QcmdmfoVoQZ(}vb%02izTu>b%7

delta 109
zcmZoY%e4JC^M=-Cn?H)1+f43Wx-iPZ$k0SbDJ3&KwYWsdN~t&_(a6-y$~@V?z#t{n
zG%4A_*gVb1GQ}|2GSM{E+$<?6(cIF~$SB3a%plb?*&xlt#3CilILRz6+1SFw*f7z+
M%p9mxsW!G206P;S00000

diff --git a/pkg/sif/update.go b/pkg/sif/update.go
index fedc198..d62e1a0 100644
--- a/pkg/sif/update.go
+++ b/pkg/sif/update.go
@@ -94,11 +94,10 @@ func Update(fi *sif.FileImage, ii v1.ImageIndex, opts ...UpdateOpt) error {
 	}
 
 	// Delete existing blobs from the SIF except those we want to keep.
-	if err := deleteBlobsExcept(fi, keepBlobs); err != nil {
-		return err
-	}
-	// Delete old RootIndex.
-	if err := deleteRootIndex(fi); err != nil {
+	if err := fi.DeleteObjects(selectBlobsExcept(keepBlobs),
+		sif.OptDeleteZero(true),
+		sif.OptDeleteCompact(true),
+	); err != nil {
 		return err
 	}
 
@@ -309,33 +308,13 @@ func readCacheBlob(digest v1.Hash, cacheDir string) (io.ReadCloser, error) {
 	return f, nil
 }
 
-// deleteBlobsExcept removes all OCI.Blob descriptors from fi, except those with
+// selectBlobsExcept selects all OCI.RootIndex/OCI.Blob descriptors, except those with
 // digests listed in keep.
-func deleteBlobsExcept(fi *sif.FileImage, keep []v1.Hash) error {
-	descs, err := fi.GetDescriptors(sif.WithDataType(sif.DataOCIBlob))
-	if err != nil {
-		return err
-	}
-	for _, d := range descs {
-		dd, err := d.OCIBlobDigest()
-		if err != nil {
-			return err
-		}
-		if slices.Contains(keep, dd) {
-			continue
+func selectBlobsExcept(keep []v1.Hash) sif.DescriptorSelectorFunc {
+	return func(d sif.Descriptor) (bool, error) {
+		if h, err := d.OCIBlobDigest(); err == nil && !slices.Contains(keep, h) {
+			return true, nil
 		}
-		if err := fi.DeleteObject(d.ID(), sif.OptDeleteZero(true)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// deleteRootIndex removes the RootIndex from a the SIF fi.
-func deleteRootIndex(fi *sif.FileImage) error {
-	desc, err := fi.GetDescriptor(sif.WithDataType(sif.DataOCIRootIndex))
-	if err != nil {
-		return err
+		return false, nil
 	}
-	return fi.DeleteObject(desc.ID())
 }