fix: allow escape characters in json parsing

snyk · Jan 10, 2022 · 3814c67 · 3814c67
1 parent 9b7f9a5
commit 3814c67
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
   "dependencies": {
     "@open-policy-agent/opa-wasm": "^1.6.0",
     "@snyk/cli-interface": "2.11.0",
-    "@snyk/cloud-config-parser": "^1.12.0",
+    "@snyk/cloud-config-parser": "^1.13.1",
     "@snyk/code-client": "^4.5.0",
     "@snyk/dep-graph": "^1.27.1",
     "@snyk/docker-registry-v2-client": "^2.6.1",

diff --git a/src/cli/commands/test/iac-local-execution/yaml-parser.ts b/src/cli/commands/test/iac-local-execution/yaml-parser.ts
@@ -1,11 +1,15 @@
 import { CustomError } from '../../../../lib/errors';
 import { getErrorStringCode } from './error-utils';
 import { IaCErrorCodes, IacFileData } from './types';
-import { parseFileContent } from '@snyk/cloud-config-parser';
+import { ParserFileType, parseFileContent } from '@snyk/cloud-config-parser';
 
 export function parseYAMLOrJSONFileData(fileData: IacFileData): any[] {
   try {
-    return parseFileContent(fileData.fileContent);
+    // this function will always be called with the file types recognised by the parser
+    return parseFileContent(
+      fileData.fileContent,
+      fileData.fileType as ParserFileType,
+    );
   } catch (e) {
     if (fileData.fileType === 'json') {
       throw new InvalidJsonFileError(fileData.filePath);

diff --git a/src/lib/iac/constants.ts b/src/lib/iac/constants.ts
@@ -1,11 +1,13 @@
+import { ParserFileType } from '@snyk/cloud-config-parser';
+
 export type IacProjectTypes =
   | 'k8sconfig'
   | 'terraformconfig'
   | 'cloudformationconfig'
   | 'armconfig'
   | 'customconfig'
   | 'multiiacconfig';
-export type IacFileTypes = 'yaml' | 'yml' | 'json' | 'tf';
+export type IacFileTypes = ParserFileType | 'tf';
 
 export enum IacProjectType {
   K8S = 'k8sconfig',