@snyk/fix 1.719.0 → 1.723.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/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.js +11 -8
- package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/pipenv-add.js.map +1 -1
- package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js +12 -8
- package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -17,6 +17,7 @@ async function fix(entities, options = {
|
|
|
17
17
|
quiet: false,
|
|
18
18
|
stripAnsi: false,
|
|
19
19
|
}) {
|
|
20
|
+
debug('Running snyk fix with options:', options);
|
|
20
21
|
const spinner = ora({ isSilent: options.quiet, stream: process.stdout });
|
|
21
22
|
let resultsByPlugin = {};
|
|
22
23
|
const { vulnerable, notVulnerable: nothingToFix, } = await partition_by_vulnerable_1.partitionByVulnerable(entities);
|
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,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,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAsB,EAAE,CAAC;IACzC,MAAM,IAAI,CACR,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAC5B,KAAK,EAAE,QAAQ,EAAE,EAAE;QACjB,IAAI;YACF,MAAM,SAAS,GAAG,wBAAU,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;YACpE,eAAe,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACV,KAAK,CAAC,uBAAuB,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,QAAQ,CAAC,GAAG;gBACrB,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC;gBACpC,WAAW,EAAE,iDAAyB,CAAC,CAAC,CAAC;aAC1C,CAAC;SACH;IACH,CAAC,EACD;QACE,WAAW,EAAE,CAAC;KACf,CACF,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,kBAAkB,CACzD,YAAY,EACZ,eAAe,EACf,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,MAAM,CAChB,CAAC;IACF,MAAM,IAAI,GAAG,WAAW,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAEtD,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,cAAc,CAAC;YACrB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;SACzB,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAED,OAAO;QACL,OAAO,EAAE,eAAe;QACxB,UAAU;QACV,UAAU;QACV,IAAI;KACL,CAAC;AACJ,CAAC;
|
|
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,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAsB,EAAE,CAAC;IACzC,MAAM,IAAI,CACR,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAC5B,KAAK,EAAE,QAAQ,EAAE,EAAE;QACjB,IAAI;YACF,MAAM,SAAS,GAAG,wBAAU,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;YACpE,eAAe,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACV,KAAK,CAAC,uBAAuB,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,QAAQ,CAAC,GAAG;gBACrB,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC;gBACpC,WAAW,EAAE,iDAAyB,CAAC,CAAC,CAAC;aAC1C,CAAC;SACH;IACH,CAAC,EACD;QACE,WAAW,EAAE,CAAC;KACf,CACF,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,kBAAkB,CACzD,YAAY,EACZ,eAAe,EACf,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,MAAM,CAChB,CAAC;IACF,MAAM,IAAI,GAAG,WAAW,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAEtD,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,cAAc,CAAC;YACrB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;SACzB,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAED,OAAO;QACL,OAAO,EAAE,eAAe;QACxB,UAAU;QACV,UAAU;QACV,IAAI;KACL,CAAC;AACJ,CAAC;AApED,kBAoEC;AAED,SAAgB,wBAAwB,CACtC,QAAuB;;IAIvB,MAAM,eAAe,GAEjB,EAAE,CAAC;IACP,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,uBAAuB;QACvB,MAAM,IAAI,qBAAG,MAAM,CAAC,UAAU,0CAAE,QAAQ,0CAAE,IAAI,mCAAI,cAAc,CAAC;QACjE,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;YACzB,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnC,SAAS;SACV;QACD,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;KAClC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAlBD,4DAkBC;AAED,SAAgB,WAAW,CACzB,eAAyC,EACzC,UAA6B;IAE7B,MAAM,WAAW,GAAiB,eAAe,CAAC,cAAc,CAC9D,eAAe,EACf,UAAU,CACX,CAAC;IACF,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAEvD,MAAM,MAAM,GAAG,eAAe,CAAC,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,uCAAkB,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,iCAAgB,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAE9E,OAAO;QACL,KAAK;QACL,MAAM;QACN,WAAW,EAAE,eAAe;QAC5B,aAAa,EAAE,YAAY;QAC3B,WAAW,EAAE,eAAe;KAC7B,CAAC;AACJ,CAAC;AAvBD,kCAuBC"}
|
|
@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pipenvAdd = void 0;
|
|
4
4
|
const pathLib = require("path");
|
|
5
5
|
const pipenvPipfileFix = require("@snyk/fix-pipenv-pipfile");
|
|
6
|
+
const debugLib = require("debug");
|
|
6
7
|
const validate_required_data_1 = require("../../validate-required-data");
|
|
7
8
|
const attempted_changes_summary_1 = require("../../attempted-changes-summary");
|
|
8
9
|
const command_failed_to_run_error_1 = require("../../../../../lib/errors/command-failed-to-run-error");
|
|
9
10
|
const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
|
|
11
|
+
const debug = debugLib('snyk-fix:python:pipenvAdd');
|
|
10
12
|
async function pipenvAdd(entity, options, upgrades) {
|
|
11
13
|
const changes = [];
|
|
12
14
|
let pipenvCommand;
|
|
@@ -15,12 +17,13 @@ async function pipenvAdd(entity, options, upgrades) {
|
|
|
15
17
|
const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
|
|
16
18
|
const { dir } = pathLib.parse(targetFilePath);
|
|
17
19
|
if (!options.dryRun && upgrades.length) {
|
|
18
|
-
const
|
|
20
|
+
const { stderr, stdout, command, exitCode, } = await pipenvPipfileFix.pipenvInstall(dir, upgrades, {
|
|
19
21
|
python: entity.options.command,
|
|
20
22
|
});
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
23
|
+
debug('`pipenv add` returned:', { stderr, stdout, command });
|
|
24
|
+
if (exitCode !== 0) {
|
|
25
|
+
pipenvCommand = command;
|
|
26
|
+
throwPipenvError(stderr, stdout, command);
|
|
24
27
|
}
|
|
25
28
|
}
|
|
26
29
|
changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
|
|
@@ -31,19 +34,19 @@ async function pipenvAdd(entity, options, upgrades) {
|
|
|
31
34
|
return changes;
|
|
32
35
|
}
|
|
33
36
|
exports.pipenvAdd = pipenvAdd;
|
|
34
|
-
function throwPipenvError(stderr, command) {
|
|
35
|
-
const errorStr = stderr.toLowerCase();
|
|
37
|
+
function throwPipenvError(stderr, stdout, command) {
|
|
36
38
|
const incompatibleDeps = 'There are incompatible versions in the resolved dependencies';
|
|
37
39
|
const lockingFailed = 'Locking failed';
|
|
38
40
|
const versionNotFound = 'Could not find a version that matches';
|
|
39
41
|
const errorsToBubbleUp = [incompatibleDeps, lockingFailed, versionNotFound];
|
|
40
42
|
for (const error of errorsToBubbleUp) {
|
|
41
|
-
if (
|
|
43
|
+
if (stderr.toLowerCase().includes(error.toLowerCase()) ||
|
|
44
|
+
stdout.toLowerCase().includes(error.toLowerCase())) {
|
|
42
45
|
throw new command_failed_to_run_error_1.CommandFailedError(error, command);
|
|
43
46
|
}
|
|
44
47
|
}
|
|
45
48
|
const SOLVER_PROBLEM = /SolverProblemError(.* version solving failed)/gms;
|
|
46
|
-
const solverProblemError = SOLVER_PROBLEM.exec(stderr);
|
|
49
|
+
const solverProblemError = SOLVER_PROBLEM.exec(stderr) || SOLVER_PROBLEM.exec(stdout);
|
|
47
50
|
if (solverProblemError) {
|
|
48
51
|
throw new command_failed_to_run_error_1.CommandFailedError(solverProblemError[0].trim(), command);
|
|
49
52
|
}
|
|
@@ -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;
|
|
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,CAAC,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,qDAAyB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CACV,GAAG,iDAAqB,CAAC,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"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.poetryAdd = void 0;
|
|
4
4
|
const pathLib = require("path");
|
|
5
|
+
const debugLib = require("debug");
|
|
5
6
|
const poetryFix = require("@snyk/fix-poetry");
|
|
6
7
|
const validate_required_data_1 = require("../../validate-required-data");
|
|
7
8
|
const attempted_changes_summary_1 = require("../../attempted-changes-summary");
|
|
8
9
|
const command_failed_to_run_error_1 = require("../../../../../lib/errors/command-failed-to-run-error");
|
|
9
10
|
const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
|
|
11
|
+
const debug = debugLib('snyk-fix:python:poetryAdd');
|
|
10
12
|
async function poetryAdd(entity, options, upgrades, dev) {
|
|
11
13
|
var _a;
|
|
12
14
|
const changes = [];
|
|
@@ -16,13 +18,14 @@ async function poetryAdd(entity, options, upgrades, dev) {
|
|
|
16
18
|
const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
|
|
17
19
|
const { dir } = pathLib.parse(targetFilePath);
|
|
18
20
|
if (!options.dryRun && upgrades.length) {
|
|
19
|
-
const
|
|
21
|
+
const { stderr, stdout, command, exitCode } = await poetryFix.poetryAdd(dir, upgrades, {
|
|
20
22
|
dev,
|
|
21
23
|
python: (_a = entity.options.command) !== null && _a !== void 0 ? _a : undefined,
|
|
22
24
|
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
debug('`poetry add` returned:', { stderr, stdout, command });
|
|
26
|
+
if (exitCode !== 0) {
|
|
27
|
+
poetryCommand = command;
|
|
28
|
+
throwPoetryError(stderr, stdout, command);
|
|
26
29
|
}
|
|
27
30
|
}
|
|
28
31
|
changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
|
|
@@ -33,19 +36,20 @@ async function poetryAdd(entity, options, upgrades, dev) {
|
|
|
33
36
|
return changes;
|
|
34
37
|
}
|
|
35
38
|
exports.poetryAdd = poetryAdd;
|
|
36
|
-
function throwPoetryError(stderr, command) {
|
|
39
|
+
function throwPoetryError(stderr, stdout, command) {
|
|
37
40
|
const ALREADY_UP_TO_DATE = 'No dependencies to install or update';
|
|
38
41
|
const INCOMPATIBLE_PYTHON = new RegExp(/Python requirement (.*) is not compatible/g, 'gm');
|
|
39
42
|
const SOLVER_PROBLEM = /SolverProblemError(.* version solving failed)/gms;
|
|
40
|
-
const incompatiblePythonError = INCOMPATIBLE_PYTHON.exec(stderr);
|
|
43
|
+
const incompatiblePythonError = INCOMPATIBLE_PYTHON.exec(stderr) || SOLVER_PROBLEM.exec(stdout);
|
|
41
44
|
if (incompatiblePythonError) {
|
|
42
45
|
throw new command_failed_to_run_error_1.CommandFailedError(`The current project's Python requirement ${incompatiblePythonError[1]} is not compatible with some of the required packages`, command);
|
|
43
46
|
}
|
|
44
|
-
const solverProblemError = SOLVER_PROBLEM.exec(stderr);
|
|
47
|
+
const solverProblemError = SOLVER_PROBLEM.exec(stderr) || SOLVER_PROBLEM.exec(stdout);
|
|
45
48
|
if (solverProblemError) {
|
|
46
49
|
throw new command_failed_to_run_error_1.CommandFailedError(solverProblemError[0].trim(), command);
|
|
47
50
|
}
|
|
48
|
-
if (stderr.includes(ALREADY_UP_TO_DATE)
|
|
51
|
+
if (stderr.includes(ALREADY_UP_TO_DATE) ||
|
|
52
|
+
stdout.includes(ALREADY_UP_TO_DATE)) {
|
|
49
53
|
throw new command_failed_to_run_error_1.CommandFailedError('No dependencies could be updated as they seem to be at the correct versions. Make sure installed dependencies in the environment match those in the lockfile by running `poetry update`', command);
|
|
50
54
|
}
|
|
51
55
|
throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
|
|
@@ -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;
|
|
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,CAAC,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,QAAE,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,qDAAyB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CACV,GAAG,iDAAqB,CAAC,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@snyk/fix",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.723.0",
|
|
4
4
|
"description": "Snyk fix library and utility",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"registry": "https://registry.npmjs.org/",
|
|
57
57
|
"access": "public"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "40dfb3b013dfa9c30035c75e15ad36d093df5432"
|
|
60
60
|
}
|