Merge branch 'main' into simon-engledew/checkout-wrong-heads

lib/upload-lib.js

@@ -72,13 +72,18 @@ async function upload(sarifPath, repositoryNwo, commitOid, ref, analysisKey, ana
         throw new Error(`Path does not exist: ${sarifPath}`);
     }
     if (fs.lstatSync(sarifPath).isDirectory()) {
-        const paths = fs
-            .readdirSync(sarifPath)
-            .filter((f) => f.endsWith(".sarif"))
-            .map((f) => path.resolve(sarifPath, f));
-        for (const filepath of paths) {
-            sarifFiles.push(filepath);
-        }
+        const walkSarifFiles = (dir) => {
+            const entries = fs.readdirSync(dir, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.isFile() && entry.name.endsWith(".sarif")) {
+                    sarifFiles.push(path.resolve(dir, entry.name));
+                }
+                else if (entry.isDirectory()) {
+                    walkSarifFiles(path.resolve(dir, entry.name));
+                }
+            }
+        };
+        walkSarifFiles(sarifPath);
         if (sarifFiles.length === 0) {
             throw new Error(`No SARIF files found to upload in "${sarifPath}".`);
         }