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}".`);
         }

python-setup/install_tools.sh

@@ -31,8 +31,7 @@ python3 -m pip install --user pipenv
 if command -v python2 &> /dev/null; then
 	# Setup Python 2 dependency installation tools.
 	# The Ubuntu 20.04 GHA environment does not come with a Python 2 pip
-	curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
-	python2 get-pip.py
+	curl --location --fail https://bootstrap.pypa.io/get-pip.py | python2
 
 	python2 -m pip install --user --upgrade pip setuptools wheel
 

src/upload-lib.ts

@@ -104,13 +104,17 @@ export async function upload(
     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: string) => {
+      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}".`);
     }