Loop folder recusively

Author: hongkailiu

pkg/payload/render_test.go

@@ -3,6 +3,7 @@ package payload
 import (
 	"bytes"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -327,24 +328,21 @@ func Test_cvoManifests(t *testing.T) {
 			dir:  filepath.Join("../../bootstrap"),
 		},
 	}
+	const prefix = "include.release.openshift.io/"
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			files, err := os.ReadDir(tt.dir)
-			if err != nil {
-				t.Fatalf("failed to read directory: %v", err)
-			}
-
-			if len(files) == 0 {
-				t.Fatalf("no files found in %s", tt.dir)
-			}
+			var count int
+			err := filepath.WalkDir(tt.dir, func(path string, d fs.DirEntry, err error) error {
+				if err != nil {
+					return err
+				}
 
-			var manifestsWithoutIncludeAnnotation []manifest.Manifest
-			const prefix = "include.release.openshift.io/"
-			for _, manifestFile := range files {
-				if manifestFile.IsDir() {
-					continue
+				if d.IsDir() {
+					return nil
 				}
-				filePath := filepath.Join(tt.dir, manifestFile.Name())
+
+				var manifestsWithoutIncludeAnnotation []manifest.Manifest
+				filePath := filepath.Join(tt.dir, d.Name())
 				data, err := os.ReadFile(filePath)
 				if err != nil {
 					t.Fatalf("failed to read manifest file: %v", err)
@@ -371,15 +369,26 @@ func Test_cvoManifests(t *testing.T) {
 						manifestsWithoutIncludeAnnotation = append(manifestsWithoutIncludeAnnotation, m)
 					}
 				}
-			}
 
-			if len(manifestsWithoutIncludeAnnotation) > 0 {
-				var messages []string
-				for _, m := range manifestsWithoutIncludeAnnotation {
-					messages = append(messages, fmt.Sprintf("%s/%s/%s/%s", m.OriginalFilename, m.GVK, m.Obj.GetName(), m.Obj.GetNamespace()))
+				if len(manifestsWithoutIncludeAnnotation) > 0 {
+					var messages []string
+					for _, m := range manifestsWithoutIncludeAnnotation {
+						messages = append(messages, fmt.Sprintf("%s/%s/%s/%s", m.OriginalFilename, m.GVK, m.Obj.GetName(), m.Obj.GetNamespace()))
+					}
+					t.Errorf("Those manifests have no annotation with prefix %q and will not be installed by CVO: %s", prefix, strings.Join(messages, ", "))
 				}
-				t.Fatalf("Those manifests have no annotation with prefix %q and will not beinstalled by CVO: %s", prefix, strings.Join(messages, "', '"))
+				count++
+				return nil
+			})
+
+			if err != nil {
+				t.Fatalf("failed to walk directory: %v", err)
 			}
+
+			if count == 0 {
+				t.Errorf("no files found in %s", tt.dir)
+			}
+
 		})
 	}
 }