From bf39dc71d992ef9a96e4f8cd6ac2d40f77ea374f Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 9 Nov 2023 05:15:07 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20update=20catalog=20status=20fiel?= =?UTF-8?q?d=20being=20used=20for=20stale=20cache=20identification=20(#529?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (bugfix): update catalog status field being used for stale cache identification Signed-off-by: Bryce Palmer * fix failing unit test Signed-off-by: Bryce Palmer --------- Signed-off-by: Bryce Palmer --- internal/catalogmetadata/cache/cache.go | 4 ++-- internal/catalogmetadata/cache/cache_test.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/catalogmetadata/cache/cache.go b/internal/catalogmetadata/cache/cache.go index 3c8492d84..d1471601d 100644 --- a/internal/catalogmetadata/cache/cache.go +++ b/internal/catalogmetadata/cache/cache.go @@ -84,7 +84,7 @@ func (fsc *filesystemCache) FetchCatalogContents(ctx context.Context, catalog *c fsc.mutex.RLock() if data, ok := fsc.cacheDataByCatalogName[catalog.Name]; ok { - if catalog.Status.ResolvedSource.Image.Ref == data.ResolvedRef { + if catalog.Status.ResolvedSource.Image.ResolvedRef == data.ResolvedRef { fsc.mutex.RUnlock() return os.Open(cacheFilePath) } @@ -143,7 +143,7 @@ func (fsc *filesystemCache) FetchCatalogContents(ctx context.Context, catalog *c } fsc.cacheDataByCatalogName[catalog.Name] = cacheData{ - ResolvedRef: catalog.Status.ResolvedSource.Image.Ref, + ResolvedRef: catalog.Status.ResolvedSource.Image.ResolvedRef, } return file, nil diff --git a/internal/catalogmetadata/cache/cache_test.go b/internal/catalogmetadata/cache/cache_test.go index e8c1aa92a..bf6bd2f56 100644 --- a/internal/catalogmetadata/cache/cache_test.go +++ b/internal/catalogmetadata/cache/cache_test.go @@ -72,7 +72,7 @@ func TestCache(t *testing.T) { ResolvedSource: &catalogd.ResolvedCatalogSource{ Type: catalogd.SourceTypeImage, Image: &catalogd.ResolvedImageSource{ - Ref: "fake/catalog@sha256:fakesha", + ResolvedRef: "fake/catalog@sha256:fakesha", }, }, }, @@ -90,7 +90,7 @@ func TestCache(t *testing.T) { ResolvedSource: &catalogd.ResolvedCatalogSource{ Type: catalogd.SourceTypeImage, Image: &catalogd.ResolvedImageSource{ - Ref: "fake/catalog@sha256:fakesha", + ResolvedRef: "fake/catalog@sha256:fakesha", }, }, }, @@ -110,7 +110,7 @@ func TestCache(t *testing.T) { ResolvedSource: &catalogd.ResolvedCatalogSource{ Type: catalogd.SourceTypeImage, Image: &catalogd.ResolvedImageSource{ - Ref: "fake/catalog@sha256:fakesha", + ResolvedRef: "fake/catalog@sha256:fakesha", }, }, }, @@ -130,7 +130,7 @@ func TestCache(t *testing.T) { ResolvedSource: &catalogd.ResolvedCatalogSource{ Type: catalogd.SourceTypeImage, Image: &catalogd.ResolvedImageSource{ - Ref: "fake/catalog@sha256:fakesha", + ResolvedRef: "fake/catalog@sha256:fakesha", }, }, }, @@ -149,7 +149,7 @@ func TestCache(t *testing.T) { ResolvedSource: &catalogd.ResolvedCatalogSource{ Type: catalogd.SourceTypeImage, Image: &catalogd.ResolvedImageSource{ - Ref: "fake/catalog@sha256:fakesha", + ResolvedRef: "fake/catalog@sha256:fakesha", }, }, }, @@ -223,7 +223,7 @@ func TestCache(t *testing.T) { if tt.testCaching { if !tt.shouldHitCache { - tt.catalog.Status.ResolvedSource.Image.Ref = "fake/catalog@sha256:shafake" + tt.catalog.Status.ResolvedSource.Image.ResolvedRef = "fake/catalog@sha256:shafake" } tt.tripper.content = append(tt.tripper.content, []byte(`{"schema": "olm.package", "name": "foobar"}`)...) rc, err := c.FetchCatalogContents(ctx, tt.catalog)