fix(storage): only promote dedupe origin when the deleted blob is the origin (boltdb) (#4201)

Signed-off-by: Artem Muterko <artem@sopho.tech>

Author: archy-rock3t-cloud

pkg/storage/cache/boltdb.go

@@ -345,7 +345,7 @@ func (d *BoltDBDriver) DeleteBlob(digest godigest.Digest, path string) error {
 		origin := bucket.Bucket([]byte(constants.OriginalBucket))
 		if origin != nil {
 			originBlob := d.getOne(origin)
-			if originBlob != nil {
+			if originBlob != nil && string(originBlob) == path {
 				if err := origin.Delete([]byte(path)); err != nil {
 					d.log.Error().Err(err).Str("digest", digest.String()).Str("bucket", constants.OriginalBucket).
 						Str("path", path).Msg("failed to delete")

pkg/storage/cache/boltdb_test.go

@@ -166,3 +166,35 @@ func TestBoltDBCache(t *testing.T) {
 		So(blobs, ShouldResemble, []string{"second"})
 	})
 }
+
+func TestBoltDBDeleteNonOriginDuplicate(t *testing.T) {
+	Convey("Deleting a non-origin duplicate must not promote another path to origin", t, func() {
+		dir := t.TempDir()
+
+		log := log.NewTestLogger()
+		So(log, ShouldNotBeNil)
+
+		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{dir, "cache_test", false}, log)
+		So(cacheDriver, ShouldNotBeNil)
+
+		err := cacheDriver.PutBlob("digest", "zebra")
+		So(err, ShouldBeNil)
+
+		err = cacheDriver.PutBlob("digest", "alpha")
+		So(err, ShouldBeNil)
+
+		err = cacheDriver.PutBlob("digest", "mango")
+		So(err, ShouldBeNil)
+
+		val, err := cacheDriver.GetBlob("digest")
+		So(err, ShouldBeNil)
+		So(val, ShouldEqual, "zebra")
+
+		err = cacheDriver.DeleteBlob("digest", "mango")
+		So(err, ShouldBeNil)
+
+		val, err = cacheDriver.GetBlob("digest")
+		So(err, ShouldBeNil)
+		So(val, ShouldEqual, "zebra")
+	})
+}