@snyk/fix 1.722.0 → 1.726.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/lib/output-formatters/format-failed-item.d.ts +2 -0
- package/dist/lib/output-formatters/format-failed-item.js +15 -0
- package/dist/lib/output-formatters/format-failed-item.js.map +1 -0
- package/dist/lib/output-formatters/{format-successful-item.d.ts → format-with-changes-item.d.ts} +0 -0
- package/dist/lib/output-formatters/{format-successful-item.js → format-with-changes-item.js} +1 -1
- package/dist/lib/output-formatters/format-with-changes-item.js.map +1 -0
- package/dist/lib/output-formatters/show-results-summary.js +4 -8
- package/dist/lib/output-formatters/show-results-summary.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js +31 -11
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/update-dependencies/index.js +31 -11
- package/dist/plugins/python/handlers/poetry/update-dependencies/index.js.map +1 -1
- package/dist/plugins/python/index.js +9 -2
- package/dist/plugins/python/index.js.map +1 -1
- package/dist/plugins/types.d.ts +5 -3
- package/dist/plugins/types.js +5 -0
- package/dist/plugins/types.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/package.json +3 -3
- package/dist/lib/output-formatters/format-successful-item.js.map +0 -1
- package/dist/plugins/python/handlers/fail-if-no-updates-applied.d.ts +0 -2
- package/dist/plugins/python/handlers/fail-if-no-updates-applied.js +0 -21
- package/dist/plugins/python/handlers/fail-if-no-updates-applied.js.map +0 -1
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatFailed = void 0;
|
|
4
|
+
const types_1 = require("../../plugins/types");
|
|
5
|
+
const error_to_user_message_1 = require("../errors/error-to-user-message");
|
|
6
|
+
const format_with_changes_item_1 = require("./format-with-changes-item");
|
|
7
|
+
const format_unresolved_item_1 = require("./format-unresolved-item");
|
|
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);
|
|
11
|
+
}
|
|
12
|
+
return format_with_changes_item_1.formatChangesSummary(failed.original, failed.changes);
|
|
13
|
+
}
|
|
14
|
+
exports.formatFailed = formatFailed;
|
|
15
|
+
//# sourceMappingURL=format-failed-item.js.map
|
|
@@ -0,0 +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,CAAC,MAAM,CAAC,EAAE;QACvB,OAAO,yCAAgB,CACrB,MAAM,CAAC,QAAQ,EACf,iDAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,EACvC,MAAM,CAAC,GAAG,CACX,CAAC;KACH;IACD,OAAO,+CAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC;AATD,oCASC"}
|
package/dist/lib/output-formatters/{format-successful-item.d.ts → format-with-changes-item.d.ts}
RENAMED
|
File without changes
|
|
@@ -0,0 +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,CACzC,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"}
|
|
@@ -4,11 +4,11 @@ exports.getTestResults = exports.generateIssueSummary = exports.getSeveritiesCol
|
|
|
4
4
|
const chalk = require("chalk");
|
|
5
5
|
const stripAnsi = require("strip-ansi");
|
|
6
6
|
const common_1 = require("../errors/common");
|
|
7
|
-
const error_to_user_message_1 = require("../errors/error-to-user-message");
|
|
8
7
|
const fixable_issues_1 = require("../issues/fixable-issues");
|
|
9
8
|
const issues_by_severity_1 = require("../issues/issues-by-severity");
|
|
10
9
|
const total_issues_count_1 = require("../issues/total-issues-count");
|
|
11
|
-
const
|
|
10
|
+
const format_failed_item_1 = require("./format-failed-item");
|
|
11
|
+
const format_with_changes_item_1 = require("./format-with-changes-item");
|
|
12
12
|
const format_unresolved_item_1 = require("./format-unresolved-item");
|
|
13
13
|
exports.PADDING_SPACE = ' '; // 2 spaces
|
|
14
14
|
async function showResultsSummary(nothingToFix, resultsByPlugin, exceptions, options, total) {
|
|
@@ -40,7 +40,7 @@ function generateSuccessfulFixesSummary(resultsByPlugin) {
|
|
|
40
40
|
summary +=
|
|
41
41
|
'\n\n' +
|
|
42
42
|
fixedSuccessfully
|
|
43
|
-
.map((s) =>
|
|
43
|
+
.map((s) => format_with_changes_item_1.formatChangesSummary(s.original, s.changes))
|
|
44
44
|
.join('\n\n');
|
|
45
45
|
}
|
|
46
46
|
}
|
|
@@ -68,11 +68,7 @@ function generateUnresolvedSummary(resultsByPlugin, exceptionsByScanType) {
|
|
|
68
68
|
const failed = resultsByPlugin[plugin].failed;
|
|
69
69
|
if (failed.length > 0) {
|
|
70
70
|
count += failed.length;
|
|
71
|
-
summary +=
|
|
72
|
-
'\n\n' +
|
|
73
|
-
failed
|
|
74
|
-
.map((s) => format_unresolved_item_1.formatUnresolved(s.original, error_to_user_message_1.convertErrorToUserMessage(s.error), s.tip))
|
|
75
|
-
.join('\n\n');
|
|
71
|
+
summary += '\n\n' + failed.map((s) => format_failed_item_1.formatFailed(s)).join('\n\n');
|
|
76
72
|
}
|
|
77
73
|
}
|
|
78
74
|
if (Object.keys(exceptionsByScanType).length) {
|
|
@@ -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,
|
|
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,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;yBACvD,IAAI,CAAC,MAAM,CAAC,CAAC;SACnB;KACF;IACD,IAAI,OAAO,EAAE;QACX,OAAO,oBAAoB,GAAG,OAAO,CAAC;KACvC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAC/C,CAAC;AArBD,wEAqBC;AAED,SAAgB,yBAAyB,CACvC,eAAyC,EACzC,oBAAuC;IAEvC,MAAM,KAAK,GAAG,mBAAmB,CAAC;IAClC,MAAM,cAAc,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC9C,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QAChD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;YACxB,OAAO;gBACL,MAAM;oBACN,OAAO;yBACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yCAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;yBACvD,IAAI,CAAC,MAAM,CAAC,CAAC;SACnB;QACD,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC9C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC;YACvB,OAAO,IAAI,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrE;KACF;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE;QAC5C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;YACzD,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACnD,KAAK,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC;YACrC,OAAO;gBACL,MAAM;oBACN,UAAU,CAAC,SAAS;yBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yCAAgB,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;yBACvD,IAAI,CAAC,MAAM,CAAC,CAAC;SACnB;KACF;IACD,IAAI,OAAO,EAAE;QACX,OAAO,EAAE,OAAO,EAAE,OAAO,cAAc,GAAG,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC;KAC9D;IACD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;AACnC,CAAC;AAzCD,8DAyCC;AAED,SAAgB,sBAAsB,CACpC,eAAyC,EACzC,UAA6B,EAC7B,YAA2B,EAC3B,OAAmB;IAEnB,MAAM,YAAY,GAAG,UAAU,CAAC;IAChC,MAAM,oBAAoB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3D,MAAM,KAAK,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM;QAC/B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAClB,GAAG,qBAAa,kBAAkB,KAAK,CAAC,IAAI,CAC1C,SAAS,CACV,iCAAiC,CACnC;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,eAAe,GACnB,MAAM,GAAG,CAAC;QACR,CAAC,CAAC,GAAG,qBAAa,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yBAAyB;QACpE,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,YAAY,GAChB,KAAK,GAAG,CAAC;QACP,CAAC,CAAC,GAAG,qBAAa,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CACjC,KAAK,CACN,kCAAkC;QACrC,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,YAAY,GAAG,oBAAoB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAEvE,MAAM,oBAAoB,GACxB,YAAY,CAAC,MAAM,GAAG,CAAC;QACrB,CAAC,CAAC,GAAG,qBAAa,GAAG,YAAY,CAAC,MAAM,8BAA8B;QACtE,CAAC,CAAC,EAAE,CAAC;IAET,OAAO;QACL,OAAO,EAAE,GAAG,oBAAoB,OAAO,UAAU,GAAG,eAAe,GAAG,YAAY,GAAG,oBAAoB,GAAG,YAAY,EAAE;QAC1H,KAAK,EAAE,KAAK,GAAG,MAAM;KACtB,CAAC;AACJ,CAAC;AAvCD,wDAuCC;AAED,SAAgB,cAAc,CAC5B,eAAyC;IAEzC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,KAAK,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;KACnD;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AARD,wCAQC;AAED,SAAgB,oBAAoB,CAClC,eAAyC;IAEzC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,KAAK,MAAM,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE;YACtD,8CAA8C;YAC9C,oDAAoD;YACpD,4CAA4C;YAC5C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;YACzC,MAAM,CAAC,OAAO;iBACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACxB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACb,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACL,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;SACjD;KACF;IAED,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B,CAAC;AApBD,oDAoBC;AAED,SAAgB,eAAe,CAC7B,eAAyC,EACzC,UAA6B;IAE7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;KAC1D;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QAClC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAC/C,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC;SACvC;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,0CAiBC;AAED,SAAgB,0BAA0B,CAAC,EACzC,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,GAAG,GAGJ;IACC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,QAAQ,IAAI,QAAQ,GAAG,CAAC,EAAE;QAC5B,OAAO,CAAC,IAAI,CACV,+BAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,WAAW,CAAC,CACnE,CAAC;KACH;IACD,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,+BAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC;KACtE;IACD,IAAI,MAAM,IAAI,MAAM,GAAG,CAAC,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,+BAAuB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,SAAS,CAAC,CAAC,CAAC;KAC5E;IACD,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,IAAI,CAAC,+BAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC;KACnE;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAzBD,gEAyBC;AAEY,QAAA,uBAAuB,GAIhC;IACF,GAAG,EAAE;QACH,SAAS,CAAC,IAAI;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF;IACD,MAAM,EAAE;QACN,SAAS,CAAC,IAAI;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF;IACD,IAAI,EAAE;QACJ,SAAS,CAAC,IAAI;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF;IACD,QAAQ,EAAE;QACR,SAAS,CAAC,IAAI;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF;CACF,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,SAAS,CAAC,IAAI;QACZ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF,CAAC;AAEF,SAAgB,mBAAmB,CAAC,QAAgB;;IAClD,aAAO,+BAAuB,CAAC,QAAQ,CAAC,mCAAI,4BAAoB,CAAC;AACnE,CAAC;AAFD,kDAEC;AAED,SAAgB,oBAAoB,CAClC,eAAyC,EACzC,UAA6B;IAE7B,MAAM,WAAW,GAAiB,cAAc,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAE9E,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,4CAAuB,CAAC,SAAS,CAAC,CAAC;IAEtD,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;QACzD,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;QACpC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;QAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM;QAChC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,wEAAwE;IACxE,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;KAC/B;IAED,MAAM,eAAe,GAAG,uCAAkB,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,WAAW,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;QACxD,IAAI,uBAAuB,EAAE;YAC3B,WAAW,GAAG,GAAG,KAAK,CAAC,IAAI,CACzB,eAAe,CAChB,YAAY,uBAAuB,IAAI,CAAC;SAC1C;KACF;IAED,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,iCAAgB,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,aAAa,GACjB,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7E,MAAM,eAAe,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAC9D,MAAM,kBAAkB,GACtB,eAAe,GAAG,CAAC;QACjB,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,mCAAmC;QACnE,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,KAAK,qBAAa,GAAG,WAAW,GAAG,qBAAa,GAAG,aAAa,GAAG,qBAAa,GAAG,kBAAkB,EAAE,CAAC;AACjH,CAAC;AA5CD,oDA4CC;AAED,SAAgB,cAAc,CAC5B,eAAyC,EACzC,oBAAuC;IAEvC,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACjD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/D,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/D,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9D,WAAW,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;KAClE;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE;QAC5C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;YACzD,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACnD,WAAW,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;SACpE;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAnBD,wCAmBC"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateDependencies = void 0;
|
|
4
4
|
const debugLib = require("debug");
|
|
5
|
-
const fail_if_no_updates_applied_1 = require("../../fail-if-no-updates-applied");
|
|
6
5
|
const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
|
|
7
6
|
const generate_upgrades_1 = require("./generate-upgrades");
|
|
8
7
|
const pipenv_add_1 = require("./pipenv-add");
|
|
8
|
+
const attempted_changes_summary_1 = require("../../attempted-changes-summary");
|
|
9
9
|
const debug = debugLib('snyk-fix:python:Pipfile');
|
|
10
10
|
function chooseFixStrategy(options) {
|
|
11
11
|
return options.sequentialFix ? fixSequentially : fixAll;
|
|
@@ -36,11 +36,21 @@ async function fixAll(entity, options) {
|
|
|
36
36
|
if (upgrades.length) {
|
|
37
37
|
changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, upgrades)));
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
39
|
+
if (!changes.length) {
|
|
40
|
+
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
41
|
+
}
|
|
42
|
+
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
43
|
+
handlerResult.failed.push({
|
|
44
|
+
original: entity,
|
|
45
|
+
changes,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
handlerResult.succeeded.push({
|
|
50
|
+
original: entity,
|
|
51
|
+
changes,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
44
54
|
}
|
|
45
55
|
catch (error) {
|
|
46
56
|
debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
|
|
@@ -76,11 +86,21 @@ async function fixSequentially(entity, options) {
|
|
|
76
86
|
changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, [upgrade])));
|
|
77
87
|
}
|
|
78
88
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
89
|
+
if (!changes.length) {
|
|
90
|
+
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
91
|
+
}
|
|
92
|
+
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
93
|
+
handlerResult.failed.push({
|
|
94
|
+
original: entity,
|
|
95
|
+
changes,
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
handlerResult.succeeded.push({
|
|
100
|
+
original: entity,
|
|
101
|
+
changes,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
84
104
|
}
|
|
85
105
|
catch (error) {
|
|
86
106
|
debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const debugLib = require("debug");
|
|
|
5
5
|
const generate_upgrades_1 = require("./generate-upgrades");
|
|
6
6
|
const poetry_add_1 = require("./poetry-add");
|
|
7
7
|
const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
|
|
8
|
-
const
|
|
8
|
+
const attempted_changes_summary_1 = require("../../attempted-changes-summary");
|
|
9
9
|
const debug = debugLib('snyk-fix:python:Poetry');
|
|
10
10
|
function chooseFixStrategy(options) {
|
|
11
11
|
return options.sequentialFix ? fixSequentially : fixAll;
|
|
@@ -40,11 +40,21 @@ async function fixAll(entity, options) {
|
|
|
40
40
|
const installDev = true;
|
|
41
41
|
changes.push(...(await poetry_add_1.poetryAdd(entity, options, devUpgrades, installDev)));
|
|
42
42
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
if (!changes.length) {
|
|
44
|
+
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
45
|
+
}
|
|
46
|
+
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
47
|
+
handlerResult.failed.push({
|
|
48
|
+
original: entity,
|
|
49
|
+
changes,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
handlerResult.succeeded.push({
|
|
54
|
+
original: entity,
|
|
55
|
+
changes,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
48
58
|
}
|
|
49
59
|
catch (error) {
|
|
50
60
|
debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
|
|
@@ -85,11 +95,21 @@ async function fixSequentially(entity, options) {
|
|
|
85
95
|
changes.push(...(await poetry_add_1.poetryAdd(entity, options, [upgrade], installDev)));
|
|
86
96
|
}
|
|
87
97
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
98
|
+
if (!changes.length) {
|
|
99
|
+
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
100
|
+
}
|
|
101
|
+
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
102
|
+
handlerResult.failed.push({
|
|
103
|
+
original: entity,
|
|
104
|
+
changes,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
handlerResult.succeeded.push({
|
|
109
|
+
original: entity,
|
|
110
|
+
changes,
|
|
111
|
+
});
|
|
112
|
+
}
|
|
93
113
|
}
|
|
94
114
|
catch (error) {
|
|
95
115
|
debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
|
|
@@ -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
|
|
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,CAAC,MAAM,CAAC,CAAC;IAEjE,uCAAuC;IACvC,4EAA4E;IAC5E,wDAAwD;IACxD,0BAA0B;IAC1B,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,MAAM,EAAE;YACzC,MAAM,IAAI,6CAA0B,CAClC,8CAA8C,CAC/C,CAAC;SACH;QACD,iCAAiC;QACjC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC/D;QAED,iCAAiC;QACjC,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAC/D,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,MAAM,IAAI,6CAA0B,EAAE,CAAC;SACxC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8CAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/C,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;gBACxB,QAAQ,EAAE,MAAM;gBAChB,OAAO;aACR,CAAC,CAAC;SACJ;aAAM;YACL,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC3B,QAAQ,EAAE,MAAM;gBAChB,OAAO;aACR,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,iBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,aAAa,KAAK,EAAE,CAC3E,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,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,CAAC,MAAM,CAAC,CAAC;IACjE,uCAAuC;IACvC,4EAA4E;IAC5E,wDAAwD;IACxD,0BAA0B;IAC1B,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,MAAM,EAAE;YACzC,MAAM,IAAI,6CAA0B,CAClC,8CAA8C,CAC/C,CAAC;SACH;QACD,iCAAiC;QACjC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;aAChE;SACF;QAED,iCAAiC;QACjC,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;gBACjC,MAAM,UAAU,GAAG,IAAI,CAAC;gBACxB,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC,CAC7D,CAAC;aACH;SACF;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,MAAM,IAAI,6CAA0B,EAAE,CAAC;SACxC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8CAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/C,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;gBACxB,QAAQ,EAAE,MAAM;gBAChB,OAAO;aACR,CAAC,CAAC;SACJ;aAAM;YACL,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC3B,QAAQ,EAAE,MAAM;gBAChB,OAAO;aACR,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,iBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,aAAa,KAAK,EAAE,CAC3E,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -4,9 +4,9 @@ exports.pythonFix = void 0;
|
|
|
4
4
|
const debugLib = require("debug");
|
|
5
5
|
const pMap = require("p-map");
|
|
6
6
|
const ora = require("ora");
|
|
7
|
+
const chalk = require("chalk");
|
|
7
8
|
const load_handler_1 = require("./load-handler");
|
|
8
9
|
const map_entities_per_handler_type_1 = require("./map-entities-per-handler-type");
|
|
9
|
-
const chalk = require("chalk");
|
|
10
10
|
const is_supported_1 = require("./handlers/is-supported");
|
|
11
11
|
const debug = debugLib('snyk-fix:python');
|
|
12
12
|
async function pythonFix(entities, options) {
|
|
@@ -50,7 +50,7 @@ async function pythonFix(entities, options) {
|
|
|
50
50
|
}
|
|
51
51
|
catch (e) {
|
|
52
52
|
debug(`Failed to fix ${projectsToFix.length} ${projectType} projects.\nError: ${e.message}`);
|
|
53
|
-
results.failed.push(...projectsToFix
|
|
53
|
+
results.failed.push(...generateFailed(projectsToFix, e));
|
|
54
54
|
}
|
|
55
55
|
spinner.stopAndPersist({
|
|
56
56
|
text: processedMessage,
|
|
@@ -62,4 +62,11 @@ async function pythonFix(entities, options) {
|
|
|
62
62
|
return handlerResult;
|
|
63
63
|
}
|
|
64
64
|
exports.pythonFix = pythonFix;
|
|
65
|
+
function generateFailed(projectsToFix, error) {
|
|
66
|
+
const failed = [];
|
|
67
|
+
for (const project of projectsToFix) {
|
|
68
|
+
failed.push({ original: project, error: error });
|
|
69
|
+
}
|
|
70
|
+
return failed;
|
|
71
|
+
}
|
|
65
72
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,8BAA8B;AAC9B,2BAA2B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/python/index.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/types.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { EntityToFix, FixOptions, WithError,
|
|
1
|
+
import { EntityToFix, FixOptions, WithError, WithAttemptedFixChanges, WithUserMessage } from '../types';
|
|
2
2
|
export declare type FixHandler = (entities: EntityToFix[], options: FixOptions) => Promise<FixHandlerResultByPlugin>;
|
|
3
|
+
export declare type FailedToFix = WithAttemptedFixChanges<EntityToFix> | WithError<EntityToFix>;
|
|
4
|
+
export declare function isWithError(r: FailedToFix): r is WithError<EntityToFix>;
|
|
3
5
|
export interface PluginFixResponse {
|
|
4
|
-
succeeded: Array<
|
|
5
|
-
failed:
|
|
6
|
+
succeeded: Array<WithAttemptedFixChanges<EntityToFix>>;
|
|
7
|
+
failed: FailedToFix[];
|
|
6
8
|
skipped: Array<WithUserMessage<EntityToFix>>;
|
|
7
9
|
}
|
|
8
10
|
export interface FixHandlerResultByPlugin {
|
package/dist/plugins/types.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":";;;AAiBA,SAAgB,WAAW,CAAC,CAAc;IACxC,OAAO,OAAO,IAAI,CAAC,CAAC;AACtB,CAAC;AAFD,kCAEC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -155,7 +155,7 @@ export interface WithError<Original> {
|
|
|
155
155
|
error: CustomError;
|
|
156
156
|
tip?: string;
|
|
157
157
|
}
|
|
158
|
-
export interface
|
|
158
|
+
export interface WithAttemptedFixChanges<Original> {
|
|
159
159
|
original: Original;
|
|
160
160
|
changes: FixChangesSummary[];
|
|
161
161
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@snyk/fix",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.726.0",
|
|
4
4
|
"description": "Snyk fix library and utility",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@snyk/dep-graph": "^1.21.0",
|
|
40
40
|
"@snyk/fix-pipenv-pipfile": "0.5.4",
|
|
41
|
-
"@snyk/fix-poetry": "0.
|
|
41
|
+
"@snyk/fix-poetry": "0.8.0",
|
|
42
42
|
"chalk": "4.1.1",
|
|
43
43
|
"debug": "^4.3.1",
|
|
44
44
|
"lodash.groupby": "4.6.0",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"registry": "https://registry.npmjs.org/",
|
|
57
57
|
"access": "public"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "5a208329cac0713c5038901fbc45864173bc5955"
|
|
60
60
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"format-successful-item.js","sourceRoot":"","sources":["../../../src/lib/output-formatters/format-successful-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,CACzC,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"}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.failIfNoUpdatesApplied = void 0;
|
|
4
|
-
const debugLib = require("debug");
|
|
5
|
-
const no_fixes_applied_1 = require("../../../lib/errors/no-fixes-applied");
|
|
6
|
-
const attempted_changes_summary_1 = require("./attempted-changes-summary");
|
|
7
|
-
const debug = debugLib('snyk-fix:python:ensure-changes-applied');
|
|
8
|
-
function failIfNoUpdatesApplied(changes) {
|
|
9
|
-
if (!changes.length) {
|
|
10
|
-
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
11
|
-
}
|
|
12
|
-
if (!changes.some((c) => attempted_changes_summary_1.isSuccessfulChange(c))) {
|
|
13
|
-
debug('Manifest has not changed as no changes got applied!');
|
|
14
|
-
// throw the first error tip since 100% failed, they all failed with the same
|
|
15
|
-
// error
|
|
16
|
-
const { reason, tip } = changes[0];
|
|
17
|
-
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError(reason, tip);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
exports.failIfNoUpdatesApplied = failIfNoUpdatesApplied;
|
|
21
|
-
//# sourceMappingURL=fail-if-no-updates-applied.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"fail-if-no-updates-applied.js","sourceRoot":"","sources":["../../../../src/plugins/python/handlers/fail-if-no-updates-applied.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAElC,2EAAkF;AAElF,2EAAiE;AAEjE,MAAM,KAAK,GAAG,QAAQ,CAAC,wCAAwC,CAAC,CAAC;AAEjE,SAAgB,sBAAsB,CAAC,OAA4B;IACjE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,IAAI,6CAA0B,EAAE,CAAC;KACxC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8CAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC/C,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC7D,6EAA6E;QAC7E,QAAQ;QACR,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;QACtD,MAAM,IAAI,6CAA0B,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnD;AACH,CAAC;AAXD,wDAWC"}
|