feat(OSM-2442): upgrade parser for poetry v2 support (#260)

* feat(OSM-2442): upgrade parser for poetry v2 support

* feat(OSM-2442): add poetry v2 test

* feat(OSM-2442): parse optional depenedancies

Author: DOlufemi

package.json

@@ -27,7 +27,7 @@
     "@snyk/cli-interface": "^2.11.2",
     "@snyk/dep-graph": "^1.28.1",
     "shescape": "1.6.1",
-    "snyk-poetry-lockfile-parser": "^1.6.1",
+    "snyk-poetry-lockfile-parser": "^1.8.0",
     "tmp": "0.2.3"
   },
   "devDependencies": {

test/fixtures/poetry-v2-project/poetry.lock

@@ -0,0 +1,16 @@
+[project]
+name = "out-of-sync"
+version = "0.1.0"
+description = ""
+authors = [
+    {name = "Your Name",email = "[email protected]"}
+]
+readme = "README.md"
+requires-python = ">=3.9"
+dependencies = [
+    "jinja2 (>=3.1.2)",
+    "isOdd (>=0.1.2)",
+]
+[build-system]
+requires = ["poetry-core>=3.6"]
+build-backend = "poetry.core.masonry.api"

test/fixtures/poetry-v2-project/pyproject.toml

@@ -836,6 +836,42 @@ describe('inspect', () => {
 
       expect(result.dependencyGraph.equals(expected)).toBeTruthy();
     });
+    it('should return expected dependencies for poetry-v2-app', async () => {
+      const workspace = 'poetry-v2-app';
+      testUtils.chdirWorkspaces(workspace);
+
+      const result = await inspect('.', FILENAMES.poetry.lockfile);
+      expect(result).toMatchObject({
+        plugin: {
+          name: 'snyk-python-plugin',
+          runtime: expect.any(String), // any version of Python
+          targetFile: FILENAMES.poetry.manifest,
+        },
+        package: null, // no dep-tree
+        dependencyGraph: {}, // match any dep-graph (equality checked below)
+      });
+
+      const builder = new DepGraphBuilder(
+        { name: 'poetry' },
+        { name: 'poetry-fixtures-project', version: '0.1.0' }
+      );
+      const expected = builder
+        .addPkgNode({ name: 'jinja2', version: '3.1.5' }, 'jinja2', {
+          labels: { scope: 'prod' },
+        })
+        .connectDep(builder.rootNodeId, 'jinja2')
+        .addPkgNode({ name: 'markupsafe', version: '3.0.2' }, 'markupsafe', {
+          labels: { scope: 'prod', pkgIdProvenance: '[email protected]' },
+        })
+        .connectDep('jinja2', 'markupsafe')
+        .addPkgNode({ name: 'isodd', version: '0.1.2' }, 'isodd', {
+          labels: { scope: 'prod', pkgIdProvenance: '[email protected]' },
+        })
+        .connectDep(builder.rootNodeId, 'isodd')
+        .build();
+
+      expect(result.dependencyGraph.equals(expected)).toBeTruthy();
+    });
 
     it('should return expected dependencies for poetry-optional-dependencies', async () => {
       const workspace = 'poetry-app-optional-dependencies';
@@ -855,6 +891,25 @@ describe('inspect', () => {
 
       compareTransitiveLines(result.dependencyGraph, expected);
     });
+
+    it('should return expected dependencies for poetry-v2-app-optional-dependencies', async () => {
+      const workspace = 'poetry-v2-app-optional-dependencies';
+      testUtils.chdirWorkspaces(workspace);
+
+      const result = await inspect('.', FILENAMES.poetry.lockfile);
+
+      const expected = [
+        {
+          pkg: {
+            name: 'opentelemetry-distro',
+            version: '0.35b0',
+          },
+          directDeps: ['opentelemetry-distro'],
+        },
+      ];
+
+      compareTransitiveLines(result.dependencyGraph, expected);
+    });
   });
 
   it('should return correct target file for poetry project when relative path to poetry lock file is passed', async () => {
@@ -867,6 +922,16 @@ describe('inspect', () => {
     expect(result.plugin.targetFile).toEqual(expectedTargetFile);
   });
 
+  it('should return correct target file for poetry v2 project when relative path to poetry lock file is passed', async () => {
+    const dirname = 'test/fixtures/poetry-v2-project';
+    const manifestFilePath = `${dirname}/poetry.lock`;
+
+    const result = await inspect('.', manifestFilePath);
+
+    const expectedTargetFile = `${dirname}/pyproject.toml`;
+    expect(result.plugin.targetFile).toEqual(expectedTargetFile);
+  });
+
   describe('Pipfile projects', () => {
     const mockedExecuteSync = jest.spyOn(subProcess, 'executeSync');
     const mockedExecute = jest.spyOn(subProcess, 'execute');