UPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)

Author: camilamacedo86

openshift/default-catalog-consistency/pkg/extract/extract.go

@@ -39,7 +39,7 @@ func (r *ExtractedImage) Cleanup() {
 }
 
 // UnpackImage pulls the image, extracts it to disk, and opens it as an OCI store.
-func UnpackImage(ctx context.Context, imageRef, name string) (res *ExtractedImage, err error) {
+func UnpackImage(ctx context.Context, imageRef, name string, sysCtx *types.SystemContext) (res *ExtractedImage, err error) {
 	tmpDir, err := os.MkdirTemp("", fmt.Sprintf("oci-%s-", name))
 	if err != nil {
 		return nil, fmt.Errorf("create temp dir: %w", err)
@@ -53,27 +53,6 @@ func UnpackImage(ctx context.Context, imageRef, name string) (res *ExtractedImag
 			return nil, fmt.Errorf("parse image ref: %w", err)
 		}
 
-		// Force image resolution to Linux to avoid OS mismatch errors on macOS,
-		// like: "no image found for architecture 'arm64', OS 'darwin'".
-		//
-		// Setting OSChoice = "linux" ensures we always get a Linux image,
-		// even when running on macOS.
-		//
-		// This skips the full multi-arch index and gives us just one manifest.
-		// To check all supported architectures (e.g., amd64, arm64, ppc64le, s390x),
-		// we’d need to avoid setting OSChoice and inspect the full index manually.
-		//
-		// TODO: Update this to support checking all architectures.
-		// See: https://issues.redhat.com/browse/OPRUN-3793
-		sysCtx := &types.SystemContext{
-			OSChoice: "linux",
-		}
-
-		if authPath := os.Getenv("REGISTRY_AUTH_FILE"); authPath != "" {
-			fmt.Println("Using registry auth file:", authPath)
-			sysCtx.AuthFilePath = authPath
-		}
-
 		policyCtx, err := loadPolicyContext(sysCtx, imageRef)
 		if err != nil {
 			return nil, fmt.Errorf("create policy context: %w", err)

openshift/default-catalog-consistency/test/validate/suite_test.go

@@ -3,6 +3,9 @@ package validate
 import (
 	"context"
 	"fmt"
+	"github.com/containers/image/v5/types"
+	"os"
+	"runtime"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -23,6 +26,34 @@ var _ = Describe("Check Catalog Consistency", func() {
 	images, err := utils.ParseImageRefsFromCatalog(catalogsPath)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(images).ToNot(BeEmpty(), "no images found")
+	authPath := os.Getenv("REGISTRY_AUTH_FILE")
+	osChoice := os.Getenv("OS_CHOICE")
+
+	sysCtx := &types.SystemContext{}
+	if authPath != "" {
+		fmt.Println("Using registry auth file:", authPath)
+		sysCtx.AuthFilePath = authPath
+	}
+
+	// Force image resolution to Linux to avoid OS mismatch errors on macOS,
+	// like: "no image found for architecture 'arm64', OS 'darwin'".
+	//
+	// Setting OSChoice = "linux" ensures we always get a Linux image,
+	// even when running on macOS.
+	//
+	// This skips the full multi-arch index and gives us just one manifest.
+	// To check all supported architectures (e.g., amd64, arm64, ppc64le, s390x),
+	// we’d need to avoid setting OSChoice and inspect the full index manually.
+	//
+	// TODO: Update this to support checking all architectures.
+	// See: https://issues.redhat.com/browse/OPRUN-3793
+	if osChoice != "" {
+		fmt.Println("Using OS choice:", osChoice)
+		sysCtx.OSChoice = osChoice
+	} else if runtime.GOOS == "darwin" {
+		fmt.Println("Detected macOS; forcing OS choice to 'linux'")
+		sysCtx.OSChoice = "linux"
+	}
 
 	for _, url := range images {
 		name := utils.ImageNameFromRef(url)
@@ -31,7 +62,7 @@ var _ = Describe("Check Catalog Consistency", func() {
 			ctx := context.Background()
 			By(fmt.Sprintf("Validating image: %s", url))
 
-			extractedImage, err := extract.UnpackImage(ctx, url, name)
+			extractedImage, err := extract.UnpackImage(ctx, url, name, sysCtx)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(check.Check(ctx, extractedImage, check.AllChecks())).To(Succeed())
 			extractedImage.Cleanup()