Skip to content

License Violation - Show IssueId If LicenseKey is Empty #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
attiasas merged 1 commit into from
Nov 27, 2024
Merged

License Violation - Show IssueId If LicenseKey is Empty #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion utils/results/conversion/simplejsonparser/simplejsonparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func addSimpleJsonLicenseViolation(licenseViolationsRows *[]formats.LicenseRow,
return func(violation services.Violation, cves []formats.CveRow, applicabilityStatus jasutils.ApplicabilityStatus, severity severityutils.Severity, impactedPackagesName, impactedPackagesVersion, impactedPackagesType string, fixedVersion []string, directComponents []formats.ComponentRow, impactPaths [][]formats.ComponentRow) error {
*licenseViolationsRows = append(*licenseViolationsRows,
formats.LicenseRow{
LicenseKey: violation.LicenseKey,
LicenseKey: getLicenseKey(violation.LicenseKey, violation.IssueId),
ImpactedDependencyDetails: formats.ImpactedDependencyDetails{
SeverityDetails: severityutils.GetAsDetails(severity, applicabilityStatus, pretty),
ImpactedDependencyName: impactedPackagesName,
Expand All @@ -246,6 +246,13 @@ func addSimpleJsonLicenseViolation(licenseViolationsRows *[]formats.LicenseRow,
}
}

func getLicenseKey(licenseKey, issueId string) string {
if licenseKey == "" {
return issueId
}
return licenseKey
}

func addSimpleJsonOperationalRiskViolation(operationalRiskViolationsRows *[]formats.OperationalRiskViolationRow, pretty bool) results.ParseScaViolationFunc {
return func(violation services.Violation, cves []formats.CveRow, applicabilityStatus jasutils.ApplicabilityStatus, severity severityutils.Severity, impactedPackagesName, impactedPackagesVersion, impactedPackagesType string, fixedVersion []string, directComponents []formats.ComponentRow, impactPaths [][]formats.ComponentRow) error {
violationOpRiskData := getOperationalRiskViolationReadableData(violation)
Expand Down
Loading