snyk 1.877.0 → 1.878.0

package/dist/cli/917.index.js

@@ -511,7 +511,6 @@ exports.isIgnoredFile = isIgnoredFile;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getTerraformFilesInDirectoryGenerator = exports.getFilesForDirectory = exports.getAllDirectoriesForPath = exports.loadAndParseTerraformFiles = void 0;
-const fs = __webpack_require__(35747);
 const file_loader_1 = __webpack_require__(13552);
 const path = __webpack_require__(85622);
 const file_parser_1 = __webpack_require__(2314);
@@ -521,45 +520,25 @@ const handle_terraform_files_utils_1 = __webpack_require__(89708);
  * loading them, sending them to the parser and getting the parsing results back.
  * Then it concatenates and returns the new parsing results with the existing parsing results.
  * @param pathToScan - the path to scan provided by the user
- * @param parsedFiles - an array that holds all the existing parsedFiles
- * @param failedFiles - an array that holds all the existing failedFiles
  * @param maxDepth? - an optional maxDepth of directories if provided by the detection-depth flag
- * @returns { allParsedFiles, allFailedFiles} - all the parsing results so far
+ * @returns { parsedFiles, failedFiles} - all the parsing results so far
  */
-async function loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, maxDepth) {
-    let allParsedFiles = parsedFiles, allFailedFiles = failedFiles;
+async function loadAndParseTerraformFiles(pathToScan, maxDepth) {
+    let parsedFiles = [], failedFiles = [];
     const allDirectories = getAllDirectoriesForPath(pathToScan, maxDepth);
     // we load and parse files directory by directory
     // 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 || // 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);
-            allParsedFiles = allParsedFiles.concat(parsedTfFiles);
-            allFailedFiles = allFailedFiles.concat(failedTfFiles);
-        }
-        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,
-                // or if we have a single file scan of a non-TF file, and we have already parsed it
-            }
-            else {
-                throw err;
-            }
-        }
+        const tfFilesToParse = await file_loader_1.loadContentForFiles(filePathsInDirectory);
+        const { parsedFiles: parsedTfFiles, failedFiles: failedTfFiles, } = file_parser_1.parseTerraformFiles(tfFilesToParse);
+        parsedFiles = parsedFiles.concat(parsedTfFiles);
+        failedFiles = failedFiles.concat(failedTfFiles);
     }
-    return { allParsedFiles, allFailedFiles };
+    if (parsedFiles.length === 0) {
+        throw new file_loader_1.NoFilesToScanError();
+    }
+    return { parsedFiles, failedFiles };
 }
 exports.loadAndParseTerraformFiles = loadAndParseTerraformFiles;
 /**
@@ -573,10 +552,6 @@ function getAllDirectoriesForPath(pathToScan, maxDepth) {
     if (handle_terraform_files_utils_1.isSingleFile(pathToScan)) {
         return [path.resolve(pathToScan)];
     }
-    // if the path we scanned itself is an empty directory, finish the scan here
-    if (fs.readdirSync(pathToScan).length === 0) {
-        throw new file_loader_1.NoFilesToScanError();
-    }
     return [...getAllDirectoriesForPathGenerator(pathToScan, maxDepth)];
 }
 exports.getAllDirectoriesForPath = getAllDirectoriesForPath;
@@ -593,14 +568,17 @@ function* getAllDirectoriesForPathGenerator(pathToScan, maxDepth) {
     }
 }
 /**
- * Gets all file paths for the specific directory
+ * Gets all file paths for the specific directory. If the provided path is a supported file, then it gets returned.
  * @param pathToScan - the path to scan provided by the user
  * @param currentDirectory - the directory which we want to return files for
  * @returns {string[]} An array with all the Terraform filePaths for this directory
  */
 function getFilesForDirectory(pathToScan, currentDirectory) {
     if (handle_terraform_files_utils_1.isSingleFile(pathToScan)) {
-        return [pathToScan];
+        if (handle_terraform_files_utils_1.shouldBeParsed(pathToScan) && !handle_terraform_files_utils_1.isIgnoredFile(pathToScan)) {
+            return [pathToScan];
+        }
+        return [];
     }
     else {
         return [...getTerraformFilesInDirectoryGenerator(currentDirectory)];
@@ -679,7 +657,7 @@ async function test(pathToScan, options) {
             if (validFileTypes &&
                 !validFileTypes.includes(types_1.ValidFileType.Terraform) &&
                 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 will parse them in the next block
             }
             else {
                 throw err;
@@ -688,9 +666,19 @@ async function test(pathToScan, options) {
         // we may have loaded and parsed all but terraform files in the previous step
         // so now we check if we need to do a second load and parse which dereferences TF vars
         if (validFileTypes && !validFileTypes.includes(types_1.ValidFileType.Terraform)) {
-            const { allParsedFiles, allFailedFiles, } = await measurable_methods_1.loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, options.detectionDepth);
-            parsedFiles = allParsedFiles;
-            failedFiles = allFailedFiles;
+            try {
+                const { parsedFiles: tfParsedFiles, failedFiles: tfFailedFiles, } = await measurable_methods_1.loadAndParseTerraformFiles(pathToScan, options.detectionDepth);
+                parsedFiles = parsedFiles.concat(tfParsedFiles);
+                failedFiles = failedFiles.concat(tfFailedFiles);
+            }
+            catch (err) {
+                if (parsedFiles.length > 0 && err instanceof file_loader_1.NoFilesToScanError) {
+                    // ignore this error since we've discovered non-terraform files in the previous block
+                }
+                else {
+                    throw err;
+                }
+            }
         }
         // Duplicate all the files and run them through the custom engine.
         if (rulesOrigin !== types_1.RulesOrigin.Internal) {