🐛 update catalog status field being used for stale cache identificati…

…on (#529) * (bugfix): update catalog status field being used for stale cache identification Signed-off-by: Bryce Palmer <everettraven@gmail.com> * fix failing unit test Signed-off-by: Bryce Palmer <everettraven@gmail.com> --------- Signed-off-by: Bryce Palmer <everettraven@gmail.com>
operator-framework · Nov 9, 2023 · bf39dc7 · bf39dc7
1 parent b5c6bc9
commit bf39dc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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)