Skip to content

Commit c7fde78

Browse files
committed
fix dedoublication issue
1 parent 65fda75 commit c7fde78

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

ado-importer.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -943,16 +943,17 @@ function populateDuplicateDetectionData(existingWorkItems, duplicateDetectionDat
943943
}
944944
}
945945
} else {
946-
// Parse policy flaw ID: [VID:FlawID]
947-
const flawInfo = parseVeracodeFlawID(veracodeFlawId);
948-
if (flawInfo && flawInfo.flawNum) {
949-
const flawNum = parseInt(flawInfo.flawNum);
950-
duplicateDetectionData.existingFlaws[flawNum] = true;
951-
duplicateDetectionData.existingFlawNumbers[flawNum] = workItemId;
952-
duplicateDetectionData.existingIssueStates[flawNum] = workItemState;
946+
// Extract flaw ID directly from title for policy scans
947+
// Title format: "Veracode Flaw (Static): [CWE Name], Flaw [ID]"
948+
const flawIdMatch = title.match(/Flaw (\d+)/);
949+
if (flawIdMatch) {
950+
const flawId = flawIdMatch[1];
951+
duplicateDetectionData.existingFlaws[flawId] = true;
952+
duplicateDetectionData.existingFlawNumbers[flawId] = workItemId;
953+
duplicateDetectionData.existingIssueStates[flawId] = workItemState;
953954

954955
if (debug === 'true') {
955-
console.log(`Added policy flaw data: FlawNum=${flawNum}, WorkItem=${workItemId}`);
956+
console.log(`Added policy flaw data: FlawId=${flawId}, WorkItem=${workItemId}`);
956957
}
957958
}
958959
}
@@ -1050,15 +1051,15 @@ function pipelineIssueExists(flaw, duplicateDetectionData, debug) {
10501051
return null;
10511052
}
10521053

1053-
// Policy-specific duplicate detection (exact matching)
1054+
// Policy-specific duplicate detection (exact matching by flaw ID)
10541055
function policyIssueExists(flaw, duplicateDetectionData) {
10551056
const flawId = flaw.issue_id || 'Unknown';
1056-
const flawNum = parseInt(flawId);
10571057

1058-
if (duplicateDetectionData.existingFlaws[flawNum] === true) {
1058+
// Use flaw ID directly for deduplication
1059+
if (duplicateDetectionData.existingFlaws[flawId] === true) {
10591060
return {
1060-
workItemId: duplicateDetectionData.existingFlawNumbers[flawNum],
1061-
workItemState: duplicateDetectionData.existingIssueStates[flawNum]
1061+
workItemId: duplicateDetectionData.existingFlawNumbers[flawId],
1062+
workItemState: duplicateDetectionData.existingIssueStates[flawId]
10621063
};
10631064
}
10641065

0 commit comments

Comments
 (0)