From bb6ee51a2af0ad9787f3f6275bda1479359ce532 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 7 Feb 2023 17:48:56 -0800 Subject: [PATCH] cache: add fallback for snapshotID In older BuildKit versions snapshotID was not always set if record was not created with GetByBlob method. Old code defaulted to cache record ID in that case but that broke with the metadata interface refactor. Signed-off-by: Tonis Tiigi --- cache/metadata.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cache/metadata.go b/cache/metadata.go index 121110bd13b0..9d945861addf 100644 --- a/cache/metadata.go +++ b/cache/metadata.go @@ -251,7 +251,11 @@ func (md *cacheMetadata) queueMediaType(str string) error { } func (md *cacheMetadata) getSnapshotID() string { - return md.GetString(keySnapshot) + sid := md.GetString(keySnapshot) + if sid == "" { + return md.ID() + } + return sid } func (md *cacheMetadata) queueSnapshotID(str string) error {