snyk 1.1261.0 → 1.1262.0

package/dist/cli/245.index.js

@@ -237124,7 +237124,7 @@ exports.generate = generate;
 
 /***/ }),
 
-/***/ 86139:
+/***/ 93935:
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -237380,7 +237380,7 @@ const fs = __webpack_require__(57147);
 const path = __webpack_require__(71017);
 const parseXML = __webpack_require__(5055);
 const debugModule = __webpack_require__(15158);
-const framework_1 = __webpack_require__(86139);
+const framework_1 = __webpack_require__(93935);
 const debug = debugModule('snyk');
 function findFile(rootDir, filter) {
     if (!fs.existsSync(rootDir)) {
@@ -238140,7 +238140,7 @@ exports.getMinimumTargetFramework = exports.parse = exports.fromPackagesConfigEn
 const parseXML = __webpack_require__(5055);
 const debugModule = __webpack_require__(15158);
 const depsParser = __webpack_require__(91885);
-const framework_1 = __webpack_require__(86139);
+const framework_1 = __webpack_require__(93935);
 const debug = debugModule('snyk');
 function fromPackagesConfigEntry(manifest) {
     debug('Extracting by packages.config entry:' +
@@ -239302,12 +239302,19 @@ exports.buildDepGraph = buildDepGraph;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.LockFileNotValid = exports.packageSpecsFrom = void 0;
+exports.packageSpecsFrom = void 0;
 const toml = __webpack_require__(5022);
+const error_catalog_nodejs_public_1 = __webpack_require__(88404);
 function packageSpecsFrom(lockFileContents) {
-    const lockFile = toml.parse(lockFileContents);
+    let lockFile;
+    try {
+        lockFile = toml.parse(lockFileContents);
+    }
+    catch (error) {
+        throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.UnparseableLockFileError('The poetry.lock file is not parsable.', { error });
+    }
     if (!lockFile.package) {
-        throw new LockFileNotValid();
+        throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.UnparseableLockFileError('The poetry.lock file contains no package stanza.');
     }
     return lockFile.package.map((pkg) => {
         return {
@@ -239318,13 +239325,6 @@ function packageSpecsFrom(lockFileContents) {
     });
 }
 exports.packageSpecsFrom = packageSpecsFrom;
-class LockFileNotValid extends Error {
-    constructor() {
-        super("The poetry.lock file contains no package stanza'");
-        this.name = 'LockFileNotValid';
-    }
-}
-exports.LockFileNotValid = LockFileNotValid;
 //# sourceMappingURL=lock-file-parser.js.map
 
 /***/ }),
@@ -239335,8 +239335,9 @@ exports.LockFileNotValid = LockFileNotValid;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ManifestFileNotValid = exports.getDependenciesFrom = exports.pkgInfoFrom = void 0;
+exports.getDependenciesFrom = exports.pkgInfoFrom = void 0;
 const toml = __webpack_require__(5022);
+const error_catalog_nodejs_public_1 = __webpack_require__(88404);
 function pkgInfoFrom(manifestFileContents) {
     let manifest;
     try {
@@ -239346,16 +239347,22 @@ function pkgInfoFrom(manifestFileContents) {
             version: manifest.tool.poetry.version,
         };
     }
-    catch (_a) {
-        throw new ManifestFileNotValid();
+    catch (error) {
+        throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.UnparseableManifestError('The pyproject.toml file is not parsable.', { error });
     }
 }
 exports.pkgInfoFrom = pkgInfoFrom;
 function getDependenciesFrom(manifestFileContents, includeDevDependencies) {
     var _a;
-    const manifest = toml.parse(manifestFileContents);
+    let manifest;
+    try {
+        manifest = toml.parse(manifestFileContents);
+    }
+    catch (error) {
+        throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.UnparseableManifestError('The pyproject.toml file is not parsable.', { error });
+    }
     if (!((_a = manifest.tool) === null || _a === void 0 ? void 0 : _a.poetry)) {
-        throw new ManifestFileNotValid();
+        throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.UnparseableManifestError('The pyproject.toml is not a valid poetry file.');
     }
     const dependencies = dependenciesFrom(manifest).map((dep) => ({
         name: dep,
@@ -239393,13 +239400,6 @@ function devDependenciesFrom(manifest) {
 function dependenciesFrom(manifest) {
     return Object.keys(manifest.tool.poetry.dependencies || []);
 }
-class ManifestFileNotValid extends Error {
-    constructor() {
-        super('pyproject.toml is not a valid poetry file.');
-        this.name = 'ManifestFileNotValid';
-    }
-}
-exports.ManifestFileNotValid = ManifestFileNotValid;
 //# sourceMappingURL=manifest-parser.js.map
 
 /***/ }),
@@ -239583,6 +239583,8 @@ const subProcess = __webpack_require__(9783);
 const build_dep_graph_1 = __webpack_require__(41669);
 const types_1 = __webpack_require__(62914);
 const errors_1 = __webpack_require__(99893);
+const PYTHON_3_12_REGEX = new RegExp('^Python 3.12.*');
+const UPDATED_SETUPTOOLS_VERSION = '68.0.0';
 const returnedTargetFile = (originalTargetFile) => {
     const basename = path.basename(originalTargetFile);
     switch (basename) {
@@ -239664,6 +239666,7 @@ function createAssets() {
         path.join(__dirname, '../../pysrc/pkg_resources_py3/_vendor/pyparsing.py'),
         path.join(__dirname, '../../pysrc/pkg_resources_py3/__init__.py'),
         path.join(__dirname, '../../pysrc/pkg_resources_py3/extern/__init__.py'),
+        path.join(__dirname, '../../pysrc/pkg_resources_py3_12/__init__.py'),
     ];
 }
 function writeFile(writeFilePath, contents) {
@@ -239694,6 +239697,24 @@ function dumpAllFilesInTempDir(tempDirName) {
         writeFile(writeFilePath, contents);
     });
 }
+function updateSetuptools(setuptoolsVersion, dir, pythonEnv) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // For python 3.12, setuptools needs to be updated
+        // due to removal of some deprecated packages
+        // see: https://github.com/pypa/pip/pull/11997
+        const pythonVersion = yield subProcess.execute(`python`, ['--version'], {
+            cwd: dir,
+            env: pythonEnv,
+        });
+        if (!PYTHON_3_12_REGEX.test(pythonVersion)) {
+            return;
+        }
+        yield subProcess.execute(`pip install setuptools==${setuptoolsVersion}`, [], {
+            cwd: dir,
+            env: pythonEnv,
+        });
+    });
+}
 function inspectInstalledDeps(command, baseargs, root, targetFile, allowMissing, includeDevDeps, allowEmpty, args, projectName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tempDirObj = tmp.dirSync({
@@ -239702,6 +239723,7 @@ function inspectInstalledDeps(command, baseargs, root, targetFile, allowMissing,
         dumpAllFilesInTempDir(tempDirObj.name);
         try {
             const pythonEnv = getPythonEnv(targetFile);
+            yield updateSetuptools(UPDATED_SETUPTOOLS_VERSION, root, pythonEnv);
             // See ../../pysrc/README.md
             const output = yield subProcess.execute(command, [
                 ...baseargs,
@@ -293330,7 +293352,7 @@ exports.CompositeError = CompositeError;
  */
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-const tslib_1 = __webpack_require__(1212);
+const tslib_1 = __webpack_require__(86139);
 tslib_1.__exportStar(__webpack_require__(83649), exports);
 tslib_1.__exportStar(__webpack_require__(68218), exports);
 tslib_1.__exportStar(__webpack_require__(60826), exports);
@@ -293516,7 +293538,7 @@ exports.JsonApi = JsonApi;
  */
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-const tslib_1 = __webpack_require__(1212);
+const tslib_1 = __webpack_require__(86139);
 tslib_1.__exportStar(__webpack_require__(40697), exports);
 //# sourceMappingURL=index.js.map
 
@@ -302442,7 +302464,7 @@ module.exports = __webpack_require__(93419).YAML
 
 /***/ }),
 
-/***/ 1212:
+/***/ 86139:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";