Update Sonarfile

Author: Alexey Alter-Pesotskiy

fastlane/Sonarfile

@@ -2,48 +2,50 @@
 
 desc 'Get code coverage report and run complexity analysis for Sonar'
 lane :sonar_upload do
+  sonar_args = ''
   version_number = get_version_number(
     xcodeproj: 'StreamChatSwiftUI.xcodeproj',
     target: 'StreamChatSwiftUI'
   )[/\d+\.\d+\.\d/]
 
-  slather
+  unless Dir.glob('test_output/*.xcresult').empty?
+    slather
+    lizard(
+      source_folder: './Sources/',
+      language: 'swift',
+      export_type: 'xml',
+      report_file: 'reports/lizard.xml'
+    )
+    sonar_args = '-Dsonar.coverageReportPaths="reports/sonarqube-generic-coverage.xml" ' \
+                 '-Dsonar.swift.lizard.report="reports/lizard.xml"'
+  end
 
-  lizard(
-    source_folder: './Sources/',
-    language: 'swift',
-    export_type: 'xml',
-    report_file: 'reports/lizard.xml'
-  )
+  options = sonar_options(sonar_args: sonar_args, version_number: version_number)
+  sonar(options)
 
-  if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
-    sonar(
-      sonar_login: ENV['SONAR_TOKEN'],
-      pull_request_branch: ENV['GITHUB_HEAD_REF'],
-      pull_request_base: ENV['GITHUB_BASE_REF'],
-      pull_request_key: ENV['PR_NUMBER'],
-      project_version: version_number
-    )
-  else
-    branch = ENV['BRANCH_NAME'] || git_branch
+  next if sonar_args.empty? || ENV['GITHUB_EVENT_NAME'] == 'pull_request' || sonar_branch !~ /main|develop/
 
-    sonar(
-      sonar_login: ENV['SONAR_TOKEN'],
-      branch_name: branch,
-      project_version: version_number
-    )
+  slack_sonarcloud_metrics(version_number: version_number)
+end
+
+desc 'Gets Sonar options'
+private_lane :sonar_options do |options|
+  default_options = { sonar_login: ENV['SONAR_TOKEN'], sonar_runner_args: options[:sonar_args] }
 
-    case branch.to_sym
-    when :main
-      slack_sonarcloud_metrics(new_period: version_number, branch: branch)
-    when :develop
-      slack_sonarcloud_metrics(branch: branch)
-    else
-      UI.message("Sonar MetricKit ignores branch: #{branch}")
-    end
+  if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
+    default_options.merge(pull_request_branch: ENV['GITHUB_HEAD_REF'],
+                          pull_request_base: ENV['GITHUB_BASE_REF'],
+                          pull_request_key: ENV['PR_NUMBER'])
+  else
+    default_options.merge(branch_name: sonar_branch, project_version: options[:version_number])
   end
 end
 
+desc 'Gets Sonar branch'
+private_lane :sonar_branch do
+  ENV['BRANCH_NAME'] || git_branch
+end
+
 desc 'Creates a report in Slack with SonarCloud analysis details'
 private_lane :slack_sonarcloud_metrics do |options|
   project_key = 'GetStream_stream-chat-swiftui'
@@ -52,7 +54,7 @@ private_lane :slack_sonarcloud_metrics do |options|
     quality_gate: true,
     branch: options[:branch]
   )
-  new_period = options[:new_period] || options[:branch]
+  new_period = sonar_branch == 'main' ? options[:version_number] : sonar_branch
   new_coverage = metrics[:new_coverage].to_f.round(2)
   new_duplication_density = metrics[:new_duplicated_lines_density].to_f.round(2)
   vulnerabilities = metrics[:security_hotspots].to_i + metrics[:vulnerabilities].to_i

sonar-project.properties

@@ -4,8 +4,6 @@ sonar.host.url=https://sonarcloud.io
 sonar.organization=getstream
 sonar.sourceEncoding=UTF-8
 sonar.language=swift
-sonar.coverageReportPaths=reports/sonarqube-generic-coverage.xml
-sonar.swift.lizard.report=reports/lizard.xml
 sonar.inclusions=Sources/**/*.swift
 sonar.exclusions=Sources/**/*_Vendor.swift, Sources/**/Generated/*.swift