snyk 1.689.0 → 1.693.0

package/dist/cli/741.index.js

@@ -1399,12 +1399,16 @@ const debugLib = __webpack_require__(15158);
 const requirements_file_parser_1 = __webpack_require__(67285);
 const contains_require_directive_1 = __webpack_require__(9744);
 const debug = debugLib('snyk-fix:python:extract-version-provenance');
-async function extractProvenance(workspace, dir, fileName, provenance = {}) {
+async function extractProvenance(workspace, rootDir, dir, fileName, provenance = {}) {
     const requirementsFileName = path.join(dir, fileName);
     const requirementsTxt = await workspace.readFile(requirementsFileName);
+    // keep all provenance paths with `/` as a separator
+    const relativeTargetFileName = path
+        .normalize(path.relative(rootDir, requirementsFileName))
+        .replace(path.sep, '/');
     provenance = {
         ...provenance,
-        [fileName]: requirements_file_parser_1.parseRequirementsFile(requirementsTxt),
+        [relativeTargetFileName]: requirements_file_parser_1.parseRequirementsFile(requirementsTxt),
     };
     const { containsRequire, matches } = await contains_require_directive_1.containsRequireDirective(requirementsTxt);
     if (containsRequire) {
@@ -1414,9 +1418,10 @@ async function extractProvenance(workspace, dir, fileName, provenance = {}) {
                 debug('Detected recursive require directive, skipping');
                 continue;
             }
+            const { dir: requireDir, base } = path.parse(path.join(dir, requiredFilePath));
             provenance = {
                 ...provenance,
-                ...(await extractProvenance(workspace, dir, requiredFilePath, provenance)),
+                ...(await extractProvenance(workspace, rootDir, requireDir, base, provenance)),
             };
         }
     }
@@ -1551,7 +1556,7 @@ async function applyAllFixes(entity, options) {
     const { remediation, targetFile: entryFileName, workspace, } = validate_required_data_1.validateRequiredData(entity);
     const fixedMeta = {};
     const { dir, base } = pathLib.parse(entryFileName);
-    const provenance = await extract_version_provenance_1.extractProvenance(workspace, dir, base);
+    const provenance = await extract_version_provenance_1.extractProvenance(workspace, dir, dir, base);
     const upgradeChanges = [];
     /* Apply all upgrades first across all files that are included */
     for (const fileName of Object.keys(provenance)) {