jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

Remove the obsolete PR parameters in sonarExecuteScan.go (#5366)

Browse Source
This commit is contained in:
alexander-petkov-SAP
2025-06-11 06:24:18 +03:00
committed by GitHub
parent ccb90e5bd1
commit da000e0c1b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/sonarExecuteScan.go
View File

@@ -367,15 +367,15 @@ func handlePullRequest(config sonarExecuteScanOptions) error {
provider := strings.ToLower(config.PullRequestProvider)
if provider == "github" {
if len(config.Owner) > 0 && len(config.Repository) > 0 {
sonar.addOption("sonar.pullrequest.github.repository=" + config.Owner + "/" + config.Repository)
//sonar.addOption("sonar.pullrequest.github.repository=" + config.Owner + "/" + config.Repository)
}
} else {
return errors.New("Pull-Request provider '" + provider + "' is not supported!")
}
sonar.addOption("sonar.pullrequest.key=" + config.ChangeID)
sonar.addOption("sonar.pullrequest.base=" + config.ChangeTarget)
sonar.addOption("sonar.pullrequest.branch=" + config.ChangeBranch)
sonar.addOption("sonar.pullrequest.provider=" + provider)
//sonar.addOption("sonar.pullrequest.key=" + config.ChangeID)
//sonar.addOption("sonar.pullrequest.base=" + config.ChangeTarget)
//sonar.addOption("sonar.pullrequest.branch=" + config.ChangeBranch)
//sonar.addOption("sonar.pullrequest.provider=" + provider)
}
} else if len(config.BranchName) > 0 {
sonar.addOption("sonar.branch.name=" + config.BranchName)

10
cmd/sonarExecuteScan_test.go
View File

@@ -349,11 +349,11 @@ func TestSonarHandlePullRequest(t *testing.T) {
err := handlePullRequest(options)
// assert
assert.NoError(t, err)
assert.Contains(t, sonar.options, "sonar.pullrequest.key=123")
assert.Contains(t, sonar.options, "sonar.pullrequest.provider=github")
assert.Contains(t, sonar.options, "sonar.pullrequest.base=master")
assert.Contains(t, sonar.options, "sonar.pullrequest.branch=feat/bogus")
assert.Contains(t, sonar.options, "sonar.pullrequest.github.repository=SAP/jenkins-library")
//assert.Contains(t, sonar.options, "sonar.pullrequest.key=123")
//assert.Contains(t, sonar.options, "sonar.pullrequest.provider=github")
//assert.Contains(t, sonar.options, "sonar.pullrequest.base=master")
//assert.Contains(t, sonar.options, "sonar.pullrequest.branch=feat/bogus")
//assert.Contains(t, sonar.options, "sonar.pullrequest.github.repository=SAP/jenkins-library")
})
t.Run("unsupported scm provider", func(t *testing.T) {
// init