From a9b9f621d3ba00748fe56470b2d7c4148721eb84 Mon Sep 17 00:00:00 2001
From: pawan-59 <pawan@devtron.ai>
Date: Thu, 12 Jan 2023 19:40:58 +0530
Subject: [PATCH] updated sonarqube plugin script

---
 .../sql/106_sonarqube_plugin_polling.up.sql   | 53 ++++++++-----------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/scripts/sql/106_sonarqube_plugin_polling.up.sql b/scripts/sql/106_sonarqube_plugin_polling.up.sql
index 5be3228971..a8cadefc5b 100644
--- a/scripts/sql/106_sonarqube_plugin_polling.up.sql
+++ b/scripts/sql/106_sonarqube_plugin_polling.up.sql
@@ -16,39 +16,30 @@ VALUES(nextval('id_seq_plugin_step_variable'),2,'AbortPipelineOnPolicyCheckFaile
 
 UPDATE plugin_pipeline_script SET script=E'PathToCodeDir=/devtroncd$CheckoutPath
 cd $PathToCodeDir
-if [[ -z "$UsePropertiesFileFromProject" ]]
+if [[ -z "$UsePropertiesFileFromProject" || $UsePropertiesFileFromProject == false ]]
 then
   echo "sonar.projectKey=$SonarqubeProjectKey" > sonar-project.properties
-  docker run \\
-  --rm \\
-  -e SONAR_HOST_URL=$SonarqubeEndpoint \\
-  -e SONAR_LOGIN=$SonarqubeApiKey \\
-  -v "/$PWD:/usr/src" \\
-  sonarsource/sonar-scanner-cli
-elif [[ $UsePropertiesFileFromProject == false ]]
- then
- echo "sonar.projectKey=$SonarqubeProjectKey" > sonar-project.properties
- docker run \\
- --rm \\
- -e SONAR_HOST_URL=$SonarqubeEndpoint \\
- -e SONAR_LOGIN=$SonarqubeApiKey \\
- -v "/$PWD:/usr/src" \\
- sonarsource/sonar-scanner-cli
+fi
+docker run \\
+--rm \\
+-e SONAR_HOST_URL=$SonarqubeEndpoint \\
+-e SONAR_LOGIN=$SonarqubeApiKey \\
+-v "/$PWD:/usr/src" \\
+sonarsource/sonar-scanner-cli
 
- if [[ $CheckForSonarAnalysisReport == true && ! -z "$CheckForSonarAnalysisReport" ]]
+if [[ $CheckForSonarAnalysisReport == true && ! -z "$CheckForSonarAnalysisReport" ]]
+then
+ status=$(curl -u ${SonarqubeApiKey}:  -sS ${SonarqubeEndpoint}/api/qualitygates/project_status?projectKey=${SonarqubeProjectKey}&branch=master)
+ project_status=$(echo $status | jq -r  ".projectStatus.status")
+ echo "*********  SonarQube Policy Report  *********"
+ echo $status
+ if [[ $AbortPipelineOnPolicyCheckFailed == true && $project_status == "ERROR" ]]
+ then
+  echo "*********  SonarQube Policy Violated *********"
+  echo "*********  Exiting Build *********"
+  exit
+ elif [[ $AbortPipelineOnPolicyCheckFailed == true && $project_status == "OK" ]]
  then
-   status=$(curl -u ${SonarqubeApiKey}:  -sS ${SonarqubeEndpoint}/api/qualitygates/project_status?projectKey=${SonarqubeProjectKey}&branch=master)
-   project_status=$(echo $status | jq -r  ".projectStatus.status")
-   echo "*********  SonarQube Policy Report  *********"
-   echo $status
-   if [[ $AbortPipelineOnPolicyCheckFailed == true && $project_status == "ERROR" ]]
-   then
-    echo "*********  SonarQube Policy Violated *********"
-    echo "*********  Exiting Build *********"
-    exit
-   elif [[ $AbortPipelineOnPolicyCheckFailed == true && $project_status == "OK" ]]
-   then
-    echo "*********  SonarQube Policy Passed *********"
-   fi
+  echo "*********  SonarQube Policy Passed *********"
  fi
-fi' WHERE id=2;
+fi' WHERE id=2;
\ No newline at end of file