feat: enable TF Vars Support for all

This commits enables the terraform variable dereferencing flow to be the default one as we go into GA.
Now everyone will benefit from getting issues based on their variables values, without having to enable a FF.

[CFG-1785]

test: merge tests after removing FF

src/cli/commands/test/iac/local-execution/file-parser.ts

@@ -27,28 +27,21 @@ import hclToJsonV2 from './parsers/hcl-to-json-v2';
 import { IacProjectType } from '../../../../../lib/iac/constants';
 
 import * as Debug from 'debug';
+
 const debug = Debug('snyk-test');
 
 export async function parseFiles(
   filesData: IacFileData[],
   options: IaCTestFlags = {},
-  isTFVarSupportEnabled = false,
 ): Promise<ParsingResults> {
   let tfFileData: IacFileData[] = [];
   let nonTfFileData: IacFileData[] = [];
-
-  if (!isTFVarSupportEnabled) {
-    nonTfFileData = filesData.filter((fileData) =>
-      ['tf', 'json', 'yaml', 'yml'].includes(fileData.fileType),
-    );
-  } else {
-    tfFileData = filesData.filter((fileData) =>
-      VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType),
-    );
-    nonTfFileData = filesData.filter(
-      (fileData) => !VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType),
-    );
-  }
+  tfFileData = filesData.filter((fileData) =>
+    VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType),
+  );
+  nonTfFileData = filesData.filter(
+    (fileData) => !VALID_TERRAFORM_FILE_TYPES.includes(fileData.fileType),
+  );
 
   let { parsedFiles, failedFiles } = parseNonTerraformFiles(
     nonTfFileData,

src/cli/commands/test/iac/local-execution/index.ts

@@ -22,7 +22,6 @@ import {
   trackUsage,
 } from './measurable-methods';
 import { findAndLoadPolicy } from '../../../../../lib/policy';
-import { isFeatureFlagSupportedForOrg } from '../../../../../lib/feature-flags';
 import { NoFilesToScanError } from './file-loader';
 import { processResults } from './process-results';
 import { generateProjectAttributes, generateTags } from '../../../monitor';
@@ -32,7 +31,6 @@ import {
 } from './directory-loader';
 import { CustomError } from '../../../../../lib/errors';
 import { getErrorStringCode } from './error-utils';
-import { FeatureFlagError } from './assert-iac-options-flag';
 
 // 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.
@@ -50,13 +48,6 @@ export async function test(
 
   const policy = await findAndLoadPolicy(pathToScan, 'iac', options);
 
-  const isTFVarSupportEnabled = (
-    await isFeatureFlagSupportedForOrg(
-      'iacTerraformVarSupport',
-      iacOrgSettings.meta.org,
-    )
-  ).ok;
-
   let allParsedFiles: IacFileParsed[] = [],
     allFailedFiles: IacFileParseFailure[] = [];
   const allDirectories = getAllDirectoriesForPath(
@@ -73,7 +64,7 @@ export async function test(
     );
     if (
       currentDirectory === pathToScan &&
-      shouldLoadVarDefinitionsFile(options, isTFVarSupportEnabled)
+      shouldLoadVarDefinitionsFile(options)
     ) {
       const varDefinitionsFilePath = options['var-file'];
       filePathsInDirectory.push(varDefinitionsFilePath);
@@ -82,7 +73,6 @@ export async function test(
     const { parsedFiles, failedFiles } = await parseFiles(
       filesToParse,
       options,
-      isTFVarSupportEnabled,
     );
     allParsedFiles = allParsedFiles.concat(parsedFiles);
     allFailedFiles = allFailedFiles.concat(failedFiles);
@@ -182,12 +172,8 @@ function parseAttributes(options: IaCTestFlags) {
 
 function shouldLoadVarDefinitionsFile(
   options: IaCTestFlags,
-  isTFVarSupportEnabled = false,
 ): options is IaCTestFlags & { 'var-file': string } {
   if (options['var-file']) {
-    if (!isTFVarSupportEnabled) {
-      throw new FeatureFlagError('var-file', 'iacTerraformVarSupport');
-    }
     if (!existsSync(options['var-file'])) {
       throw new InvalidVarFilePath(options['var-file']);
     }

test/acceptance/fake-server.ts

@@ -9,7 +9,6 @@ import { getFixturePath } from '../jest/util/getFixturePath';
 const featureFlagDefaults = (): Map<string, boolean> => {
   return new Map([
     ['cliFailFast', false],
-    ['iacTerraformVarSupport', false],
     ['iacCliOutputRelease', false],
   ]);
 };
@@ -341,13 +340,6 @@ export const fakeServer = (basePath: string, snykToken: string): FakeServer => {
       return;
     }
 
-    if (org === 'tf-lang-support' && flag === 'iacTerraformVarSupport') {
-      res.send({
-        ok: true,
-      });
-      return;
-    }
-
     if (featureFlags.has(flag)) {
       const ffEnabled = featureFlags.get(flag);
       if (ffEnabled) {

test/jest/acceptance/iac/iac-output.spec.ts

@@ -325,34 +325,32 @@ Project path:      ${filePath}
       expect(stdout).toContain(
         'Tested sg_open_ssh.tf for known issues, found 1 issues',
       );
-      expect(stdout).toContain(
-        'Tested vars.tf for known issues, found 0 issues',
-      );
+      expect(stdout).toContain('Tested vars.tf for known issues, found');
       expect(stdout).toContain(
         `Tested ${pathLib.join(
           'var_deref',
           'sg_open_ssh.tf',
-        )} for known issues, found 0 issues`,
+        )} for known issues, found`,
       );
       expect(stdout).toContain(
         `Tested ${pathLib.join(
           'var_deref',
           'variables.tf',
-        )} for known issues, found 0 issues`,
+        )} for known issues, found`,
       );
       expect(stdout).toContain(
         `Tested ${pathLib.join(
           'var_deref',
           'nested_var_deref',
           'sg_open_ssh.tf',
-        )} for known issues, found 0 issues`,
+        )} for known issues, found`,
       );
       expect(stdout).toContain(
         `Tested ${pathLib.join(
           'var_deref',
           'nested_var_deref',
           'variables.tf',
-        )} for known issues, found 0 issues`,
+        )} for known issues, found`,
       );
     });
 

test/jest/acceptance/iac/test-directory.spec.ts

@@ -49,7 +49,7 @@ describe('Directory scan', () => {
     expect(stdout).toContain('Failed to parse YAML file');
     expect(stdout).toContain('Failed to parse JSON file');
     expect(stdout).toContain(
-      '28 projects, 20 contained issues. Failed to test 5 projects.',
+      '28 projects, 22 contained issues. Failed to test 5 projects.',
     );
     expect(exitCode).toBe(1);
   });