fixed issue by introducing sonar project key in BuildConfig and setti…

…ng based on args (#54) Co-authored-by: Naresh Nagarajan <naresh_nagarajan1@homedepot.com>
homedepot · Aug 24, 2020 · a29dc64 · a29dc64
1 parent 413a615
commit a29dc64
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/flow/aggregator.py b/flow/aggregator.py
@@ -166,8 +166,11 @@ def main():
                                          attachment_color=attachment_color, slack_url=slack_url)
         metrics.write_metric(task, args.action)
     elif task == 'sonar':
+        if 'sonar_project_key' in args and args.sonar_project_key is not None:
+            BuildConfig.sonar_project_key = args.sonar_project_key
+        else:
+            BuildConfig.sonar_project_key = BuildConfig.project_name
         sonar = SonarQube()
-
         sonar.scan_code()
         metrics.write_metric(task, args.action)
     elif task == 'artifactory':
@@ -344,6 +347,8 @@ def load_task_parsers(subparsers):
     sonar_parser.add_argument('-v', '--version', help='(optional) If manually versioning, this is passed in by the '
                                                       'user.  Note: versionStrategy in buildConfig should be set to '
                                                       '"manual"')
+    sonar_parser.add_argument('-pk', '--sonar-project-key', help='(optional) If passed then this value is used for sonar.projectKey and sonar.projectName '
+                                                          'otherwise buildConfig projectInfo.name is used.')
 
     cfdeploy_parser = subparsers.add_parser("cf", help="Cloud Foundry Deploy task",
                                             formatter_class=RawTextHelpFormatter)

diff --git a/flow/buildconfig.py b/flow/buildconfig.py
@@ -22,6 +22,7 @@ class BuildConfig:
     artifact_extension = None
     artifact_extensions = None
     push_location = 'fordeployment'
+    sonar_project_key = None
 
     def __init__(self, args):
         method = '__init__'

diff --git a/flow/staticqualityanalysis/sonar/sonarmodule.py b/flow/staticqualityanalysis/sonar/sonarmodule.py
@@ -96,15 +96,15 @@ def _submit_scan(self):
             custom_sonar_file = self.config.json_config['sonar']['propertiesFile']
 
             if sonar_user is not None and sonar_pwd is not None:
-                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.project_name + '" -Dsonar.projectName="' + self.config.project_name + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PWD -Dproject.settings="' + custom_sonar_file + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
+                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.sonar_project_key + '" -Dsonar.projectName="' + self.config.sonar_project_key + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PWD -Dproject.settings="' + custom_sonar_file + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
             else:
-                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.project_name + '" -Dsonar.projectName="' + self.config.project_name + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dproject.settings="' + custom_sonar_file + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
+                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.sonar_project_key + '" -Dsonar.projectName="' + self.config.sonar_project_key + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dproject.settings="' + custom_sonar_file + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
             commons.print_msg(SonarQube.clazz, method, sonar_cmd)
         else:
             if sonar_user is not None and sonar_pwd is not None:
-                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.project_name + '" -Dsonar.projectName="' + self.config.project_name + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PWD -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
+                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.sonar_project_key + '" -Dsonar.projectName="' + self.config.sonar_project_key + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PWD -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
             else:
-                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.project_name + '" -Dsonar.projectName="' + self.config.project_name + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
+                sonar_cmd = 'java -Dsonar.projectKey="' + self.config.sonar_project_key + '" -Dsonar.projectName="' + self.config.sonar_project_key + '" -Dsonar.projectVersion="' + self.config.version_number + '" -Dproject.home="$PWD" -jar $SONAR_HOME/' + sonar_runner_executable + ' -e -X'
             commons.print_msg(SonarQube.clazz, method, sonar_cmd)
 
         p = subprocess.Popen(sonar_cmd.split(), shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)