Merge pull request 'update sonar' (#380) from KingChan/forgeplus:standalone_develop into standalone_develop

app/controllers/api/v1/sonarqubes_controller.rb

@@ -88,29 +88,7 @@ class Api::V1::SonarqubesController < Api::V1::BaseController
       sonar_scanner_content[:content] = Base64.strict_encode64(sonar_scanner_content[:content])
       Gitea::CreateFileInteractor.call(@owner.gitea_token, @owner.login, sonar_scanner_content)
     end
-
-    #
-    #
-    # sonar_project_content = {
-    #   filepath: 'sonar-project.properties',
-    #   branch: params[:branch],
-    #   new_branch: nil,
-    #   "content": sonar_content,
-    #   "message": 'Add sonar-project.properties',
-    #   committer: {
-    #     email: @owner.mail,
-    #     name: @owner.login
-    #   },
-    #   identifier: @project.identifier
-    # }
-    #
-    # sonar_project_exit = Repositories::EntriesInteractor.call(@owner, @project.identifier, 'sonar-project.properties', ref: params[:branch])
-    # if sonar_project_exit.success?
-    #   Gitea::UpdateFileInteractor.call(@owner.gitea_token, @owner.login, sonar_project_content.merge(sha:sonar_project_exit.result['sha']))
-    # else
-    #   sonar_project_content[:content] = Base64.strict_encode64(sonar_project_content[:content])
-    #   Gitea::CreateFileInteractor.call(@owner.gitea_token, @owner.login, sonar_project_content)
-    # end
+    $gitea_hat_client.post_repos_actions_runs_by_owner_repo(@project&.owner&.login, @project&.identifier, {query: {workflow: "SonarScanner.yaml", ref: params[:branch]}})
     render_ok
   end
 

app/libs/sonar_service.rb

@@ -12,7 +12,7 @@ module SonarService
       detected_langs = lang_keys.map { |l| lang_map[l] }.compact.to_set
 
       lines = []
-      lines << "                      sonar.projectKey=#{owner}-#{project_id}"
+      lines << "sonar.projectKey=#{owner}-#{project_id}"
       lines << "                      sonar.projectVersion=1.0"
       lines << "                      sonar.sourceEncoding=UTF-8"
       lines << "                      sonar.sources=."