Skip to content

Commit 354cfb7

Browse files
Itay PazItay Paz
authored andcommitted
Remove filepath from ignore logic in oss real time
1 parent 389f337 commit 354cfb7

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

internal/commands/data/checkmarxIgnoredTempList.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"PackageManager": "npm",
44
"PackageName": "coa",
5-
"PackageVersion": "3.1.3",
6-
"FilePath": "../../../commands/data/manifests/package.json"
5+
"PackageVersion": "3.1.3"
6+
77
}
88
]

internal/commands/data/checkmarxIgnoredTempListCsproj.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{
33
"PackageManager": "nuget",
44
"PackageName": "Microsoft.Extensions.Caching.Memory",
5-
"PackageVersion": "6.0.3",
6-
"FilePath": "../../../commands/data/manifests/test.csproj"
5+
"PackageVersion": "6.0.3"
6+
77

88
}
99
]

internal/services/realtimeengine/ossrealtime/config.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,22 @@ type OssPackageResults struct {
2222
Packages []OssPackage `json:"Packages"`
2323
}
2424

25-
func composeID(packageManager, packageName, packageVersion, filePath string) string {
26-
return fmt.Sprintf("%s_%s_%s_%s", packageManager, packageName, packageVersion, filePath)
25+
func composeID(packageManager, packageName, packageVersion string) string {
26+
return fmt.Sprintf("%s_%s_%s", packageManager, packageName, packageVersion)
2727
}
2828

2929
func (p *OssPackage) GetID() string {
30-
return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
30+
return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
3131
}
3232

3333
type IgnoredPackage struct {
3434
PackageManager string `json:"PackageManager"`
3535
PackageName string `json:"PackageName"`
3636
PackageVersion string `json:"PackageVersion"`
37-
FilePath string `json:"FilePath"`
3837
}
3938

4039
func (p IgnoredPackage) GetID() string {
41-
return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
40+
return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
4241
}
4342

4443
type Vulnerability struct {

internal/services/realtimeengine/ossrealtime/oss-realtime.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ func (o *OssRealtimeService) RunOssRealtimeScan(filePath, ignoredFilePath string
9595
ignoreMap := buildIgnoreMap(ignoredPkgs)
9696
response.Packages = filterIgnoredPackages(response.Packages, ignoreMap)
9797
}
98-
for i := range response.Packages {
99-
response.Packages[i].FilePath = filePath
100-
}
98+
10199
return response, nil
102100
}
103101

0 commit comments

Comments
 (0)