snyk 1.683.0 → 1.684.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/commands/test/iac-local-execution/extract-line-number.d.ts +3 -1
- package/dist/cli/commands/test/iac-local-execution/extract-line-number.js +5 -4
- package/dist/cli/commands/test/iac-local-execution/extract-line-number.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/results-formatter.js +13 -9
- package/dist/cli/commands/test/iac-local-execution/results-formatter.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import { CloudConfigFileTypes, MapsDocIdToTree } from '@snyk/cloud-config-parser';
|
|
2
|
+
export declare function getFileTypeForParser(fileType: string): CloudConfigFileTypes;
|
|
3
|
+
export declare function extractLineNumber(cloudConfigPath: string[], fileType: CloudConfigFileTypes, treeByDocId: MapsDocIdToTree): number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extractLineNumber = void 0;
|
|
3
|
+
exports.extractLineNumber = exports.getFileTypeForParser = void 0;
|
|
4
4
|
const types_1 = require("./types");
|
|
5
5
|
const errors_1 = require("../../../../lib/errors");
|
|
6
6
|
const cloud_config_parser_1 = require("@snyk/cloud-config-parser");
|
|
@@ -9,7 +9,7 @@ const analytics = require("../../../../lib/analytics");
|
|
|
9
9
|
const Debug = require("debug");
|
|
10
10
|
const error_utils_1 = require("./error-utils");
|
|
11
11
|
const debug = Debug('iac-extract-line-number');
|
|
12
|
-
function
|
|
12
|
+
function getFileTypeForParser(fileType) {
|
|
13
13
|
switch (fileType) {
|
|
14
14
|
case 'yaml':
|
|
15
15
|
case 'yml':
|
|
@@ -22,9 +22,10 @@ function getFileTypeForLineNumber(fileType) {
|
|
|
22
22
|
throw new file_parser_1.UnsupportedFileTypeError(fileType);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
exports.getFileTypeForParser = getFileTypeForParser;
|
|
26
|
+
function extractLineNumber(cloudConfigPath, fileType, treeByDocId) {
|
|
26
27
|
try {
|
|
27
|
-
return cloud_config_parser_1.
|
|
28
|
+
return cloud_config_parser_1.getLineNumber(cloudConfigPath, fileType, treeByDocId);
|
|
28
29
|
}
|
|
29
30
|
catch (_a) {
|
|
30
31
|
const err = new FailedToExtractLineNumberError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-line-number.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/extract-line-number.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AACxC,mDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"extract-line-number.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/extract-line-number.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AACxC,mDAAqD;AACrD,mEAImC;AACnC,+CAAyD;AACzD,uDAAuD;AACvD,+BAA+B;AAC/B,+CAAmD;AACnD,MAAM,KAAK,GAAG,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAE/C,SAAgB,oBAAoB,CAAC,QAAgB;IACnD,QAAQ,QAAQ,EAAE;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,0CAAoB,CAAC,IAAI,CAAC;QACnC,KAAK,MAAM;YACT,OAAO,0CAAoB,CAAC,IAAI,CAAC;QACnC,KAAK,IAAI;YACP,OAAO,0CAAoB,CAAC,EAAE,CAAC;QACjC;YACE,MAAM,IAAI,sCAAwB,CAAC,QAAQ,CAAC,CAAC;KAChD;AACH,CAAC;AAZD,oDAYC;AAED,SAAgB,iBAAiB,CAC/B,eAAyB,EACzB,QAA8B,EAC9B,WAA4B;IAE5B,IAAI;QACF,OAAO,mCAAa,CAAC,eAAe,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC9D;IAAC,WAAM;QACN,MAAM,GAAG,GAAG,IAAI,8BAA8B,EAAE,CAAC;QACjD,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACrE,OAAO,CAAC,CAAC,CAAC;KACX;AACH,CAAC;AAbD,8CAaC;AAED,MAAM,8BAA+B,SAAQ,oBAAW;IACtD,YAAY,OAAgB;QAC1B,KAAK,CACH,OAAO,IAAI,6DAA6D,CACzE,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,qBAAa,CAAC,8BAA8B,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC,2BAA2B;IACpD,CAAC;CACF"}
|
|
@@ -10,6 +10,7 @@ const errors_1 = require("../../../../lib/errors");
|
|
|
10
10
|
const extract_line_number_1 = require("./extract-line-number");
|
|
11
11
|
const error_utils_1 = require("./error-utils");
|
|
12
12
|
const detect_1 = require("../../../../lib/detect");
|
|
13
|
+
const cloud_config_parser_1 = require("@snyk/cloud-config-parser");
|
|
13
14
|
const SEVERITIES = [common_1.SEVERITY.LOW, common_1.SEVERITY.MEDIUM, common_1.SEVERITY.HIGH];
|
|
14
15
|
function formatScanResults(scanResults, options, meta) {
|
|
15
16
|
try {
|
|
@@ -37,19 +38,22 @@ const engineTypeToProjectType = {
|
|
|
37
38
|
[types_1.EngineType.Custom]: constants_1.IacProjectType.CUSTOM,
|
|
38
39
|
};
|
|
39
40
|
function formatScanResult(scanResult, meta, options) {
|
|
41
|
+
const fileType = extract_line_number_1.getFileTypeForParser(scanResult.fileType);
|
|
42
|
+
let treeByDocId;
|
|
43
|
+
try {
|
|
44
|
+
treeByDocId = cloud_config_parser_1.getTrees(fileType, scanResult.fileContent);
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
// we do nothing intentionally.
|
|
48
|
+
// Even if the building of the tree fails in the external parser,
|
|
49
|
+
// we still pass an undefined tree and not calculated line number for those
|
|
50
|
+
}
|
|
40
51
|
const formattedIssues = scanResult.violatedPolicies.map((policy) => {
|
|
41
52
|
const cloudConfigPath = scanResult.docId !== undefined
|
|
42
53
|
? [`[DocId: ${scanResult.docId}]`].concat(path_1.parsePath(policy.msg))
|
|
43
54
|
: policy.msg.split('.');
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
'sarif',
|
|
47
|
-
'json-file-output',
|
|
48
|
-
'sarif-file-output',
|
|
49
|
-
];
|
|
50
|
-
const shouldExtractLineNumber = flagsRequiringLineNumber.some((flag) => options[flag]);
|
|
51
|
-
const lineNumber = shouldExtractLineNumber
|
|
52
|
-
? extract_line_number_1.extractLineNumber(scanResult.fileContent, scanResult.fileType, cloudConfigPath)
|
|
55
|
+
const lineNumber = treeByDocId
|
|
56
|
+
? extract_line_number_1.extractLineNumber(cloudConfigPath, fileType, treeByDocId)
|
|
53
57
|
: -1;
|
|
54
58
|
return {
|
|
55
59
|
...policy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"results-formatter.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/results-formatter.ts"],"names":[],"mappings":";;;AAAA,mCAQiB;AACjB,yCAA2C;AAC3C,6BAA6B;AAC7B,6DAA4D;AAC5D,6DAA+D;AAC/D,mDAAqD;AACrD,+
|
|
1
|
+
{"version":3,"file":"results-formatter.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/results-formatter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "snyk",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.684.0",
|
|
4
4
|
"description": "snyk library and cli utility",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"dependencies": {
|
|
76
76
|
"@open-policy-agent/opa-wasm": "^1.2.0",
|
|
77
77
|
"@snyk/cli-interface": "2.11.0",
|
|
78
|
-
"@snyk/cloud-config-parser": "^1.
|
|
78
|
+
"@snyk/cloud-config-parser": "^1.10.2",
|
|
79
79
|
"@snyk/code-client": "4.0.0",
|
|
80
80
|
"@snyk/dep-graph": "^1.27.1",
|
|
81
81
|
"@snyk/fix": "1.650.0",
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"devDependencies": {
|
|
148
148
|
"@types/cross-spawn": "^6.0.2",
|
|
149
149
|
"@types/fs-extra": "^9.0.11",
|
|
150
|
-
"@types/jest": "^
|
|
150
|
+
"@types/jest": "^27.0.1",
|
|
151
151
|
"@types/lodash": "^4.14.161",
|
|
152
152
|
"@types/needle": "^2.0.4",
|
|
153
153
|
"@types/node": "^14.14.31",
|
|
@@ -202,5 +202,5 @@
|
|
|
202
202
|
"registry": "https://registry.npmjs.org/",
|
|
203
203
|
"access": "public"
|
|
204
204
|
},
|
|
205
|
-
"gitHead": "
|
|
205
|
+
"gitHead": "dd46c193991f2c4d92772e3b6ffd90a1a92f9c69"
|
|
206
206
|
}
|