Merge pull request #3185 from snyk/feat/enable-iac-tf-vars-for-everyo…

…ne-all-tests Remove IaC TF Vars FF to make default flow for everyone [CFG-1829]
snyk · May 31, 2022 · 2868849 · 2868849
2 parents 1ee4e6d + eedd239
commit 2868849
Show file tree

Hide file tree

Showing 9 changed files with 231 additions and 529 deletions.
diff --git a/src/cli/commands/test/iac/local-execution/file-parser.ts b/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,

diff --git a/src/cli/commands/test/iac/local-execution/index.ts b/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']);
     }

diff --git a/test/acceptance/fake-server.ts b/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) {

diff --git a/test/jest/acceptance/iac/iac-output.spec.ts b/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`,
       );
     });
 

diff --git a/test/jest/acceptance/iac/test-directory.spec.ts b/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);
   });