update PR for release branch (#1021)

opendevstack · Jul 13, 2023 · ec8348f · ec8348f
1 parent 063df1d
commit ec8348f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixed
 - Fix SonarQube quality gate report to use the pull request or branch in scope ([#1016](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1016))
+- CURL command fix for the sonarqube quality gate report retrieval ([#1020](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1020))
 - Fix typos in `build.gradle` ([#1012](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1012))
 
 ## [4.3.0] - 2023-07-03

diff --git a/src/org/ods/services/SonarQubeService.groovy b/src/org/ods/services/SonarQubeService.groovy
@@ -87,15 +87,16 @@ class SonarQubeService {
         String gitBranch,
         String bitbucketPullRequestKey) {
         withSonarServerConfig { hostUrl, authToken ->
-            def getStatusUrl = "${hostUrl}/api/qualitygates/project_status?projectKey=${projectKey}"
+            def getStatusUrl = "${hostUrl}/api/qualitygates/project_status"
+            def urlEncodingFlags = "--data-urlencode projectKey=${projectKey}"
             if (bitbucketPullRequestKey && (sonarQubeEdition != 'community')) {
-                getStatusUrl += "&pullRequest=" << bitbucketPullRequestKey
+                urlEncodingFlags += " --data-urlencode pullRequest=${bitbucketPullRequestKey}"
             } else if (sonarQubeEdition != 'community') {
-                getStatusUrl += "&branch=" << gitBranch
+                urlEncodingFlags += " --data-urlencode branch=${gitBranch}"
             }
             script.sh(
                 label: 'Get status of quality gate',
-                script: "curl -s -u ${authToken}: ${getStatusUrl}",
+                script: "curl -s -u ${authToken}: --url ${getStatusUrl} ${urlEncodingFlags}",
                 returnStdout: true
             )
         }