snyk 1.867.0 → 1.868.0

package/dist/cli/917.index.js

@@ -873,8 +873,16 @@ async function loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles,
     // this is because we need all files in the same directory to share the same variable context
     for (const currentDirectory of allDirectories) {
         const filePathsInDirectory = getFilesForDirectory(pathToScan, currentDirectory);
-        if (filePathsInDirectory.length === 0)
-            continue; // skip directories that have 0 files but have other directories
+        if (filePathsInDirectory.length === 0 || // skip directories that have 0 files but have other directories
+            (filePathsInDirectory.length === 1 && allParsedFiles.length === 1) // skip single files that have already been parsed
+        )
+            continue;
+        if (filePathsInDirectory.length === 1 &&
+            allParsedFiles.length === 0 &&
+            (!handle_terraform_files_utils_1.shouldBeParsed(filePathsInDirectory[0]) ||
+                handle_terraform_files_utils_1.isIgnoredFile(filePathsInDirectory[0]))) {
+            throw new file_loader_1.NoFilesToScanError();
+        }
         try {
             const tfFilesToParse = await file_loader_1.loadContentForFiles(filePathsInDirectory);
             const { parsedFiles: parsedTfFiles, failedFiles: failedTfFiles, } = file_parser_1.parseTerraformFiles(tfFilesToParse);
@@ -883,7 +891,8 @@ async function loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles,
         }
         catch (err) {
             if (allParsedFiles.length !== 0 && err instanceof file_loader_1.NoFilesToScanError) {
-                // ignore this error since we might only have .tf files in the folder and we have separated them
+                // ignore this error since we might only have TF files in the folder and we have separated them,
+                // or if we have a single file scan of a non-TF file, and we have already parsed it
             }
             else {
                 throw err;
@@ -900,12 +909,9 @@ exports.loadAndParseTerraformFiles = loadAndParseTerraformFiles;
  * @returns {string[]} An array with all the non-empty nested directories in this path
  */
 function getAllDirectoriesForPath(pathToScan, maxDepth) {
-    // if it is a single file (it has an extension)
+    // if it is a single file (it has an extension), we return the current path
     if (handle_terraform_files_utils_1.isSingleFile(pathToScan)) {
-        if (!handle_terraform_files_utils_1.shouldBeParsed(pathToScan) || handle_terraform_files_utils_1.isIgnoredFile(pathToScan)) {
-            throw new file_loader_1.NoFilesToScanError();
-        }
-        return [path.resolve(pathToScan)]; // we return the current path if it is a single file
+        return [path.resolve(pathToScan)];
     }
     // if the path we scanned itself is an empty directory, finish the scan here
     if (fs.readdirSync(pathToScan).length === 0) {