snyk 1.944.0 → 1.945.0

package/dist/cli/935.index.js

@@ -508,16 +508,11 @@ const hcl_to_json_v2_1 = __webpack_require__(70456);
 const constants_1 = __webpack_require__(68620);
 const Debug = __webpack_require__(15158);
 const debug = Debug('snyk-test');
-async function parseFiles(filesData, options = {}, isTFVarSupportEnabled = false) {
+async function parseFiles(filesData, options = {}) {
     let tfFileData = [];
     let nonTfFileData = [];
-    if (!isTFVarSupportEnabled) {
-        nonTfFileData = filesData.filter((fileData) => ['tf', 'json', 'yaml', 'yml'].includes(fileData.fileType));
-    }
-    else {
-        tfFileData = filesData.filter((fileData) => types_1.VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType));
-        nonTfFileData = filesData.filter((fileData) => !types_1.VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType));
-    }
+    tfFileData = filesData.filter((fileData) => types_1.VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType));
+    nonTfFileData = filesData.filter((fileData) => !types_1.VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType));
     let { parsedFiles, failedFiles } = parseNonTerraformFiles(nonTfFileData, options);
     if (tfFileData.length > 0) {
         const { parsedFiles: parsedTfFiles, failedFiles: failedTfFiles, } = parseTerraformFiles(tfFileData);
@@ -799,14 +794,12 @@ const analytics_1 = __webpack_require__(41519);
 const usage_tracking_1 = __webpack_require__(70413);
 const measurable_methods_1 = __webpack_require__(5687);
 const policy_1 = __webpack_require__(32615);
-const feature_flags_1 = __webpack_require__(63011);
 const file_loader_1 = __webpack_require__(62201);
 const process_results_1 = __webpack_require__(1229);
 const monitor_1 = __webpack_require__(3708);
 const directory_loader_1 = __webpack_require__(80509);
 const errors_1 = __webpack_require__(55191);
 const error_utils_1 = __webpack_require__(36401);
-const assert_iac_options_flag_1 = __webpack_require__(33111);
 // this method executes the local processing engine and then formats the results to adapt with the CLI output.
 // this flow is the default GA flow for IAC scanning.
 async function test(pathToScan, options, orgPublicId, iacOrgSettings, rulesOrigin) {
@@ -815,7 +808,6 @@ async function test(pathToScan, options, orgPublicId, iacOrgSettings, rulesOrigi
     const tags = parseTags(options);
     const attributes = parseAttributes(options);
     const policy = await policy_1.findAndLoadPolicy(pathToScan, 'iac', options);
-    const isTFVarSupportEnabled = (await feature_flags_1.isFeatureFlagSupportedForOrg('iacTerraformVarSupport', iacOrgSettings.meta.org)).ok;
     let allParsedFiles = [], allFailedFiles = [];
     const allDirectories = directory_loader_1.getAllDirectoriesForPath(pathToScan, options.detectionDepth);
     // we load and parse files directory by directory
@@ -823,12 +815,12 @@ async function test(pathToScan, options, orgPublicId, iacOrgSettings, rulesOrigi
     for (const currentDirectory of allDirectories) {
         const filePathsInDirectory = directory_loader_1.getFilesForDirectory(pathToScan, currentDirectory);
         if (currentDirectory === pathToScan &&
-            shouldLoadVarDefinitionsFile(options, isTFVarSupportEnabled)) {
+            shouldLoadVarDefinitionsFile(options)) {
             const varDefinitionsFilePath = options['var-file'];
             filePathsInDirectory.push(varDefinitionsFilePath);
         }
         const filesToParse = await measurable_methods_1.loadContentForFiles(filePathsInDirectory);
-        const { parsedFiles, failedFiles } = await measurable_methods_1.parseFiles(filesToParse, options, isTFVarSupportEnabled);
+        const { parsedFiles, failedFiles } = await measurable_methods_1.parseFiles(filesToParse, options);
         allParsedFiles = allParsedFiles.concat(parsedFiles);
         allFailedFiles = allFailedFiles.concat(failedFiles);
     }
@@ -898,11 +890,8 @@ function parseAttributes(options) {
         return monitor_1.generateProjectAttributes(options);
     }
 }
-function shouldLoadVarDefinitionsFile(options, isTFVarSupportEnabled = false) {
+function shouldLoadVarDefinitionsFile(options) {
     if (options['var-file']) {
-        if (!isTFVarSupportEnabled) {
-            throw new assert_iac_options_flag_1.FeatureFlagError('var-file', 'iacTerraformVarSupport');
-        }
         if (!fs_1.existsSync(options['var-file'])) {
             throw new InvalidVarFilePath(options['var-file']);
         }