Skip to content

Commit 339bbc5

Browse files
committed
fix static test unused vars
1 parent bd0d9b3 commit 339bbc5

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

utils/results/conversion/cyclonedxparser/cyclonedxparser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func (cdc *CmdResultsCycloneDxConverter) getOrCreateFileComponent(filePathOrUri
334334
return &(*cdc.bom.Components)[len(*cdc.bom.Components)-1]
335335
}
336336

337-
func (cdc *CmdResultsCycloneDxConverter) getOrCreateJasIssue(ref, id, msg, description string, source *cyclonedx.Service, cwe []string, ratings []cyclonedx.VulnerabilityRating, properties ...cyclonedx.Property) (vulnerability *cyclonedx.Vulnerability) {
337+
func (cdc *CmdResultsCycloneDxConverter) getOrCreateJasIssue(ref, id, msg, description string, source *cyclonedx.Service, cwe []string, ratings []cyclonedx.VulnerabilityRating) (vulnerability *cyclonedx.Vulnerability) {
338338
if vulnerability = cdxutils.SearchVulnerabilityByRef(&cdc.bom.BOM, ref); vulnerability != nil {
339339
return
340340
}
@@ -351,7 +351,7 @@ func (cdc *CmdResultsCycloneDxConverter) getOrCreateJasIssue(ref, id, msg, descr
351351
CWE: cwe,
352352
Ratings: ratings,
353353
}
354-
*cdc.bom.Vulnerabilities = append(*cdc.bom.Vulnerabilities, cdxutils.CreateBaseVulnerability(params, properties...))
354+
*cdc.bom.Vulnerabilities = append(*cdc.bom.Vulnerabilities, cdxutils.CreateBaseVulnerability(params))
355355
return &(*cdc.bom.Vulnerabilities)[len(*cdc.bom.Vulnerabilities)-1]
356356
}
357357

utils/results/conversion/summaryparser/summaryparser.go

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func (sc *CmdResultsSummaryConverter) ParseSecrets(secrets ...[]*sarif.Run) (err
240240
if sc.currentScan.Vulnerabilities.SecretsResults == nil {
241241
sc.currentScan.Vulnerabilities.SecretsResults = &formats.ResultSummary{}
242242
}
243-
return results.ForEachJasIssue(results.CollectRuns(secrets...), sc.entitledForJas, sc.getJasHandler(jasutils.Secrets, false))
243+
return results.ForEachJasIssue(results.CollectRuns(secrets...), sc.entitledForJas, sc.getJasHandler(jasutils.Secrets))
244244
}
245245

246246
func (sc *CmdResultsSummaryConverter) ParseIacs(iacs ...[]*sarif.Run) (err error) {
@@ -255,7 +255,7 @@ func (sc *CmdResultsSummaryConverter) ParseIacs(iacs ...[]*sarif.Run) (err error
255255
if sc.currentScan.Vulnerabilities.IacResults == nil {
256256
sc.currentScan.Vulnerabilities.IacResults = &formats.ResultSummary{}
257257
}
258-
return results.ForEachJasIssue(results.CollectRuns(iacs...), sc.entitledForJas, sc.getJasHandler(jasutils.IaC, false))
258+
return results.ForEachJasIssue(results.CollectRuns(iacs...), sc.entitledForJas, sc.getJasHandler(jasutils.IaC))
259259
}
260260

261261
func (sc *CmdResultsSummaryConverter) ParseSast(sast ...[]*sarif.Run) (err error) {
@@ -269,11 +269,11 @@ func (sc *CmdResultsSummaryConverter) ParseSast(sast ...[]*sarif.Run) (err error
269269
if sc.currentScan.Vulnerabilities.SastResults == nil {
270270
sc.currentScan.Vulnerabilities.SastResults = &formats.ResultSummary{}
271271
}
272-
return results.ForEachJasIssue(results.CollectRuns(sast...), sc.entitledForJas, sc.getJasHandler(jasutils.Sast, false))
272+
return results.ForEachJasIssue(results.CollectRuns(sast...), sc.entitledForJas, sc.getJasHandler(jasutils.Sast))
273273
}
274274

275275
// getJasHandler returns a handler that counts the JAS results (based on severity and CA status) for each issue it handles
276-
func (sc *CmdResultsSummaryConverter) getJasHandler(scanType jasutils.JasScanType, violations bool) results.ParseJasIssueFunc {
276+
func (sc *CmdResultsSummaryConverter) getJasHandler(scanType jasutils.JasScanType) results.ParseJasIssueFunc {
277277
return func(run *sarif.Run, rule *sarif.ReportingDescriptor, severity severityutils.Severity, result *sarif.Result, location *sarif.Location) (err error) {
278278
// Get the count map in the `sc.currentScan` object based on the scanType and violation
279279
resultStatus := formats.NoStatus
@@ -283,23 +283,11 @@ func (sc *CmdResultsSummaryConverter) getJasHandler(scanType jasutils.JasScanTyp
283283
if tokenStatus := sarifutils.GetResultPropertyTokenValidation(result); tokenStatus != "" {
284284
resultStatus = tokenStatus
285285
}
286-
if violations {
287-
count = sc.currentScan.Violations.SecretsResults
288-
} else {
289-
count = sc.currentScan.Vulnerabilities.SecretsResults
290-
}
286+
count = sc.currentScan.Vulnerabilities.SecretsResults
291287
case jasutils.IaC:
292-
if violations {
293-
count = sc.currentScan.Violations.IacResults
294-
} else {
295-
count = sc.currentScan.Vulnerabilities.IacResults
296-
}
288+
count = sc.currentScan.Vulnerabilities.IacResults
297289
case jasutils.Sast:
298-
if violations {
299-
count = sc.currentScan.Violations.SastResults
300-
} else {
301-
count = sc.currentScan.Vulnerabilities.SastResults
302-
}
290+
count = sc.currentScan.Vulnerabilities.SastResults
303291
}
304292
countJasIssues(count, location, severity, resultStatus)
305293
return

0 commit comments

Comments
 (0)