Merge pull request #106 from dtrudg/test-index

test: modify corpus ImageIndex handling

Author: dtrudg

pkg/sif/testdata/TestWrite/DockerManifest.golden

@@ -1,4 +1,4 @@
-// Copyright 2023 Sylabs Inc. All rights reserved.
+// Copyright 2023-2025 Sylabs Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -10,6 +10,8 @@ import (
 	"testing"
 
 	v1 "github.com/google/go-containerregistry/pkg/v1"
+	ggcrempty "github.com/google/go-containerregistry/pkg/v1/empty"
+	ggcrmutate "github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/sebdah/goldie/v2"
 	"github.com/sylabs/oci-tools/pkg/sif"
 	"github.com/sylabs/oci-tools/test"
@@ -26,19 +28,25 @@ func TestWrite(t *testing.T) {
 	}{
 		{
 			name: "DockerManifest",
-			ii:   corpus.ImageIndex(t, "hello-world-docker-v2-manifest"),
+			ii: ggcrmutate.AppendManifests(
+				ggcrempty.Index,
+				ggcrmutate.IndexAddendum{Add: corpus.Image(t, "hello-world-docker-v2-manifest")}),
 		},
 		{
 			name: "DockerManifestList",
 			ii:   corpus.ImageIndex(t, "hello-world-docker-v2-manifest-list"),
 		},
 		{
 			name: "ManyLayers",
-			ii:   corpus.ImageIndex(t, "many-layers"),
+			ii: ggcrmutate.AppendManifests(
+				ggcrempty.Index,
+				ggcrmutate.IndexAddendum{Add: corpus.Image(t, "many-layers")}),
 		},
 		{
 			name: "SpareDescriptor",
-			ii:   corpus.ImageIndex(t, "hello-world-docker-v2-manifest"),
+			ii: ggcrmutate.AppendManifests(
+				ggcrempty.Index,
+				ggcrmutate.IndexAddendum{Add: corpus.Image(t, "hello-world-docker-v2-manifest")}),
 			opts: []sif.WriteOpt{
 				sif.OptWriteWithSpareDescriptorCapacity(1),
 			},

pkg/sif/testdata/TestWrite/DockerManifestList.golden

@@ -1,4 +1,4 @@
-// Copyright 2023 Sylabs Inc. All rights reserved.
+// Copyright 2023-2025 Sylabs Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -10,6 +10,7 @@ import (
 
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
+	"github.com/google/go-containerregistry/pkg/v1/partial"
 	"github.com/sylabs/oci-tools/pkg/sif"
 )
 
@@ -18,9 +19,9 @@ func (c *Corpus) ImagePath(name string) string {
 	return filepath.Join(c.dir, "images", name)
 }
 
-// ImageIndex returns a v1.ImageIndex corresponding to the OCI Image Layout with the specified name
-// in the corpus.
-func (c *Corpus) ImageIndex(tb testing.TB, name string) v1.ImageIndex {
+// rootIndex returns a v1.ImageIndex corresponding to the index.json from the OCI Image Layout
+// with the specified name in the corpus.
+func (c *Corpus) rootIndex(tb testing.TB, name string) v1.ImageIndex {
 	tb.Helper()
 
 	ii, err := layout.ImageIndexFromPath(c.ImagePath(name))
@@ -31,19 +32,40 @@ func (c *Corpus) ImageIndex(tb testing.TB, name string) v1.ImageIndex {
 	return ii
 }
 
+// ImageIndex returns a v1.ImageIndex corresponding to the OCI Image Layout with the specified name
+// in the corpus.
+func (c *Corpus) ImageIndex(tb testing.TB, name string) v1.ImageIndex {
+	tb.Helper()
+
+	iis, err := partial.FindIndexes(c.rootIndex(tb, name), matchAll)
+	if err != nil {
+		tb.Fatalf("failed to find indexes: %v", err)
+	}
+
+	if got := len(iis); got != 1 {
+		tb.Fatalf("got %v manifests, expected 1", got)
+	}
+
+	return iis[0]
+}
+
+func matchAll(v1.Descriptor) bool { return true }
+
 // Image returns a v1.Image corresponding to the OCI Image Layout with the specified name in the
 // corpus.
 func (c *Corpus) Image(tb testing.TB, name string) v1.Image {
 	tb.Helper()
 
-	ii := c.ImageIndex(tb, name)
-
-	img, err := ii.Image(v1.Hash{})
+	ims, err := partial.FindImages(c.rootIndex(tb, name), matchAll)
 	if err != nil {
-		tb.Fatalf("failed to get image from index: %v", err)
+		tb.Fatalf("failed to find images: %v", err)
+	}
+
+	if got := len(ims); got != 1 {
+		tb.Fatalf("got %v manifests, expected 1", got)
 	}
 
-	return img
+	return ims[0]
 }
 
 // OCILayout returns a temporary OCI Image Layout for the test to use, populated from the OCI Image
@@ -68,7 +90,7 @@ func (c *Corpus) SIF(tb testing.TB, name string, opt ...sif.WriteOpt) string {
 
 	path := filepath.Join(tb.TempDir(), "image.sif")
 
-	if err := sif.Write(path, c.ImageIndex(tb, name), opt...); err != nil {
+	if err := sif.Write(path, c.rootIndex(tb, name), opt...); err != nil {
 		tb.Fatalf("failed to write SIF: %v", err)
 	}