Skip to content

Commit 12df086

Browse files
Fix sonar column start position (AST-65811) (#1051)
* Fix sonar column start position (AST-65811) * Fix sonar column start position (AST-65811) * Fix sonar column start position (AST-65811) * Fix sonar column start position (AST-65811) * Update ci.yml --------- Co-authored-by: AlvoBen <144705560+AlvoBen@users.noreply.github.com>
1 parent 575fb48 commit 12df086

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ jobs:
172172
vuln-type: 'os,library'
173173
output: './trivy-image-results.txt'
174174
env:
175-
TRIVY_SKIP_DB_UPDATE: true
176175
TRIVY_SKIP_JAVA_DB_UPDATE: true
177176

178177
- name: Inspect action report

internal/commands/result.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,11 +2217,15 @@ func parseSonarSecondaryLocations(results *wrappers.ScanResult) []wrappers.Sonar
22172217
func parseSonarTextRange(results *wrappers.ScanResultNode) wrappers.SonarTextRange {
22182218
var auxTextRange wrappers.SonarTextRange
22192219
auxTextRange.StartLine = results.Line
2220-
auxTextRange.StartColumn = results.Column
2221-
auxTextRange.EndColumn = results.Column + results.Length
2220+
startColumn := getSastStartColumn(results.Column)
2221+
2222+
auxTextRange.StartColumn = startColumn
2223+
auxTextRange.EndColumn = startColumn + results.Length
2224+
22222225
if auxTextRange.StartColumn == auxTextRange.EndColumn {
22232226
auxTextRange.EndColumn++
22242227
}
2228+
22252229
return auxTextRange
22262230
}
22272231

@@ -2241,6 +2245,13 @@ func findRule(ruleIds map[interface{}]bool, result *wrappers.ScanResult) *wrappe
22412245
return nil
22422246
}
22432247

2248+
func getSastStartColumn(column uint) uint {
2249+
if column == 0 {
2250+
return 0
2251+
}
2252+
return column - 1
2253+
}
2254+
22442255
func findRuleID(result *wrappers.ScanResult) (ruleID, ruleName, shortMessage string) {
22452256
caser := cases.Title(language.English)
22462257

0 commit comments

Comments
 (0)