UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml

Author: camilamacedo86

openshift/default-catalog-consistency/go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/operator-framework/operator-controller v1.3.0
 	github.com/operator-framework/operator-registry v1.55.0
+	k8s.io/apimachinery v0.33.2
 	oras.land/oras-go/v2 v2.6.0
-	sigs.k8s.io/yaml v1.5.0
 )
 
 require (
@@ -130,7 +130,6 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.33.2 // indirect
-	k8s.io/apimachinery v0.33.2 // indirect
 	k8s.io/client-go v0.33.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
@@ -139,4 +138,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/yaml v1.5.0 // indirect
 )

openshift/default-catalog-consistency/test/utils/utils.go

@@ -1,68 +1,101 @@
 package utils
 
 import (
+	"bytes"
 	"fmt"
+	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/yaml"
+	yamlutil "k8s.io/apimachinery/pkg/util/yaml"
 
 	apiv1 "github.com/operator-framework/operator-controller/api/v1"
 )
 
 // ParseImageRefsFromCatalog reads the catalogs from the files used and returns a list of image references.
 func ParseImageRefsFromCatalog(catalogsPath string) ([]string, error) {
-	var images []string
-
 	re := regexp.MustCompile(`{{.*}}`)
 
-	// Check if the directory exists first
-	if _, err := os.Stat(catalogsPath); os.IsNotExist(err) {
-		return nil, fmt.Errorf("catalogs path %s does not exist", catalogsPath)
+	info, err := os.Stat(catalogsPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, fmt.Errorf("catalogs path %s does not exist", catalogsPath)
+		}
+		return nil, err
 	}
 
-	err := filepath.WalkDir(catalogsPath, func(path string, d fs.DirEntry, err error) error {
+	var images []string
+	if info.IsDir() {
+		err = filepath.WalkDir(catalogsPath, func(path string, d fs.DirEntry, err error) error {
+			if err != nil {
+				return err
+			}
+
+			if d.IsDir() || (!strings.HasSuffix(d.Name(), ".yaml") &&
+				!strings.HasSuffix(d.Name(), ".yml")) {
+				return nil
+			}
+
+			content, err := os.ReadFile(path)
+			if err != nil {
+				return nil
+			}
+
+			refs, err := parseClusterCatalogs(content, re)
+			if err != nil {
+				return err
+			}
+			images = append(images, refs...)
+			return nil
+		})
 		if err != nil {
-			return err
+			return nil, err
 		}
-
-		if d.IsDir() || (!strings.HasSuffix(d.Name(), ".yaml") &&
-			!strings.HasSuffix(d.Name(), ".yml")) {
-			return nil
+	} else {
+		content, err := os.ReadFile(catalogsPath)
+		if err != nil {
+			return nil, err
 		}
-
-		content, err := os.ReadFile(path)
+		refs, err := parseClusterCatalogs(content, re)
 		if err != nil {
-			return nil
+			return nil, err
 		}
-		// Replace any helm templating
-		content = re.ReplaceAll(content, []byte{})
+		images = append(images, refs...)
+	}
+
+	if len(images) == 0 {
+		return nil, fmt.Errorf("no images found under catalogs path %s", catalogsPath)
+	}
 
+	return images, nil
+}
+
+func parseClusterCatalogs(content []byte, re *regexp.Regexp) ([]string, error) {
+	// Replace any helm templating
+	content = re.ReplaceAll(content, []byte{})
+
+	decoder := yamlutil.NewYAMLOrJSONDecoder(bytes.NewReader(content), 4096)
+
+	var images []string
+	for {
 		var catalog apiv1.ClusterCatalog
-		if err := yaml.Unmarshal(content, &catalog); err != nil {
-			return nil
+		if err := decoder.Decode(&catalog); err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, err
 		}
 
 		if catalog.Kind != "ClusterCatalog" {
-			return nil
+			continue
 		}
 
 		if catalog.Spec.Source.Type == apiv1.SourceTypeImage && catalog.Spec.Source.Image != nil {
 			images = append(images, catalog.Spec.Source.Image.Ref)
 		}
-
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	if len(images) == 0 {
-		return nil, fmt.Errorf("no images found under catalogs path %s", catalogsPath)
 	}
 
 	return images, nil

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

@@ -23,7 +23,7 @@ func TestSuite(t *testing.T) {
 }
 
 var _ = Describe("OLM-Catalog-Validation", func() {
-	catalogsPath := "../../../../helm/olmv1/templates/openshift-catalogs"
+	catalogsPath := "../../../catalogd/manifests.yaml"
 	images, err := utils.ParseImageRefsFromCatalog(catalogsPath)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(images).ToNot(BeEmpty(), "no images found")