@snyk/fix 1.1279.0 → 1.1280.1
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/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/lib/output-formatters/format-failed-item.js +3 -3
- package/dist/lib/output-formatters/format-failed-item.js.map +1 -1
- package/dist/lib/output-formatters/format-unresolved-item.js +1 -1
- package/dist/lib/output-formatters/format-unresolved-item.js.map +1 -1
- package/dist/lib/output-formatters/format-with-changes-item.js +1 -1
- package/dist/lib/output-formatters/format-with-changes-item.js.map +1 -1
- package/dist/lib/output-formatters/show-results-summary.js +7 -7
- package/dist/lib/output-formatters/show-results-summary.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/extract-version-provenance.js +2 -2
- package/dist/plugins/python/handlers/pip-requirements/extract-version-provenance.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/index.js +10 -10
- package/dist/plugins/python/handlers/pip-requirements/index.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/calculate-relevant-fixes.d.ts +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/calculate-relevant-fixes.js +2 -2
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/calculate-relevant-fixes.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-pins.js +3 -3
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-pins.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.js +2 -2
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/index.js +3 -3
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/index.js.map +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser.d.ts +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser.js +1 -1
- package/dist/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/index.js +2 -2
- package/dist/plugins/python/handlers/pipenv-pipfile/index.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js +2 -2
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js +6 -6
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.js +3 -3
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/index.js +2 -2
- package/dist/plugins/python/handlers/poetry/index.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.js +4 -4
- package/dist/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/update-dependencies/index.js +8 -8
- package/dist/plugins/python/handlers/poetry/update-dependencies/index.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js +3 -3
- package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js.map +1 -1
- package/dist/plugins/python/index.js +3 -3
- package/dist/plugins/python/index.js.map +1 -1
- package/dist/plugins/python/map-entities-per-handler-type.js +1 -1
- package/dist/plugins/python/map-entities-per-handler-type.js.map +1 -1
- package/dist/plugins/types.d.ts +2 -2
- package/dist/types.d.ts +3 -3
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -20,12 +20,12 @@ async function fix(entities, options = {
|
|
|
20
20
|
debug('Running snyk fix with options:', options);
|
|
21
21
|
const spinner = ora({ isSilent: options.quiet, stream: process.stdout });
|
|
22
22
|
let resultsByPlugin = {};
|
|
23
|
-
const { vulnerable, notVulnerable: nothingToFix, } = await partition_by_vulnerable_1.partitionByVulnerable(entities);
|
|
23
|
+
const { vulnerable, notVulnerable: nothingToFix, } = await (0, partition_by_vulnerable_1.partitionByVulnerable)(entities);
|
|
24
24
|
const entitiesPerType = groupEntitiesPerScanType(vulnerable);
|
|
25
25
|
const exceptions = {};
|
|
26
26
|
await pMap(Object.keys(entitiesPerType), async (scanType) => {
|
|
27
27
|
try {
|
|
28
|
-
const fixPlugin = load_plugin_1.loadPlugin(scanType);
|
|
28
|
+
const fixPlugin = (0, load_plugin_1.loadPlugin)(scanType);
|
|
29
29
|
const results = await fixPlugin(entitiesPerType[scanType], options);
|
|
30
30
|
resultsByPlugin = { ...resultsByPlugin, ...results };
|
|
31
31
|
}
|
|
@@ -33,7 +33,7 @@ async function fix(entities, options = {
|
|
|
33
33
|
debug(`Failed to processes ${scanType}`, e);
|
|
34
34
|
exceptions[scanType] = {
|
|
35
35
|
originals: entitiesPerType[scanType],
|
|
36
|
-
userMessage: error_to_user_message_1.convertErrorToUserMessage(e),
|
|
36
|
+
userMessage: (0, error_to_user_message_1.convertErrorToUserMessage)(e),
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
}, {
|
|
@@ -79,8 +79,8 @@ function extractMeta(resultsByPlugin, exceptions) {
|
|
|
79
79
|
const issueData = testResults.map((i) => i.issuesData);
|
|
80
80
|
const failed = outputFormatter.calculateFailed(resultsByPlugin, exceptions);
|
|
81
81
|
const fixed = outputFormatter.calculateFixed(resultsByPlugin);
|
|
82
|
-
const totalIssueCount = total_issues_count_1.getTotalIssueCount(issueData);
|
|
83
|
-
const { count: fixableCount } = fixable_issues_1.hasFixableIssues(testResults);
|
|
82
|
+
const totalIssueCount = (0, total_issues_count_1.getTotalIssueCount)(issueData);
|
|
83
|
+
const { count: fixableCount } = (0, fixable_issues_1.hasFixableIssues)(testResults);
|
|
84
84
|
const fixedIssueCount = outputFormatter.calculateFixedIssues(resultsByPlugin);
|
|
85
85
|
return {
|
|
86
86
|
fixed,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,8BAA8B;AAC9B,2BAA2B;AAC3B,+BAA+B;AAE/B,gFAAgF;AAChF,uDAAmD;AAEnD,uEAAkE;AASlE,8EAA+E;AAC/E,wEAAqE;AACrE,gEAA+D;AAK/D,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;AAEjC,KAAK,UAAU,GAAG,CACvB,QAAuB,EACvB,UAAsB;IACpB,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,KAAK;CACjB;IAOD,KAAK,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAEjD,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEzE,IAAI,eAAe,GAA6B,EAAE,CAAC;IACnD,MAAM,EACJ,UAAU,EACV,aAAa,EAAE,YAAY,GAC5B,GAAG,MAAM,+CAAqB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@ const error_to_user_message_1 = require("../errors/error-to-user-message");
|
|
|
6
6
|
const format_with_changes_item_1 = require("./format-with-changes-item");
|
|
7
7
|
const format_unresolved_item_1 = require("./format-unresolved-item");
|
|
8
8
|
function formatFailed(failed) {
|
|
9
|
-
if (types_1.isWithError(failed)) {
|
|
10
|
-
return format_unresolved_item_1.formatUnresolved(failed.original, error_to_user_message_1.convertErrorToUserMessage(failed.error), failed.tip);
|
|
9
|
+
if ((0, types_1.isWithError)(failed)) {
|
|
10
|
+
return (0, format_unresolved_item_1.formatUnresolved)(failed.original, (0, error_to_user_message_1.convertErrorToUserMessage)(failed.error), failed.tip);
|
|
11
11
|
}
|
|
12
|
-
return format_with_changes_item_1.formatChangesSummary(failed.original, failed.changes);
|
|
12
|
+
return (0, format_with_changes_item_1.formatChangesSummary)(failed.original, failed.changes);
|
|
13
13
|
}
|
|
14
14
|
exports.formatFailed = formatFailed;
|
|
15
15
|
//# sourceMappingURL=format-failed-item.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-failed-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-failed-item.ts"],"names":[],"mappings":";;;AAAA,+CAA+D;AAE/D,2EAA4E;AAC5E,yEAAkE;AAClE,qEAA4D;AAE5D,SAAgB,YAAY,CAAC,MAAmB;IAC9C,IAAI,mBAAW,
|
|
1
|
+
{"version":3,"file":"format-failed-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-failed-item.ts"],"names":[],"mappings":";;;AAAA,+CAA+D;AAE/D,2EAA4E;AAC5E,yEAAkE;AAClE,qEAA4D;AAE5D,SAAgB,YAAY,CAAC,MAAmB;IAC9C,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,EAAE;QACvB,OAAO,IAAA,yCAAgB,EACrB,MAAM,CAAC,QAAQ,EACf,IAAA,iDAAyB,EAAC,MAAM,CAAC,KAAK,CAAC,EACvC,MAAM,CAAC,GAAG,CACX,CAAC;KACH;IACD,OAAO,IAAA,+CAAoB,EAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC;AATD,oCASC"}
|
|
@@ -5,7 +5,7 @@ const chalk = require("chalk");
|
|
|
5
5
|
const format_display_name_1 = require("./format-display-name");
|
|
6
6
|
const show_results_summary_1 = require("./show-results-summary");
|
|
7
7
|
function formatUnresolved(entity, userMessage, tip) {
|
|
8
|
-
const name = format_display_name_1.formatDisplayName(entity.workspace.path, entity.scanResult.identity);
|
|
8
|
+
const name = (0, format_display_name_1.formatDisplayName)(entity.workspace.path, entity.scanResult.identity);
|
|
9
9
|
const tipMessage = tip ? `\n${show_results_summary_1.PADDING_SPACE}Tip: ${tip}` : '';
|
|
10
10
|
const errorMessage = `${show_results_summary_1.PADDING_SPACE}${name}\n${show_results_summary_1.PADDING_SPACE}${chalk.red('✖')} ${chalk.red(userMessage)}`;
|
|
11
11
|
return errorMessage + tipMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-unresolved-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-unresolved-item.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,+DAA0D;AAC1D,iEAAuD;AAEvD,SAAgB,gBAAgB,CAC9B,MAAmB,EACnB,WAAmB,EACnB,GAAY;IAEZ,MAAM,IAAI,GAAG,uCAAiB,
|
|
1
|
+
{"version":3,"file":"format-unresolved-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-unresolved-item.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,+DAA0D;AAC1D,iEAAuD;AAEvD,SAAgB,gBAAgB,CAC9B,MAAmB,EACnB,WAAmB,EACnB,GAAY;IAEZ,MAAM,IAAI,GAAG,IAAA,uCAAiB,EAC5B,MAAM,CAAC,SAAS,CAAC,IAAI,EACrB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAC3B,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,oCAAa,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,MAAM,YAAY,GAAG,GAAG,oCAAa,GAAG,IAAI,KAAK,oCAAa,GAAG,KAAK,CAAC,GAAG,CACxE,GAAG,CACJ,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;IAC9B,OAAO,YAAY,GAAG,UAAU,CAAC;AACnC,CAAC;AAdD,4CAcC"}
|
|
@@ -8,7 +8,7 @@ const show_results_summary_1 = require("./show-results-summary");
|
|
|
8
8
|
* Generate formatted output that describes what changes were applied, which failed.
|
|
9
9
|
*/
|
|
10
10
|
function formatChangesSummary(entity, changes) {
|
|
11
|
-
return `${show_results_summary_1.PADDING_SPACE}${format_display_name_1.formatDisplayName(entity.workspace.path, entity.scanResult.identity)}\n${changes.map((c) => formatAppliedChange(c)).join('\n')}`;
|
|
11
|
+
return `${show_results_summary_1.PADDING_SPACE}${(0, format_display_name_1.formatDisplayName)(entity.workspace.path, entity.scanResult.identity)}\n${changes.map((c) => formatAppliedChange(c)).join('\n')}`;
|
|
12
12
|
}
|
|
13
13
|
exports.formatChangesSummary = formatChangesSummary;
|
|
14
14
|
function formatAppliedChange(change) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-with-changes-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-with-changes-item.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,+DAA0D;AAC1D,iEAAuD;AAEvD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAmB,EACnB,OAA4B;IAE5B,OAAO,GAAG,oCAAa,GAAG,uCAAiB,
|
|
1
|
+
{"version":3,"file":"format-with-changes-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-with-changes-item.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,+DAA0D;AAC1D,iEAAuD;AAEvD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAmB,EACnB,OAA4B;IAE5B,OAAO,GAAG,oCAAa,GAAG,IAAA,uCAAiB,EACzC,MAAM,CAAC,SAAS,CAAC,IAAI,EACrB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAC3B,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAChE,CAAC;AARD,oDAQC;AAED,SAAS,mBAAmB,CAAC,MAAyB;IACpD,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE;QAC3B,OAAO,GAAG,oCAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;KACpE;IACD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE;QAC5B,OAAO,GAAG,oCAAa,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CACnD,MAAM,CAAC,WAAW,CACnB,KAAK,oCAAa,UAAU,oCAAa,GAAG,MAAM,CAAC,MAAM,GACxD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,oCAAa,YAAY,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAC7D,EAAE,CAAC;KACJ;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -40,7 +40,7 @@ function generateSuccessfulFixesSummary(resultsByPlugin) {
|
|
|
40
40
|
summary +=
|
|
41
41
|
'\n\n' +
|
|
42
42
|
fixedSuccessfully
|
|
43
|
-
.map((s) => format_with_changes_item_1.formatChangesSummary(s.original, s.changes))
|
|
43
|
+
.map((s) => (0, format_with_changes_item_1.formatChangesSummary)(s.original, s.changes))
|
|
44
44
|
.join('\n\n');
|
|
45
45
|
}
|
|
46
46
|
}
|
|
@@ -62,13 +62,13 @@ function generateUnresolvedSummary(resultsByPlugin, exceptionsByScanType) {
|
|
|
62
62
|
summary +=
|
|
63
63
|
'\n\n' +
|
|
64
64
|
skipped
|
|
65
|
-
.map((s) => format_unresolved_item_1.formatUnresolved(s.original, s.userMessage))
|
|
65
|
+
.map((s) => (0, format_unresolved_item_1.formatUnresolved)(s.original, s.userMessage))
|
|
66
66
|
.join('\n\n');
|
|
67
67
|
}
|
|
68
68
|
const failed = resultsByPlugin[plugin].failed;
|
|
69
69
|
if (failed.length > 0) {
|
|
70
70
|
count += failed.length;
|
|
71
|
-
summary += '\n\n' + failed.map((s) => format_failed_item_1.formatFailed(s)).join('\n\n');
|
|
71
|
+
summary += '\n\n' + failed.map((s) => (0, format_failed_item_1.formatFailed)(s)).join('\n\n');
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
if (Object.keys(exceptionsByScanType).length) {
|
|
@@ -78,7 +78,7 @@ function generateUnresolvedSummary(resultsByPlugin, exceptionsByScanType) {
|
|
|
78
78
|
summary +=
|
|
79
79
|
'\n\n' +
|
|
80
80
|
unresolved.originals
|
|
81
|
-
.map((s) => format_unresolved_item_1.formatUnresolved(s, unresolved.userMessage))
|
|
81
|
+
.map((s) => (0, format_unresolved_item_1.formatUnresolved)(s, unresolved.userMessage))
|
|
82
82
|
.join('\n\n');
|
|
83
83
|
}
|
|
84
84
|
}
|
|
@@ -206,7 +206,7 @@ exports.getSeveritiesColour = getSeveritiesColour;
|
|
|
206
206
|
function generateIssueSummary(resultsByPlugin, exceptions) {
|
|
207
207
|
const testResults = getTestResults(resultsByPlugin, exceptions);
|
|
208
208
|
const issueData = testResults.map((i) => i.issuesData);
|
|
209
|
-
const bySeverity = issues_by_severity_1.getIssueCountBySeverity(issueData);
|
|
209
|
+
const bySeverity = (0, issues_by_severity_1.getIssueCountBySeverity)(issueData);
|
|
210
210
|
const issuesBySeverityMessage = formatIssueCountBySeverity({
|
|
211
211
|
critical: bySeverity.critical.length,
|
|
212
212
|
high: bySeverity.high.length,
|
|
@@ -218,7 +218,7 @@ function generateIssueSummary(resultsByPlugin, exceptions) {
|
|
|
218
218
|
for (const result of testResults) {
|
|
219
219
|
issues.push(...result.issues);
|
|
220
220
|
}
|
|
221
|
-
const totalIssueCount = total_issues_count_1.getTotalIssueCount(issueData);
|
|
221
|
+
const totalIssueCount = (0, total_issues_count_1.getTotalIssueCount)(issueData);
|
|
222
222
|
let totalIssues = '';
|
|
223
223
|
if (totalIssueCount > 0) {
|
|
224
224
|
totalIssues = `${chalk.bold(totalIssueCount)} issues\n`;
|
|
@@ -226,7 +226,7 @@ function generateIssueSummary(resultsByPlugin, exceptions) {
|
|
|
226
226
|
totalIssues = `${chalk.bold(totalIssueCount)} issues: ${issuesBySeverityMessage}\n`;
|
|
227
227
|
}
|
|
228
228
|
}
|
|
229
|
-
const { count: fixableCount } = fixable_issues_1.hasFixableIssues(testResults);
|
|
229
|
+
const { count: fixableCount } = (0, fixable_issues_1.hasFixableIssues)(testResults);
|
|
230
230
|
const fixableIssues = fixableCount > 0 ? `${chalk.bold(fixableCount)} issues are fixable\n` : '';
|
|
231
231
|
const fixedIssueCount = calculateFixedIssues(resultsByPlugin);
|
|
232
232
|
const fixedIssuesSummary = fixedIssueCount > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show-results-summary.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/show-results-summary.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,wCAAyC;AAUzC,6CAAuE;AACvE,6DAA4D;AAC5D,qEAAuE;AACvE,qEAAkE;AAClE,6DAAoD;AACpD,yEAAkE;AAClE,qEAA4D;AAC/C,QAAA,aAAa,GAAG,IAAI,CAAC,CAAC,WAAW;AAEvC,KAAK,UAAU,kBAAkB,CACtC,YAA2B,EAC3B,eAAyC,EACzC,UAA6B,EAC7B,OAAmB,EACnB,KAAa;IAEb,MAAM,sBAAsB,GAAG,8BAA8B,CAC3D,eAAe,CAChB,CAAC;IACF,MAAM,EACJ,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,eAAe,GACvB,GAAG,yBAAyB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC3D,MAAM,EACJ,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,GACpB,GAAG,sBAAsB,CACxB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,OAAO,CACR,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,qBAAY,KAAK,8BAAqB,EAAE,CAAC;IAEhE,yCAAyC;IACzC,IAAI,KAAK,KAAK,CAAC,EAAE;QACf,MAAM,OAAO,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAC3D,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KACzD;IAED,oDAAoD;IACpD,IAAI,YAAY,CAAC,MAAM,KAAK,KAAK,IAAI,eAAe,KAAK,CAAC,EAAE;QAC1D,MAAM,OAAO,GAAG,KAAK,KAAK,CAAC,KAAK,CAC9B,8BAA8B,CAC/B,OAAO,cAAc,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KACzD;IAED,MAAM,OAAO,GAAG,KAAK,sBAAsB,GAAG,iBAAiB,GAC7D,eAAe,IAAI,YAAY,CAAC,CAAC,CAAC,OAAO,cAAc,EAAE,CAAC,CAAC,CAAC,EAC9D,GAAG,iBAAiB,CAAC,CAAC,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACnD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AAC1D,CAAC;AA5CD,gDA4CC;AAED,SAAgB,8BAA8B,CAC5C,eAAyC;IAEzC,MAAM,YAAY,GAAG,mBAAmB,CAAC;IACzC,MAAM,oBAAoB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3D,IAAI,OAAO,GAAG,EAAE,CAAC;IAEjB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,MAAM,iBAAiB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;QAC5D,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,OAAO;gBACL,MAAM;oBACN,iBAAiB;yBACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,+CAAoB,
|
|
1
|
+
{"version":3,"file":"show-results-summary.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/show-results-summary.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,9 +15,9 @@ async function extractProvenance(workspace, rootDir, dir, fileName, provenance =
|
|
|
15
15
|
.replace(path.sep, '/');
|
|
16
16
|
provenance = {
|
|
17
17
|
...provenance,
|
|
18
|
-
[relativeTargetFileName]: requirements_file_parser_1.parseRequirementsFile(requirementsTxt),
|
|
18
|
+
[relativeTargetFileName]: (0, requirements_file_parser_1.parseRequirementsFile)(requirementsTxt),
|
|
19
19
|
};
|
|
20
|
-
const { containsRequire, matches } = await contains_require_directive_1.containsRequireDirective(requirementsTxt);
|
|
20
|
+
const { containsRequire, matches } = await (0, contains_require_directive_1.containsRequireDirective)(requirementsTxt);
|
|
21
21
|
if (containsRequire) {
|
|
22
22
|
for (const match of matches) {
|
|
23
23
|
const requiredFilePath = match[2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-version-provenance.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pip-requirements/extract-version-provenance.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,kCAAkC;AAElC,6FAGwD;AAExD,6EAAwE;AAMxE,MAAM,KAAK,GAAG,QAAQ,CAAC,4CAA4C,CAAC,CAAC;AAE9D,KAAK,UAAU,iBAAiB,CACrC,SAAoB,EACpB,OAAe,EACf,GAAW,EACX,QAAgB,EAChB,aAA+B,EAAE;IAEjC,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACvE,oDAAoD;IACpD,MAAM,sBAAsB,GAAG,IAAI;SAChC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;SACvD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1B,UAAU,GAAG;QACX,GAAG,UAAU;QACb,CAAC,sBAAsB,CAAC,EAAE,gDAAqB,
|
|
1
|
+
{"version":3,"file":"extract-version-provenance.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pip-requirements/extract-version-provenance.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,kCAAkC;AAElC,6FAGwD;AAExD,6EAAwE;AAMxE,MAAM,KAAK,GAAG,QAAQ,CAAC,4CAA4C,CAAC,CAAC;AAE9D,KAAK,UAAU,iBAAiB,CACrC,SAAoB,EACpB,OAAe,EACf,GAAW,EACX,QAAgB,EAChB,aAA+B,EAAE;IAEjC,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACvE,oDAAoD;IACpD,MAAM,sBAAsB,GAAG,IAAI;SAChC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;SACvD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1B,UAAU,GAAG;QACX,GAAG,UAAU;QACb,CAAC,sBAAsB,CAAC,EAAE,IAAA,gDAAqB,EAAC,eAAe,CAAC;KACjE,CAAC;IACF,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,qDAAwB,EACjE,eAAe,CAChB,CAAC;IACF,IAAI,eAAe,EAAE;QACnB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC3B,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE;gBAChC,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACxD,SAAS;aACV;YAED,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACjC,CAAC;YAEF,UAAU,GAAG;gBACX,GAAG,UAAU;gBACb,GAAG,CAAC,MAAM,iBAAiB,CACzB,SAAS,EACT,OAAO,EACP,UAAU,EACV,IAAI,EACJ,UAAU,CACX,CAAC;aACH,CAAC;SACH;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AA7CD,8CA6CC"}
|
|
@@ -56,7 +56,7 @@ async function fixAll(entities, options, fixedCache) {
|
|
|
56
56
|
changes: [
|
|
57
57
|
{
|
|
58
58
|
success: true,
|
|
59
|
-
userMessage: `Fixed through ${format_display_name_1.formatDisplayName(entity.workspace.path, {
|
|
59
|
+
userMessage: `Fixed through ${(0, format_display_name_1.formatDisplayName)(entity.workspace.path, {
|
|
60
60
|
type: entity.scanResult.identity.type,
|
|
61
61
|
targetFile: fixedCache[filePath].fixedIn,
|
|
62
62
|
})}`,
|
|
@@ -96,8 +96,8 @@ async function fixAll(entities, options, fixedCache) {
|
|
|
96
96
|
async function fixIndividualRequirementsTxt(workspace, dir, entryFileName, fileName, remediation, parsedRequirements, options, directUpgradesOnly) {
|
|
97
97
|
const entryFilePath = pathLib.normalize(pathLib.join(dir, entryFileName));
|
|
98
98
|
const fullFilePath = pathLib.normalize(pathLib.join(dir, fileName));
|
|
99
|
-
const { updatedManifest, changes } = update_dependencies_1.updateDependencies(parsedRequirements, remediation.pin, directUpgradesOnly, entryFilePath !== fullFilePath
|
|
100
|
-
? format_display_name_1.formatDisplayName(workspace.path, {
|
|
99
|
+
const { updatedManifest, changes } = (0, update_dependencies_1.updateDependencies)(parsedRequirements, remediation.pin, directUpgradesOnly, entryFilePath !== fullFilePath
|
|
100
|
+
? (0, format_display_name_1.formatDisplayName)(workspace.path, {
|
|
101
101
|
type: 'pip',
|
|
102
102
|
targetFile: fullFilePath,
|
|
103
103
|
})
|
|
@@ -116,10 +116,10 @@ async function fixIndividualRequirementsTxt(workspace, dir, entryFileName, fileN
|
|
|
116
116
|
}
|
|
117
117
|
exports.fixIndividualRequirementsTxt = fixIndividualRequirementsTxt;
|
|
118
118
|
async function applyAllFixes(entity, options) {
|
|
119
|
-
const { remediation, targetFile: entryFileName, workspace, } = validate_required_data_1.validateRequiredData(entity);
|
|
119
|
+
const { remediation, targetFile: entryFileName, workspace, } = (0, validate_required_data_1.validateRequiredData)(entity);
|
|
120
120
|
const fixedMeta = {};
|
|
121
121
|
const { dir, base } = pathLib.parse(entryFileName);
|
|
122
|
-
const provenance = await extract_version_provenance_1.extractProvenance(workspace, dir, dir, base);
|
|
122
|
+
const provenance = await (0, extract_version_provenance_1.extractProvenance)(workspace, dir, dir, base);
|
|
123
123
|
const upgradeChanges = [];
|
|
124
124
|
/* Apply all upgrades first across all files that are included */
|
|
125
125
|
for (const fileName of Object.keys(provenance)) {
|
|
@@ -132,14 +132,14 @@ async function applyAllFixes(entity, options) {
|
|
|
132
132
|
const toPin = filterOutAppliedUpgrades(remediation, upgradeChanges);
|
|
133
133
|
const directUpgradesOnly = false;
|
|
134
134
|
const fileForPinning = await selectFileForPinning(entity);
|
|
135
|
-
const { changes: pinnedChanges } = await fixIndividualRequirementsTxt(workspace, dir, base, fileForPinning.fileName, toPin, requirements_file_parser_1.parseRequirementsFile(fileForPinning.fileContent), options, directUpgradesOnly);
|
|
135
|
+
const { changes: pinnedChanges } = await fixIndividualRequirementsTxt(workspace, dir, base, fileForPinning.fileName, toPin, (0, requirements_file_parser_1.parseRequirementsFile)(fileForPinning.fileContent), options, directUpgradesOnly);
|
|
136
136
|
return { changes: [...upgradeChanges, ...pinnedChanges], fixedMeta };
|
|
137
137
|
}
|
|
138
138
|
exports.applyAllFixes = applyAllFixes;
|
|
139
139
|
function filterOutAppliedUpgrades(remediation, upgradeChanges) {
|
|
140
140
|
const pinRemediation = {
|
|
141
141
|
...remediation,
|
|
142
|
-
pin: {},
|
|
142
|
+
pin: {}, // delete the pin remediation so we can collect un-applied remediation
|
|
143
143
|
};
|
|
144
144
|
const pins = remediation.pin;
|
|
145
145
|
const normalizedAppliedRemediation = upgradeChanges
|
|
@@ -147,14 +147,14 @@ function filterOutAppliedUpgrades(remediation, upgradeChanges) {
|
|
|
147
147
|
var _a;
|
|
148
148
|
if (c.success && c.from) {
|
|
149
149
|
const [pkgName, versionAndMore] = (_a = c.from) === null || _a === void 0 ? void 0 : _a.split('@');
|
|
150
|
-
return `${standardize_package_name_1.standardizePackageName(pkgName)}@${versionAndMore}`;
|
|
150
|
+
return `${(0, standardize_package_name_1.standardizePackageName)(pkgName)}@${versionAndMore}`;
|
|
151
151
|
}
|
|
152
152
|
return false;
|
|
153
153
|
})
|
|
154
154
|
.filter(Boolean);
|
|
155
155
|
for (const pkgAtVersion of Object.keys(pins)) {
|
|
156
156
|
const [pkgName, versionAndMore] = pkgAtVersion.split('@');
|
|
157
|
-
if (!normalizedAppliedRemediation.includes(`${standardize_package_name_1.standardizePackageName(pkgName)}@${versionAndMore}`)) {
|
|
157
|
+
if (!normalizedAppliedRemediation.includes(`${(0, standardize_package_name_1.standardizePackageName)(pkgName)}@${versionAndMore}`)) {
|
|
158
158
|
pinRemediation.pin[pkgAtVersion] = pins[pkgAtVersion];
|
|
159
159
|
}
|
|
160
160
|
}
|
|
@@ -175,7 +175,7 @@ async function selectFileForPinning(entity) {
|
|
|
175
175
|
// default to adding pins in the scanned file
|
|
176
176
|
let fileName = base;
|
|
177
177
|
let requirementsTxt = await workspace.readFile(targetFile);
|
|
178
|
-
const { containsRequire, matches } = await contains_require_directive_1.containsRequireDirective(requirementsTxt);
|
|
178
|
+
const { containsRequire, matches } = await (0, contains_require_directive_1.containsRequireDirective)(requirementsTxt);
|
|
179
179
|
const constraintsMatch = matches.filter((m) => m.includes('c'));
|
|
180
180
|
if (containsRequire && constraintsMatch[0]) {
|
|
181
181
|
// prefer to pin in constraints file if present
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pip-requirements/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,gCAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAW1C,+DAA2D;AAC3D,8EAAqF;AACrF,6EAAiE;AACjE,6FAGwD;AACxD,6EAAwE;AACxE,6EAAwE;AACxE,sEAAiE;AACjE,+FAA0F;AAE1F,MAAM,KAAK,GAAG,QAAQ,CAAC,kCAAkC,CAAC,CAAC;AAEpD,KAAK,UAAU,kBAAkB,CACtC,OAAsB,EACtB,OAAmB;IAEnB,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,mCAAmC,CAAC,CAAC;IAC7E,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,eAAe,GAAe,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QAC7C,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAC7D,oBAAoB,EACpB,OAAO,EACP,eAAe,CAChB,CAAC;QACF,eAAe,GAAG;YAChB,GAAG,eAAe;YAClB,GAAG,UAAU;SACd,CAAC;QACF,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;KACxC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AA9BD,gDA8BC;AAED,KAAK,UAAU,MAAM,CACnB,QAAuB,EACvB,OAAmB,EACnB,UAAsB;IAEtB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAW,CAAC;QAC1D,IAAI;YACF,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAChD,kDAAkD;YAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,IACE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAC9B,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAC3C,EACD;gBACA,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC3B,QAAQ,EAAE,MAAM;oBAChB,OAAO,EAAE;wBACP;4BACE,OAAO,EAAE,IAAI;4BACb,WAAW,EAAE,iBAAiB,uCAAiB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pip-requirements/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { DependencyPins } from '../../../../../types';
|
|
2
2
|
import { Requirement } from './requirements-file-parser';
|
|
3
|
-
export
|
|
3
|
+
export type FixesType = 'direct-upgrades' | 'transitive-pins';
|
|
4
4
|
export declare function calculateRelevantFixes(requirements: Requirement[], updates: DependencyPins, type: FixesType): DependencyPins;
|
|
@@ -9,12 +9,12 @@ function calculateRelevantFixes(requirements, updates, type) {
|
|
|
9
9
|
Object.keys(updates).forEach((update) => {
|
|
10
10
|
const { upgradeTo } = updates[update];
|
|
11
11
|
const [pkgName] = update.split('@');
|
|
12
|
-
const isTransitive = topLevelDeps.indexOf(standardize_package_name_1.standardizePackageName(pkgName)) < 0;
|
|
12
|
+
const isTransitive = topLevelDeps.indexOf((0, standardize_package_name_1.standardizePackageName)(pkgName)) < 0;
|
|
13
13
|
if (type === 'transitive-pins' ? isTransitive : !isTransitive) {
|
|
14
14
|
const [name, newVersion] = upgradeTo.split('@');
|
|
15
15
|
lowerCasedUpdates[update] = {
|
|
16
16
|
...updates[update],
|
|
17
|
-
upgradeTo: `${standardize_package_name_1.standardizePackageName(name)}@${newVersion}`,
|
|
17
|
+
upgradeTo: `${(0, standardize_package_name_1.standardizePackageName)(name)}@${newVersion}`,
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-relevant-fixes.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/calculate-relevant-fixes.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAEzC,gFAA2E;AAI3E,SAAgB,sBAAsB,CACpC,YAA2B,EAC3B,OAAuB,EACvB,IAAe;IAEf,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAE5E,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,YAAY,GAChB,YAAY,CAAC,OAAO,CAAC,iDAAsB,
|
|
1
|
+
{"version":3,"file":"calculate-relevant-fixes.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/calculate-relevant-fixes.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAEzC,gFAA2E;AAI3E,SAAgB,sBAAsB,CACpC,YAA2B,EAC3B,OAAuB,EACvB,IAAe;IAEf,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAE5E,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,YAAY,GAChB,YAAY,CAAC,OAAO,CAAC,IAAA,iDAAsB,EAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5D,IAAI,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE;YAC7D,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEhD,iBAAiB,CAAC,MAAM,CAAC,GAAG;gBAC1B,GAAG,OAAO,CAAC,MAAM,CAAC;gBAClB,SAAS,EAAE,GAAG,IAAA,iDAAsB,EAAC,IAAI,CAAC,IAAI,UAAU,EAAE;aAC3D,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAvBD,wDAuBC"}
|
|
@@ -8,7 +8,7 @@ function generatePins(requirements, updates, referenceFileInChanges) {
|
|
|
8
8
|
// Lowercase the upgrades object. This might be overly defensive, given that
|
|
9
9
|
// we control this input internally, but its a low cost guard rail. Outputs a
|
|
10
10
|
// mapping of upgrade to -> from, instead of the nested upgradeTo object.
|
|
11
|
-
const standardizedPins = calculate_relevant_fixes_1.calculateRelevantFixes(requirements, updates, 'transitive-pins');
|
|
11
|
+
const standardizedPins = (0, calculate_relevant_fixes_1.calculateRelevantFixes)(requirements, updates, 'transitive-pins');
|
|
12
12
|
if (Object.keys(standardizedPins).length === 0) {
|
|
13
13
|
return {
|
|
14
14
|
pinnedRequirements: [],
|
|
@@ -20,13 +20,13 @@ function generatePins(requirements, updates, referenceFileInChanges) {
|
|
|
20
20
|
.map((pkgNameAtVersion) => {
|
|
21
21
|
const [pkgName, version] = pkgNameAtVersion.split('@');
|
|
22
22
|
const newVersion = standardizedPins[pkgNameAtVersion].upgradeTo.split('@')[1];
|
|
23
|
-
const newRequirement = `${standardize_package_name_1.standardizePackageName(pkgName)}>=${newVersion}`;
|
|
23
|
+
const newRequirement = `${(0, standardize_package_name_1.standardizePackageName)(pkgName)}>=${newVersion}`;
|
|
24
24
|
changes.push({
|
|
25
25
|
from: `${pkgName}@${version}`,
|
|
26
26
|
to: `${pkgName}@${newVersion}`,
|
|
27
27
|
issueIds: standardizedPins[pkgNameAtVersion].vulns,
|
|
28
28
|
success: true,
|
|
29
|
-
userMessage: `Pinned ${standardize_package_name_1.standardizePackageName(pkgName)} from ${version} to ${newVersion}${referenceFileInChanges ? ` (pinned in ${referenceFileInChanges})` : ''}`,
|
|
29
|
+
userMessage: `Pinned ${(0, standardize_package_name_1.standardizePackageName)(pkgName)} from ${version} to ${newVersion}${referenceFileInChanges ? ` (pinned in ${referenceFileInChanges})` : ''}`,
|
|
30
30
|
});
|
|
31
31
|
return `${newRequirement} # not directly required, pinned by Snyk to avoid a vulnerability`;
|
|
32
32
|
})
|
package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-pins.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-pins.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/generate-pins.ts"],"names":[],"mappings":";;;AACA,yEAAoE;AACpE,6CAAyC;AAEzC,gFAA2E;AAE3E,SAAgB,YAAY,CAC1B,YAA2B,EAC3B,OAAuB,EACvB,sBAA+B;IAK/B,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,gBAAgB,GAAG,iDAAsB,
|
|
1
|
+
{"version":3,"file":"generate-pins.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/generate-pins.ts"],"names":[],"mappings":";;;AACA,yEAAoE;AACpE,6CAAyC;AAEzC,gFAA2E;AAE3E,SAAgB,YAAY,CAC1B,YAA2B,EAC3B,OAAuB,EACvB,sBAA+B;IAK/B,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,gBAAgB,GAAG,IAAA,iDAAsB,EAC7C,YAAY,EACZ,OAAO,EACP,iBAAiB,CAClB,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO;YACL,kBAAkB,EAAE,EAAE;YACtB,OAAO,EAAE,EAAE;SACZ,CAAC;KACH;IACD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;SACrD,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACxB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,KAAK,CACnE,GAAG,CACJ,CAAC,CAAC,CAAC,CAAC;QACL,MAAM,cAAc,GAAG,GAAG,IAAA,iDAAsB,EAC9C,OAAO,CACR,KAAK,UAAU,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,GAAG,OAAO,IAAI,OAAO,EAAE;YAC7B,EAAE,EAAE,GAAG,OAAO,IAAI,UAAU,EAAE;YAC9B,QAAQ,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,KAAK;YAClD,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,UAAU,IAAA,iDAAsB,EAC3C,OAAO,CACR,SAAS,OAAO,OAAO,UAAU,GAChC,sBAAsB,CAAC,CAAC,CAAC,eAAe,sBAAsB,GAAG,CAAC,CAAC,CAAC,EACtE,EAAE;SACH,CAAC,CAAC;QACH,OAAO,GAAG,cAAc,mEAAmE,CAAC;IAC9F,CAAC,CAAC;SACD,MAAM,CAAC,sBAAS,CAAC,CAAC;IAErB,OAAO;QACL,kBAAkB;QAClB,OAAO;KACR,CAAC;AACJ,CAAC;AApDD,oCAoDC"}
|
package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.js
CHANGED
|
@@ -7,7 +7,7 @@ function generateUpgrades(requirements, updates, referenceFileInChanges) {
|
|
|
7
7
|
// Lowercase the upgrades object. This might be overly defensive, given that
|
|
8
8
|
// we control this input internally, but its a low cost guard rail. Outputs a
|
|
9
9
|
// mapping of upgrade to -> from, instead of the nested upgradeTo object.
|
|
10
|
-
const normalizedUpgrades = calculate_relevant_fixes_1.calculateRelevantFixes(requirements, updates, 'direct-upgrades');
|
|
10
|
+
const normalizedUpgrades = (0, calculate_relevant_fixes_1.calculateRelevantFixes)(requirements, updates, 'direct-upgrades');
|
|
11
11
|
if (Object.keys(normalizedUpgrades).length === 0) {
|
|
12
12
|
return {
|
|
13
13
|
updatedRequirements: {},
|
|
@@ -28,7 +28,7 @@ function generateUpgrades(requirements, updates, referenceFileInChanges) {
|
|
|
28
28
|
// the upgrade, but keep the rest of the content
|
|
29
29
|
const upgrade = Object.keys(normalizedUpgrades).filter((packageVersionUpgrade) => {
|
|
30
30
|
const [pkgName, versionAndMore] = packageVersionUpgrade.split('@');
|
|
31
|
-
return `${standardize_package_name_1.standardizePackageName(pkgName)}@${versionAndMore}`.startsWith(`${standardize_package_name_1.standardizePackageName(name)}@${version}`);
|
|
31
|
+
return `${(0, standardize_package_name_1.standardizePackageName)(pkgName)}@${versionAndMore}`.startsWith(`${(0, standardize_package_name_1.standardizePackageName)(name)}@${version}`);
|
|
32
32
|
})[0];
|
|
33
33
|
if (!upgrade) {
|
|
34
34
|
return;
|
package/dist/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,yEAAoE;AAIpE,SAAgB,gBAAgB,CAC9B,YAA2B,EAC3B,OAAuB,EACvB,sBAA+B;IAK/B,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,kBAAkB,GAAG,iDAAsB,
|
|
1
|
+
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,yEAAoE;AAIpE,SAAgB,gBAAgB,CAC9B,YAA2B,EAC3B,OAAuB,EACvB,sBAA+B;IAK/B,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,kBAAkB,GAAG,IAAA,iDAAsB,EAC/C,YAAY,EACZ,OAAO,EACP,iBAAiB,CAClB,CAAC;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAChD,OAAO;YACL,mBAAmB,EAAE,EAAE;YACvB,OAAO,EAAE,EAAE;SACZ,CAAC;KACH;IAED,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,YAAY,CAAC,GAAG,CACd,CAAC,EACC,IAAI,EACJ,YAAY,EACZ,iBAAiB,EACjB,OAAO,EACP,YAAY,EACZ,MAAM,GACP,EAAE,EAAE;QACH,4DAA4D;QAC5D,IACE,OAAO,IAAI,KAAK,WAAW;YAC3B,OAAO,iBAAiB,KAAK,WAAW;YACxC,OAAO,OAAO,KAAK,WAAW;YAC9B,YAAY,KAAK,EAAE,EACnB;YACA,OAAO;SACR;QAED,yEAAyE;QACzE,gDAAgD;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CACpD,CAAC,qBAA6B,EAAE,EAAE;YAChC,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnE,OAAO,GAAG,IAAA,iDAAsB,EAC9B,OAAO,CACR,IAAI,cAAc,EAAE,CAAC,UAAU,CAC9B,GAAG,IAAA,iDAAsB,EAAC,IAAI,CAAC,IAAI,OAAO,EAAE,CAC7C,CAAC;QACJ,CAAC,CACF,CAAC,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,kBAAkB,GAAG,GAAG,YAAY,GAAG,iBAAiB,GAAG,UAAU,EAAE,CAAC;QAC9E,OAAO,CAAC,IAAI,CAAC;YACX,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,KAAK;YAC3C,IAAI,EAAE,GAAG,YAAY,IAAI,OAAO,EAAE;YAClC,EAAE,EAAE,GAAG,YAAY,IAAI,UAAU,EAAE;YACnC,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,YAAY,YAAY,SAAS,OAAO,OAAO,UAAU,GACpE,sBAAsB;gBACpB,CAAC,CAAC,iBAAiB,sBAAsB,GAAG;gBAC5C,CAAC,CAAC,EACN,EAAE;SACH,CAAC,CAAC;QACH,mBAAmB,CAAC,YAAY,CAAC,GAAG,GAAG,kBAAkB,GACvD,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EACpB,EAAE,CAAC;IACL,CAAC,CACF,CAAC;IAEF,OAAO;QACL,mBAAmB;QACnB,OAAO;KACR,CAAC;AACJ,CAAC;AAnFD,4CAmFC"}
|
|
@@ -21,16 +21,16 @@ function updateDependencies(parsedRequirementsData, updates, directUpgradesOnly
|
|
|
21
21
|
throw new failed_to_parse_manifest_1.FailedToParseManifest();
|
|
22
22
|
}
|
|
23
23
|
debug('Finished parsing manifest');
|
|
24
|
-
const { updatedRequirements, changes: upgradedChanges } = generate_upgrades_1.generateUpgrades(requirements, updates, referenceFileInChanges);
|
|
24
|
+
const { updatedRequirements, changes: upgradedChanges } = (0, generate_upgrades_1.generateUpgrades)(requirements, updates, referenceFileInChanges);
|
|
25
25
|
debug('Finished generating upgrades to apply');
|
|
26
26
|
let pinnedRequirements = [];
|
|
27
27
|
let pinChanges = [];
|
|
28
28
|
if (!directUpgradesOnly) {
|
|
29
|
-
({ pinnedRequirements, changes: pinChanges } = generate_pins_1.generatePins(requirements, updates, referenceFileInChanges));
|
|
29
|
+
({ pinnedRequirements, changes: pinChanges } = (0, generate_pins_1.generatePins)(requirements, updates, referenceFileInChanges));
|
|
30
30
|
debug('Finished generating pins to apply');
|
|
31
31
|
}
|
|
32
32
|
let updatedManifest = [
|
|
33
|
-
...apply_upgrades_1.applyUpgrades(requirements, updatedRequirements),
|
|
33
|
+
...(0, apply_upgrades_1.applyUpgrades)(requirements, updatedRequirements),
|
|
34
34
|
...pinnedRequirements,
|
|
35
35
|
].join('\n');
|
|
36
36
|
// This is a bit of a hack, but an easy one to follow. If a file ends with a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAGlC,mDAA+C;AAC/C,qDAAiD;AAEjD,2DAAuD;AACvD,iGAA2F;AAE3F,MAAM,KAAK,GAAG,QAAQ,CAAC,qCAAqC,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,sBAA0C,EAC1C,OAAuB,EACvB,kBAAkB,GAAG,KAAK,EAC1B,sBAA+B;IAK/B,MAAM,EACJ,YAAY,EACZ,eAAe,EAAE,oBAAoB,GACtC,GAAG,sBAAsB,CAAC;IAC3B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,KAAK,CACH,qEAAqE,CACtE,CAAC;QACF,MAAM,IAAI,gDAAqB,EAAE,CAAC;KACnC;IACD,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEnC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,oCAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAGlC,mDAA+C;AAC/C,qDAAiD;AAEjD,2DAAuD;AACvD,iGAA2F;AAE3F,MAAM,KAAK,GAAG,QAAQ,CAAC,qCAAqC,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,sBAA0C,EAC1C,OAAuB,EACvB,kBAAkB,GAAG,KAAK,EAC1B,sBAA+B;IAK/B,MAAM,EACJ,YAAY,EACZ,eAAe,EAAE,oBAAoB,GACtC,GAAG,sBAAsB,CAAC;IAC3B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,KAAK,CACH,qEAAqE,CACtE,CAAC;QACF,MAAM,IAAI,gDAAqB,EAAE,CAAC;KACnC;IACD,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEnC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAA,oCAAgB,EACxE,YAAY,EACZ,OAAO,EACP,sBAAsB,CACvB,CAAC;IACF,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAE/C,IAAI,kBAAkB,GAAa,EAAE,CAAC;IACtC,IAAI,UAAU,GAAwB,EAAE,CAAC;IACzC,IAAI,CAAC,kBAAkB,EAAE;QACvB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAA,4BAAY,EACzD,YAAY,EACZ,OAAO,EACP,sBAAsB,CACvB,CAAC,CAAC;QACH,KAAK,CAAC,mCAAmC,CAAC,CAAC;KAC5C;IAED,IAAI,eAAe,GAAG;QACpB,GAAG,IAAA,8BAAa,EAAC,YAAY,EAAE,mBAAmB,CAAC;QACnD,GAAG,kBAAkB;KACtB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,4EAA4E;IAC5E,2EAA2E;IAC3E,IAAI,oBAAoB,EAAE;QACxB,eAAe,IAAI,IAAI,CAAC;KACzB;IACD,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAE/C,OAAO;QACL,eAAe;QACf,OAAO,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,eAAe,CAAC;KAC7C,CAAC;AACJ,CAAC;AAvDD,gDAuDC"}
|
|
@@ -37,7 +37,7 @@ function extractDependencyDataFromLine(requirementText, line) {
|
|
|
37
37
|
const regex = /([A-Z0-9-._]*)(!=|===|==|>=|<=|>|<|~=)(\d*\.?\d*\.?\d*[A-Z0-9]*)(.*)/i;
|
|
38
38
|
const result = regex.exec(requirementText);
|
|
39
39
|
if (result !== null) {
|
|
40
|
-
requirement.name = standardize_package_name_1.standardizePackageName(result[1]);
|
|
40
|
+
requirement.name = (0, standardize_package_name_1.standardizePackageName)(result[1]);
|
|
41
41
|
requirement.originalName = result[1];
|
|
42
42
|
requirement.versionComparator = result[2];
|
|
43
43
|
requirement.version = result[3];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requirements-file-parser.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,gFAA2E;AAE3E,MAAM,KAAK,GAAG,QAAQ,CAAC,0CAA0C,CAAC,CAAC;AAuBnE,SAAgB,qBAAqB,CACnC,gBAAwB;IAExB,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,KAAK,CAAC,GAAG,CAAC,CAAC,eAAuB,EAAE,IAAY,EAAE,EAAE;QAClD,MAAM,WAAW,GAAG,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACzE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC;AAC3C,CAAC;AAbD,sDAaC;AAED,SAAS,6BAA6B,CACpC,eAAuB,EACvB,IAAY;IAEZ,IAAI;QACF,MAAM,WAAW,GAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACzE,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;QAE3C,8CAA8C;QAC9C,uBAAuB;QACvB,sFAAsF;QACtF,sCAAsC;QACtC,0DAA0D;QAC1D,IACE,eAAe,KAAK,EAAE;YACtB,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC;YAC5B,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;YAC3B,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAC/B;YACA,OAAO,WAAW,CAAC;SACpB;QAED,2EAA2E;QAC3E,+DAA+D;QAC/D,MAAM,KAAK,GAAG,uEAAuE,CAAC;QACtF,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,WAAW,CAAC,IAAI,GAAG,iDAAsB,
|
|
1
|
+
{"version":3,"file":"requirements-file-parser.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pip-requirements/update-dependencies/requirements-file-parser.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,gFAA2E;AAE3E,MAAM,KAAK,GAAG,QAAQ,CAAC,0CAA0C,CAAC,CAAC;AAuBnE,SAAgB,qBAAqB,CACnC,gBAAwB;IAExB,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,KAAK,CAAC,GAAG,CAAC,CAAC,eAAuB,EAAE,IAAY,EAAE,EAAE;QAClD,MAAM,WAAW,GAAG,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACzE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC;AAC3C,CAAC;AAbD,sDAaC;AAED,SAAS,6BAA6B,CACpC,eAAuB,EACvB,IAAY;IAEZ,IAAI;QACF,MAAM,WAAW,GAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACzE,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;QAE3C,8CAA8C;QAC9C,uBAAuB;QACvB,sFAAsF;QACtF,sCAAsC;QACtC,0DAA0D;QAC1D,IACE,eAAe,KAAK,EAAE;YACtB,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC;YAC5B,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;YAC3B,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAC/B;YACA,OAAO,WAAW,CAAC;SACpB;QAED,2EAA2E;QAC3E,+DAA+D;QAC/D,MAAM,KAAK,GAAG,uEAAuE,CAAC;QACtF,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,WAAW,CAAC,IAAI,GAAG,IAAA,iDAAsB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACrC,WAAW,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAsB,CAAC;YAC/D,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAChC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QACD,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,GAAG,EAAE;QACZ,KAAK,CACH,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,EAC7C,6BAA6B,CAC9B,CAAC;QACF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;KAChD;AACH,CAAC"}
|
|
@@ -13,13 +13,13 @@ async function pipenvPipfile(fixable, options) {
|
|
|
13
13
|
failed: [],
|
|
14
14
|
skipped: [],
|
|
15
15
|
};
|
|
16
|
-
await package_tool_supported_1.checkPackageToolSupported('pipenv', options);
|
|
16
|
+
await (0, package_tool_supported_1.checkPackageToolSupported)('pipenv', options);
|
|
17
17
|
for (const [index, entity] of fixable.entries()) {
|
|
18
18
|
const spinner = ora({ isSilent: options.quiet, stream: process.stdout });
|
|
19
19
|
const spinnerMessage = `Fixing Pipfile ${index + 1}/${fixable.length}`;
|
|
20
20
|
spinner.text = spinnerMessage;
|
|
21
21
|
spinner.start();
|
|
22
|
-
const { failed, succeeded, skipped } = await update_dependencies_1.updateDependencies(entity, options);
|
|
22
|
+
const { failed, succeeded, skipped } = await (0, update_dependencies_1.updateDependencies)(entity, options);
|
|
23
23
|
handlerResult.succeeded.push(...succeeded);
|
|
24
24
|
handlerResult.failed.push(...failed);
|
|
25
25
|
handlerResult.skipped.push(...skipped);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pipenv-pipfile/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2BAA2B;AAG3B,4EAA4E;AAE5E,+DAA2D;AAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;AAE3C,KAAK,UAAU,aAAa,CACjC,OAAsB,EACtB,OAAmB;IAEnB,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,0BAA0B,CAAC,CAAC;IACpE,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,kDAAyB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/pipenv-pipfile/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2BAA2B;AAG3B,4EAA4E;AAE5E,+DAA2D;AAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;AAE3C,KAAK,UAAU,aAAa,CACjC,OAAsB,EACtB,OAAmB;IAEnB,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,0BAA0B,CAAC,CAAC;IACpE,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,IAAA,kDAAyB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,kBAAkB,KAAK,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACvE,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;QAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wCAAkB,EAC7D,MAAM,EACN,OAAO,CACR,CAAC;QACF,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA7BD,sCA6BC"}
|
package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js
CHANGED
|
@@ -4,14 +4,14 @@ exports.generateUpgrades = void 0;
|
|
|
4
4
|
const standardize_package_name_1 = require("../../../standardize-package-name");
|
|
5
5
|
const validate_required_data_1 = require("../../validate-required-data");
|
|
6
6
|
function generateUpgrades(entity) {
|
|
7
|
-
const { remediation } = validate_required_data_1.validateRequiredData(entity);
|
|
7
|
+
const { remediation } = (0, validate_required_data_1.validateRequiredData)(entity);
|
|
8
8
|
const { pin: pins } = remediation;
|
|
9
9
|
const upgrades = [];
|
|
10
10
|
for (const pkgAtVersion of Object.keys(pins)) {
|
|
11
11
|
const pin = pins[pkgAtVersion];
|
|
12
12
|
const newVersion = pin.upgradeTo.split('@')[1];
|
|
13
13
|
const [pkgName] = pkgAtVersion.split('@');
|
|
14
|
-
upgrades.push(`${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`);
|
|
14
|
+
upgrades.push(`${(0, standardize_package_name_1.standardizePackageName)(pkgName)}==${newVersion}`);
|
|
15
15
|
}
|
|
16
16
|
return { upgrades };
|
|
17
17
|
}
|
package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,yEAAoE;AAEpE,SAAgB,gBAAgB,CAAC,MAAmB;IAClD,MAAM,EAAE,WAAW,EAAE,GAAG,6CAAoB,
|
|
1
|
+
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,yEAAoE;AAEpE,SAAgB,gBAAgB,CAAC,MAAmB;IAClD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAElC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,iDAAsB,EAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;KACpE;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC;AAZD,4CAYC"}
|
|
@@ -23,7 +23,7 @@ async function fixAll(entity, options) {
|
|
|
23
23
|
};
|
|
24
24
|
const changes = [];
|
|
25
25
|
try {
|
|
26
|
-
const { upgrades } = await generate_upgrades_1.generateUpgrades(entity);
|
|
26
|
+
const { upgrades } = await (0, generate_upgrades_1.generateUpgrades)(entity);
|
|
27
27
|
if (!upgrades.length) {
|
|
28
28
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
|
|
29
29
|
}
|
|
@@ -34,12 +34,12 @@ async function fixAll(entity, options) {
|
|
|
34
34
|
// Currently this is not possible as there is no Pipfile parser that would do this.
|
|
35
35
|
// update prod dependencies first
|
|
36
36
|
if (upgrades.length) {
|
|
37
|
-
changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, upgrades)));
|
|
37
|
+
changes.push(...(await (0, pipenv_add_1.pipenvAdd)(entity, options, upgrades)));
|
|
38
38
|
}
|
|
39
39
|
if (!changes.length) {
|
|
40
40
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
41
41
|
}
|
|
42
|
-
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
42
|
+
if (!changes.some((c) => (0, attempted_changes_summary_1.isSuccessfulChange)(c))) {
|
|
43
43
|
handlerResult.failed.push({
|
|
44
44
|
original: entity,
|
|
45
45
|
changes,
|
|
@@ -68,7 +68,7 @@ async function fixSequentially(entity, options) {
|
|
|
68
68
|
failed: [],
|
|
69
69
|
skipped: [],
|
|
70
70
|
};
|
|
71
|
-
const { upgrades } = await generate_upgrades_1.generateUpgrades(entity);
|
|
71
|
+
const { upgrades } = await (0, generate_upgrades_1.generateUpgrades)(entity);
|
|
72
72
|
// TODO: for better support we need to:
|
|
73
73
|
// 1. parse the manifest and extract original requirements, version spec etc
|
|
74
74
|
// 2. swap out only the version and retain original spec
|
|
@@ -83,13 +83,13 @@ async function fixSequentially(entity, options) {
|
|
|
83
83
|
// update prod dependencies first
|
|
84
84
|
if (upgrades.length) {
|
|
85
85
|
for (const upgrade of upgrades) {
|
|
86
|
-
changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, [upgrade])));
|
|
86
|
+
changes.push(...(await (0, pipenv_add_1.pipenvAdd)(entity, options, [upgrade])));
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
if (!changes.length) {
|
|
90
90
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
91
91
|
}
|
|
92
|
-
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
92
|
+
if (!changes.some((c) => (0, attempted_changes_summary_1.isSuccessfulChange)(c))) {
|
|
93
93
|
handlerResult.failed.push({
|
|
94
94
|
original: entity,
|
|
95
95
|
changes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AASlC,iFAAwF;AACxF,2DAAuD;AACvD,6CAAyC;AACzC,+EAAqE;AAErE,MAAM,KAAK,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;AAElD,SAAS,iBAAiB,CAAC,OAAmB;IAC5C,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,gDAMC;AAED,KAAK,UAAU,MAAM,CACnB,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,oCAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const debug = debugLib('snyk-fix:python:pipenvAdd');
|
|
|
12
12
|
async function pipenvAdd(entity, options, upgrades) {
|
|
13
13
|
const changes = [];
|
|
14
14
|
let pipenvCommand;
|
|
15
|
-
const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
|
|
15
|
+
const { remediation, targetFile } = (0, validate_required_data_1.validateRequiredData)(entity);
|
|
16
16
|
try {
|
|
17
17
|
const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
|
|
18
18
|
const { dir } = pathLib.parse(targetFilePath);
|
|
@@ -26,10 +26,10 @@ async function pipenvAdd(entity, options, upgrades) {
|
|
|
26
26
|
throwPipenvError(stderr, stdout, command);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
|
|
29
|
+
changes.push(...(0, attempted_changes_summary_1.generateSuccessfulChanges)(upgrades, remediation.pin));
|
|
30
30
|
}
|
|
31
31
|
catch (error) {
|
|
32
|
-
changes.push(...attempted_changes_summary_1.generateFailedChanges(upgrades, remediation.pin, error, pipenvCommand));
|
|
32
|
+
changes.push(...(0, attempted_changes_summary_1.generateFailedChanges)(upgrades, remediation.pin, error, pipenvCommand));
|
|
33
33
|
}
|
|
34
34
|
return changes;
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipenv-add.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,6DAA6D;AAC7D,kCAAkC;AAOlC,yEAAoE;AAEpE,+EAGyC;AACzC,uGAA2F;AAC3F,iFAAwF;AAExF,MAAM,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAE7C,KAAK,UAAU,SAAS,CAC7B,MAAmB,EACnB,OAAmB,EACnB,QAAkB;IAElB,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,aAAa,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,6CAAoB,
|
|
1
|
+
{"version":3,"file":"pipenv-add.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,6DAA6D;AAC7D,kCAAkC;AAOlC,yEAAoE;AAEpE,+EAGyC;AACzC,uGAA2F;AAC3F,iFAAwF;AAExF,MAAM,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAE7C,KAAK,UAAU,SAAS,CAC7B,MAAmB,EACnB,OAAmB,EACnB,QAAkB;IAElB,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,aAAa,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACjE,IAAI;QACF,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YACtC,MAAM,EACJ,MAAM,EACN,MAAM,EACN,OAAO,EACP,QAAQ,GACT,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE;gBACtD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;aAC/B,CAAC,CAAC;YACH,KAAK,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7D,IAAI,QAAQ,KAAK,CAAC,EAAE;gBAClB,aAAa,GAAG,OAAO,CAAC;gBACxB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aAC3C;SACF;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAA,qDAAyB,EAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CACV,GAAG,IAAA,iDAAqB,EAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAC1E,CAAC;KACH;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAjCD,8BAiCC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,MAAc,EAAE,OAAgB;IACxE,MAAM,gBAAgB,GACpB,8DAA8D,CAAC;IACjE,MAAM,aAAa,GAAG,gBAAgB,CAAC;IACvC,MAAM,eAAe,GAAG,uCAAuC,CAAC;IAEhE,MAAM,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE5E,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;QACpC,IACE,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAClD,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,EAClD;YACA,MAAM,IAAI,gDAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC9C;KACF;IAED,MAAM,cAAc,GAAG,kDAAkD,CAAC;IAC1E,MAAM,kBAAkB,GACtB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,kBAAkB,EAAE;QACtB,MAAM,IAAI,gDAAkB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;KACrE;IAED,MAAM,IAAI,6CAA0B,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -13,13 +13,13 @@ async function poetry(fixable, options) {
|
|
|
13
13
|
failed: [],
|
|
14
14
|
skipped: [],
|
|
15
15
|
};
|
|
16
|
-
await package_tool_supported_1.checkPackageToolSupported('poetry', options);
|
|
16
|
+
await (0, package_tool_supported_1.checkPackageToolSupported)('poetry', options);
|
|
17
17
|
for (const [index, entity] of fixable.entries()) {
|
|
18
18
|
const spinner = ora({ isSilent: options.quiet, stream: process.stdout });
|
|
19
19
|
const spinnerMessage = `Fixing pyproject.toml ${index + 1}/${fixable.length}`;
|
|
20
20
|
spinner.text = spinnerMessage;
|
|
21
21
|
spinner.start();
|
|
22
|
-
const { failed, succeeded, skipped } = await update_dependencies_1.updateDependencies(entity, options);
|
|
22
|
+
const { failed, succeeded, skipped } = await (0, update_dependencies_1.updateDependencies)(entity, options);
|
|
23
23
|
handlerResult.succeeded.push(...succeeded);
|
|
24
24
|
handlerResult.failed.push(...failed);
|
|
25
25
|
handlerResult.skipped.push(...skipped);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/poetry/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2BAA2B;AAG3B,4EAA4E;AAE5E,+DAA2D;AAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAE1C,KAAK,UAAU,MAAM,CAC1B,OAAsB,EACtB,OAAmB;IAEnB,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,yBAAyB,CAAC,CAAC;IACnE,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,kDAAyB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/python/handlers/poetry/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2BAA2B;AAG3B,4EAA4E;AAE5E,+DAA2D;AAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAE1C,KAAK,UAAU,MAAM,CAC1B,OAAsB,EACtB,OAAmB;IAEnB,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,yBAAyB,CAAC,CAAC;IACnE,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,IAAA,kDAAyB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,yBAAyB,KAAK,GAAG,CAAC,IACvD,OAAO,CAAC,MACV,EAAE,CAAC;QACH,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;QAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wCAAkB,EAC7D,MAAM,EACN,OAAO,CACR,CAAC;QACF,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA/BD,wBA+BC"}
|
|
@@ -9,21 +9,21 @@ const standardize_package_name_1 = require("../../../standardize-package-name");
|
|
|
9
9
|
const debug = debugLib('snyk-fix:python:Poetry');
|
|
10
10
|
async function generateUpgrades(entity) {
|
|
11
11
|
var _a, _b;
|
|
12
|
-
const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
|
|
12
|
+
const { remediation, targetFile } = (0, validate_required_data_1.validateRequiredData)(entity);
|
|
13
13
|
const pins = remediation.pin;
|
|
14
14
|
const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
|
|
15
15
|
const { dir } = pathLib.parse(targetFilePath);
|
|
16
16
|
const pyProjectTomlRaw = await entity.workspace.readFile(pathLib.resolve(dir, 'pyproject.toml'));
|
|
17
17
|
const pyProjectToml = toml.parse(pyProjectTomlRaw);
|
|
18
|
-
const prodTopLevelDeps = Object.keys((_a = pyProjectToml.tool.poetry.dependencies) !== null && _a !== void 0 ? _a : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
|
|
19
|
-
const devTopLevelDeps = Object.keys((_b = pyProjectToml.tool.poetry['dev-dependencies']) !== null && _b !== void 0 ? _b : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
|
|
18
|
+
const prodTopLevelDeps = Object.keys((_a = pyProjectToml.tool.poetry.dependencies) !== null && _a !== void 0 ? _a : {}).map((dep) => (0, standardize_package_name_1.standardizePackageName)(dep));
|
|
19
|
+
const devTopLevelDeps = Object.keys((_b = pyProjectToml.tool.poetry['dev-dependencies']) !== null && _b !== void 0 ? _b : {}).map((dep) => (0, standardize_package_name_1.standardizePackageName)(dep));
|
|
20
20
|
const upgrades = [];
|
|
21
21
|
const devUpgrades = [];
|
|
22
22
|
for (const pkgAtVersion of Object.keys(pins)) {
|
|
23
23
|
const pin = pins[pkgAtVersion];
|
|
24
24
|
const newVersion = pin.upgradeTo.split('@')[1];
|
|
25
25
|
const [pkgName] = pkgAtVersion.split('@');
|
|
26
|
-
const upgrade = `${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`;
|
|
26
|
+
const upgrade = `${(0, standardize_package_name_1.standardizePackageName)(pkgName)}==${newVersion}`;
|
|
27
27
|
if (pin.isTransitive || prodTopLevelDeps.includes(pkgName)) {
|
|
28
28
|
// transitive and it could have come from a dev or prod dep
|
|
29
29
|
// since we can't tell right now let be pinned into production deps
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,6BAA6B;AAE7B,kCAAkC;AAIlC,yEAAoE;AACpE,gFAA2E;AAE3E,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAe1C,KAAK,UAAU,gBAAgB,CACpC,MAAmB;;IAEnB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,6CAAoB,
|
|
1
|
+
{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,6BAA6B;AAE7B,kCAAkC;AAIlC,yEAAoE;AACpE,gFAA2E;AAE3E,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAe1C,KAAK,UAAU,gBAAgB,CACpC,MAAmB;;IAEnB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC;IAE7B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1E,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CACtD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACvC,CAAC;IACF,MAAM,aAAa,GAAkB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAElE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAClC,MAAA,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,mCAAI,EAAE,CAC7C,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,iDAAsB,EAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CACjC,MAAA,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,mCAAI,EAAE,CACpD,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,iDAAsB,EAAC,GAAG,CAAC,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,GAAG,IAAA,iDAAsB,EAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;QAEpE,IAAI,GAAG,CAAC,YAAY,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC1D,2DAA2D;YAC3D,mEAAmE;YACnE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;aAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC7C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;aAAM,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAClE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3B;aAAM;YACL,KAAK,CACH,4CAA4C,OAAO,oFAAoF,CACxI,CAAC;SACH;KACF;IACD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC;AA5CD,4CA4CC"}
|
|
@@ -21,7 +21,7 @@ async function fixAll(entity, options) {
|
|
|
21
21
|
failed: [],
|
|
22
22
|
skipped: [],
|
|
23
23
|
};
|
|
24
|
-
const { upgrades, devUpgrades } = await generate_upgrades_1.generateUpgrades(entity);
|
|
24
|
+
const { upgrades, devUpgrades } = await (0, generate_upgrades_1.generateUpgrades)(entity);
|
|
25
25
|
// TODO: for better support we need to:
|
|
26
26
|
// 1. parse the manifest and extract original requirements, version spec etc
|
|
27
27
|
// 2. swap out only the version and retain original spec
|
|
@@ -33,17 +33,17 @@ async function fixAll(entity, options) {
|
|
|
33
33
|
}
|
|
34
34
|
// update prod dependencies first
|
|
35
35
|
if (upgrades.length) {
|
|
36
|
-
changes.push(...(await poetry_add_1.poetryAdd(entity, options, upgrades)));
|
|
36
|
+
changes.push(...(await (0, poetry_add_1.poetryAdd)(entity, options, upgrades)));
|
|
37
37
|
}
|
|
38
38
|
// update dev dependencies second
|
|
39
39
|
if (devUpgrades.length) {
|
|
40
40
|
const installDev = true;
|
|
41
|
-
changes.push(...(await poetry_add_1.poetryAdd(entity, options, devUpgrades, installDev)));
|
|
41
|
+
changes.push(...(await (0, poetry_add_1.poetryAdd)(entity, options, devUpgrades, installDev)));
|
|
42
42
|
}
|
|
43
43
|
if (!changes.length) {
|
|
44
44
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
45
45
|
}
|
|
46
|
-
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
46
|
+
if (!changes.some((c) => (0, attempted_changes_summary_1.isSuccessfulChange)(c))) {
|
|
47
47
|
handlerResult.failed.push({
|
|
48
48
|
original: entity,
|
|
49
49
|
changes,
|
|
@@ -72,7 +72,7 @@ async function fixSequentially(entity, options) {
|
|
|
72
72
|
failed: [],
|
|
73
73
|
skipped: [],
|
|
74
74
|
};
|
|
75
|
-
const { upgrades, devUpgrades } = await generate_upgrades_1.generateUpgrades(entity);
|
|
75
|
+
const { upgrades, devUpgrades } = await (0, generate_upgrades_1.generateUpgrades)(entity);
|
|
76
76
|
// TODO: for better support we need to:
|
|
77
77
|
// 1. parse the manifest and extract original requirements, version spec etc
|
|
78
78
|
// 2. swap out only the version and retain original spec
|
|
@@ -85,20 +85,20 @@ async function fixSequentially(entity, options) {
|
|
|
85
85
|
// update prod dependencies first
|
|
86
86
|
if (upgrades.length) {
|
|
87
87
|
for (const upgrade of upgrades) {
|
|
88
|
-
changes.push(...(await poetry_add_1.poetryAdd(entity, options, [upgrade])));
|
|
88
|
+
changes.push(...(await (0, poetry_add_1.poetryAdd)(entity, options, [upgrade])));
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
// update dev dependencies second
|
|
92
92
|
if (devUpgrades.length) {
|
|
93
93
|
for (const upgrade of devUpgrades) {
|
|
94
94
|
const installDev = true;
|
|
95
|
-
changes.push(...(await poetry_add_1.poetryAdd(entity, options, [upgrade], installDev)));
|
|
95
|
+
changes.push(...(await (0, poetry_add_1.poetryAdd)(entity, options, [upgrade], installDev)));
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
if (!changes.length) {
|
|
99
99
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
100
100
|
}
|
|
101
|
-
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
101
|
+
if (!changes.some((c) => (0, attempted_changes_summary_1.isSuccessfulChange)(c))) {
|
|
102
102
|
handlerResult.failed.push({
|
|
103
103
|
original: entity,
|
|
104
104
|
changes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAQlC,2DAAuD;AACvD,6CAAyC;AACzC,iFAAwF;AACxF,+EAAqE;AAErE,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAEjD,SAAS,iBAAiB,CAAC,OAAmB;IAC5C,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,gDAMC;AAED,KAAK,UAAU,MAAM,CACnB,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,oCAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ async function poetryAdd(entity, options, upgrades, dev) {
|
|
|
13
13
|
var _a;
|
|
14
14
|
const changes = [];
|
|
15
15
|
let poetryCommand;
|
|
16
|
-
const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
|
|
16
|
+
const { remediation, targetFile } = (0, validate_required_data_1.validateRequiredData)(entity);
|
|
17
17
|
try {
|
|
18
18
|
const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
|
|
19
19
|
const { dir } = pathLib.parse(targetFilePath);
|
|
@@ -28,10 +28,10 @@ async function poetryAdd(entity, options, upgrades, dev) {
|
|
|
28
28
|
throwPoetryError(stderr, stdout, command);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
|
|
31
|
+
changes.push(...(0, attempted_changes_summary_1.generateSuccessfulChanges)(upgrades, remediation.pin));
|
|
32
32
|
}
|
|
33
33
|
catch (error) {
|
|
34
|
-
changes.push(...attempted_changes_summary_1.generateFailedChanges(upgrades, remediation.pin, error, poetryCommand));
|
|
34
|
+
changes.push(...(0, attempted_changes_summary_1.generateFailedChanges)(upgrades, remediation.pin, error, poetryCommand));
|
|
35
35
|
}
|
|
36
36
|
return changes;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poetry-add.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/poetry-add.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,kCAAkC;AAElC,8CAA8C;AAO9C,yEAAoE;AACpE,+EAGyC;AACzC,uGAA2F;AAC3F,iFAAwF;AACxF,MAAM,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAE7C,KAAK,UAAU,SAAS,CAC7B,MAAmB,EACnB,OAAmB,EACnB,QAAkB,EAClB,GAAa;;IAEb,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,aAAa,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,6CAAoB,
|
|
1
|
+
{"version":3,"file":"poetry-add.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/poetry-add.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,kCAAkC;AAElC,8CAA8C;AAO9C,yEAAoE;AACpE,+EAGyC;AACzC,uGAA2F;AAC3F,iFAAwF;AACxF,MAAM,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAE7C,KAAK,UAAU,SAAS,CAC7B,MAAmB,EACnB,OAAmB,EACnB,QAAkB,EAClB,GAAa;;IAEb,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,aAAa,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACjE,IAAI;QACF,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YACtC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,CAAC,SAAS,CACrE,GAAG,EACH,QAAQ,EACR;gBACE,GAAG;gBACH,MAAM,EAAE,MAAA,MAAM,CAAC,OAAO,CAAC,OAAO,mCAAI,SAAS;aAC5C,CACF,CAAC;YACF,KAAK,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YAE7D,IAAI,QAAQ,KAAK,CAAC,EAAE;gBAClB,aAAa,GAAG,OAAO,CAAC;gBACxB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aAC3C;SACF;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAA,qDAAyB,EAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CACV,GAAG,IAAA,iDAAqB,EAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAC1E,CAAC;KACH;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAnCD,8BAmCC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,MAAc,EAAE,OAAgB;IACxE,MAAM,kBAAkB,GAAG,sCAAsC,CAAC;IAClE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,4CAA4C,EAC5C,IAAI,CACL,CAAC;IACF,MAAM,cAAc,GAAG,kDAAkD,CAAC;IAE1E,MAAM,uBAAuB,GAC3B,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClE,IAAI,uBAAuB,EAAE;QAC3B,MAAM,IAAI,gDAAkB,CAC1B,4CAA4C,uBAAuB,CAAC,CAAC,CAAC,uDAAuD,EAC7H,OAAO,CACR,CAAC;KACH;IACD,MAAM,kBAAkB,GACtB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,kBAAkB,EAAE;QACtB,MAAM,IAAI,gDAAkB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;KACrE;IAED,IACE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QACnC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EACnC;QACA,MAAM,IAAI,gDAAkB,CAC1B,yLAAyL,EACzL,OAAO,CACR,CAAC;KACH;IACD,MAAM,IAAI,6CAA0B,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -22,7 +22,7 @@ async function pythonFix(entities, options) {
|
|
|
22
22
|
},
|
|
23
23
|
};
|
|
24
24
|
const results = handlerResult.python;
|
|
25
|
-
const { entitiesPerType, skipped: notSupported } = map_entities_per_handler_type_1.mapEntitiesPerHandlerType(entities);
|
|
25
|
+
const { entitiesPerType, skipped: notSupported } = (0, map_entities_per_handler_type_1.mapEntitiesPerHandlerType)(entities);
|
|
26
26
|
results.skipped.push(...notSupported);
|
|
27
27
|
spinner.stopAndPersist({
|
|
28
28
|
text: spinnerMessage,
|
|
@@ -38,10 +38,10 @@ async function pythonFix(entities, options) {
|
|
|
38
38
|
spinner.text = processingMessage;
|
|
39
39
|
spinner.render();
|
|
40
40
|
try {
|
|
41
|
-
const handler = load_handler_1.loadHandler(projectType);
|
|
41
|
+
const handler = (0, load_handler_1.loadHandler)(projectType);
|
|
42
42
|
// drop unsupported Python entities early so only potentially fixable items get
|
|
43
43
|
// attempted to be fixed
|
|
44
|
-
const { fixable, skipped: notFixable } = await is_supported_1.partitionByFixable(projectsToFix);
|
|
44
|
+
const { fixable, skipped: notFixable } = await (0, is_supported_1.partitionByFixable)(projectsToFix);
|
|
45
45
|
results.skipped.push(...notFixable);
|
|
46
46
|
const { failed, skipped, succeeded } = await handler(fixable, options);
|
|
47
47
|
results.failed.push(...failed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,8BAA8B;AAC9B,2BAA2B;AAC3B,+BAA+B;AAI/B,iDAA6C;AAE7C,mFAA4E;AAC5E,0DAA6D;AAG7D,MAAM,KAAK,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAEnC,KAAK,UAAU,SAAS,CAC7B,QAAuB,EACvB,OAAmB;IAEnB,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,oCAAoC,CAAC;IAC5D,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;IAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;IAEhB,MAAM,aAAa,GAA6B;QAC9C,MAAM,EAAE;YACN,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;SACZ;KACF,CAAC;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC;IACrC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yDAAyB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ function mapEntitiesPerHandlerType(entities) {
|
|
|
13
13
|
};
|
|
14
14
|
const skipped = [];
|
|
15
15
|
for (const entity of entities) {
|
|
16
|
-
const type = get_handler_type_1.getHandlerType(entity);
|
|
16
|
+
const type = (0, get_handler_type_1.getHandlerType)(entity);
|
|
17
17
|
if (type) {
|
|
18
18
|
entitiesPerType[type].push(entity);
|
|
19
19
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-entities-per-handler-type.js","sourceRoot":"","sources":["../../../src/plugins/python/map-entities-per-handler-type.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAGlC,yDAAoD;AACpD,uEAAoE;AAEpE,MAAM,KAAK,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAE1C,SAAgB,yBAAyB,CACvC,QAAuB;IAOvB,MAAM,eAAe,GAEjB;QACF,CAAC,iDAAuB,CAAC,YAAY,CAAC,EAAE,EAAE;QAC1C,CAAC,iDAAuB,CAAC,OAAO,CAAC,EAAE,EAAE;QACrC,CAAC,iDAAuB,CAAC,MAAM,CAAC,EAAE,EAAE;KACrC,CAAC;IAEF,MAAM,OAAO,GAAwC,EAAE,CAAC;IAExD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,MAAM,IAAI,GAAG,iCAAc,
|
|
1
|
+
{"version":3,"file":"map-entities-per-handler-type.js","sourceRoot":"","sources":["../../../src/plugins/python/map-entities-per-handler-type.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAGlC,yDAAoD;AACpD,uEAAoE;AAEpE,MAAM,KAAK,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAE1C,SAAgB,yBAAyB,CACvC,QAAuB;IAOvB,MAAM,eAAe,GAEjB;QACF,CAAC,iDAAuB,CAAC,YAAY,CAAC,EAAE,EAAE;QAC1C,CAAC,iDAAuB,CAAC,OAAO,CAAC,EAAE,EAAE;QACrC,CAAC,iDAAuB,CAAC,MAAM,CAAC,EAAE,EAAE;KACrC,CAAC;IAEF,MAAM,OAAO,GAAwC,EAAE,CAAC;IAExD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,MAAM,IAAI,GAAG,IAAA,iCAAc,EAAC,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,EAAE;YACR,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnC,SAAS;SACV;QACD,MAAM,WAAW,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,mBAAmB,CAAC;QAChF,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;KACjD;IAED,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC;AACtC,CAAC;AA9BD,8DA8BC"}
|
package/dist/plugins/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EntityToFix, FixOptions, WithError, WithAttemptedFixChanges, WithUserMessage } from '../types';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type FixHandler = (entities: EntityToFix[], options: FixOptions) => Promise<FixHandlerResultByPlugin>;
|
|
3
|
+
export type FailedToFix = WithAttemptedFixChanges<EntityToFix> | WithError<EntityToFix>;
|
|
4
4
|
export declare function isWithError(r: FailedToFix): r is WithError<EntityToFix>;
|
|
5
5
|
export interface PluginFixResponse {
|
|
6
6
|
succeeded: Array<WithAttemptedFixChanges<EntityToFix>>;
|
package/dist/types.d.ts
CHANGED
|
@@ -129,7 +129,7 @@ export declare enum SEVERITY {
|
|
|
129
129
|
HIGH = "high",
|
|
130
130
|
CRITICAL = "critical"
|
|
131
131
|
}
|
|
132
|
-
export
|
|
132
|
+
export type SupportedScanTypes = 'pip';
|
|
133
133
|
export interface Workspace {
|
|
134
134
|
path: string;
|
|
135
135
|
readFile: (path: string) => Promise<string>;
|
|
@@ -148,7 +148,7 @@ export interface PythonTestOptions extends BaseTestOptions {
|
|
|
148
148
|
command?: string;
|
|
149
149
|
dev?: boolean;
|
|
150
150
|
}
|
|
151
|
-
export
|
|
151
|
+
export type CliTestOptions = PythonTestOptions;
|
|
152
152
|
export interface WithError<Original> {
|
|
153
153
|
original: Original;
|
|
154
154
|
error: CustomError;
|
|
@@ -162,7 +162,7 @@ export interface WithUserMessage<Original> {
|
|
|
162
162
|
original: Original;
|
|
163
163
|
userMessage: string;
|
|
164
164
|
}
|
|
165
|
-
export
|
|
165
|
+
export type FixChangesSummary = FixChangesSuccess | FixChangesError;
|
|
166
166
|
export interface FixChangesSuccess {
|
|
167
167
|
success: true;
|
|
168
168
|
userMessage: string;
|