Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require (
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.3 // indirect
dario.cat/mergo v1.0.1 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20240914100643-eb91380d8434 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/data/checkmarxIgnoredTempList.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"PackageManager": "npm",
"PackageName": "coa",
"PackageVersion": "3.1.3",
"FilePath": "../../../commands/data/manifests/package.json"
"PackageVersion": "3.1.3"

}
]
4 changes: 2 additions & 2 deletions internal/commands/data/checkmarxIgnoredTempListCsproj.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"PackageManager": "nuget",
"PackageName": "Microsoft.Extensions.Caching.Memory",
"PackageVersion": "6.0.3",
"FilePath": "../../../commands/data/manifests/test.csproj"
"PackageVersion": "6.0.3"


}
]
9 changes: 4 additions & 5 deletions internal/services/realtimeengine/ossrealtime/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@ type OssPackageResults struct {
Packages []OssPackage `json:"Packages"`
}

func composeID(packageManager, packageName, packageVersion, filePath string) string {
return fmt.Sprintf("%s_%s_%s_%s", packageManager, packageName, packageVersion, filePath)
func composeID(packageManager, packageName, packageVersion string) string {
return fmt.Sprintf("%s_%s_%s", packageManager, packageName, packageVersion)
}

func (p *OssPackage) GetID() string {
return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
}

type IgnoredPackage struct {
PackageManager string `json:"PackageManager"`
PackageName string `json:"PackageName"`
PackageVersion string `json:"PackageVersion"`
FilePath string `json:"FilePath"`
}

func (p IgnoredPackage) GetID() string {
return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
}

type Vulnerability struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ func (o *OssRealtimeService) RunOssRealtimeScan(filePath, ignoredFilePath string
ignoreMap := buildIgnoreMap(ignoredPkgs)
response.Packages = filterIgnoredPackages(response.Packages, ignoreMap)
}
for i := range response.Packages {
response.Packages[i].FilePath = filePath
}

return response, nil
}

Expand Down
Loading