new matching algorithm

Author: diegopereiraeng

README.md

@@ -9,6 +9,8 @@ This plugin is designed to run SonarQube scans and handle the results and conver
 - Quality Gate status reporting + Metrics
 - Skip Scan and only check for quality Gate Status of a specific analysisId or last analysis
 
+Obs: USe branch and pr_key params for accuracy results matches when skiping the scan
+
 <img src="https://github.com/drone-plugins/sonarqube-scanner/blob/main/sonar-result-v2.png" alt="Results" width="800"/>
 
 ### Simple Pipeline example
@@ -109,7 +111,7 @@ spec:
   - Example: `"token": "your-sonarqube-token"`
 - `ver`: The version of the project.
   - Example: `"ver": "1.0.0"`
-- `branch`: The branch of the project.
+- `branch`: The branch of the project. This parameter is used to specify the branch of your codebase that the results should be matched with. If you're working on multiple branches, it's important to specify the correct branch to ensure that you're looking at the correct set of results.
   - Example: `"branch": "master"`
 - `timeout`: The timeout for the Sonar scanner.
   - Example: `"timeout": "300"`
@@ -157,8 +159,8 @@ spec:
   - Example: `"tests": "/path/to/tests"`
 - `java_test`: Java Test.
   - Example: `"java_test": "/path/to/java/test"`
-- `pr_key`: PR Key.
-  - Example: `"pr_key": "your-pr-key"`
+- `pr_key`: Pull Request Key.
+  - Example: `"pr_key": "123"`
 - `pr_branch`: PR Branch.
   - Example: `"pr_branch": "your-pr-branch"`
 - `pr_base`: PR Base.

plugin.go

@@ -599,7 +599,21 @@ func (p Plugin) Exec() error {
 		fmt.Printf("#######################################\n")
 		fmt.Printf("Waiting for quality gate validation...\n")
 		fmt.Printf("#######################################\n")
-		statusID, err := getStatusID(p.Config.TaskId, p.Config.Host, p.Config.Key)
+
+		// statusID, err := getStatusID(p.Config.TaskId, p.Config.Host, p.Config.Key)
+		var statusID string
+		var err error
+		if p.Config.PRKey != "" {
+			fmt.Printf("==> PR Key: " + p.Config.PRKey + "\n")
+			statusID, err = getStatusV2("pr", p.Config.PRKey, p.Config.Host, p.Config.Key)
+		} else if p.Config.Branch != "" {
+			fmt.Printf("==> Branch: " + p.Config.Branch + "\n")
+			statusID, err = getStatusV2("branch", p.Config.Branch, p.Config.Host, p.Config.Key)
+		} else {
+			fmt.Printf("==> Project Key: " + p.Config.Key + "\n")
+			statusID, err = getStatusID(p.Config.TaskId, p.Config.Host, p.Config.Key)
+		}
+
 		if err != nil {
 			fmt.Printf("\n\n==> Error getting the latest scanID\n\n")
 			fmt.Printf("Error: %s", err.Error())
@@ -834,6 +848,7 @@ func getStatus(task *TaskResponse, report *SonarReport) string {
 
 func getStatusID(taskIDOld string, sonarHost string, projectSlug string) (string, error) {
 	// token := os.Getenv("PLUGIN_SONAR_TOKEN")
+
 	taskID, err := GetLatestTaskID(sonarHost, projectSlug)
 	if err != nil {
 		fmt.Println("Failed to get the latest task ID:", err)
@@ -906,6 +921,90 @@ func getStatusID(taskIDOld string, sonarHost string, projectSlug string) (string
 	return project.ProjectStatus.Status, nil
 }
 
+func getStatusV2(scanType string, scanValue string, sonarHost string, projectSlug string) (string, error) {
+	// token := os.Getenv("PLUGIN_SONAR_TOKEN")
+
+	fmt.Println("Searchng last analysis")
+
+	var reportRequest url.Values
+
+	if scanType == "branch" {
+		fmt.Println("Searchng last analysis by branch")
+		reportRequest = url.Values{
+			"branch":     {scanValue},
+			"projectKey": {projectSlug},
+		}
+	} else {
+		fmt.Println("Searchng last analysis by pull request")
+		reportRequest = url.Values{
+			"pullRequest": {scanValue},
+			"projectKey":  {projectSlug},
+		}
+	}
+
+	fmt.Printf("==> Job Status Request:\n")
+	fmt.Printf(sonarHost + "/api/qualitygates/project_status?" + reportRequest.Encode())
+	fmt.Printf("\n")
+	fmt.Printf("\n")
+	fmt.Printf("scanType:" + scanType)
+	fmt.Printf("scanValue:" + scanValue)
+	fmt.Printf("\n")
+
+	// projectRequest, err := http.NewRequest("GET", sonarHost+"/api/qualitygates/project_status?"+reportRequest.Encode(), nil)
+	// projectRequest.Header.Add("Authorization", basicAuth+token)
+	// projectResponse, err := netClient.Do(projectRequest)
+	// if err != nil {
+	// 	logrus.WithFields(logrus.Fields{
+	// 		"error": err,
+	// 	}).Fatal("Failed get status")
+	// 	return "", err
+	// }
+	// buf, _ := ioutil.ReadAll(projectResponse.Body)
+	buf, err := GetProjectStatus(sonarHost, reportRequest.Encode(), projectSlug)
+
+	if err != nil {
+		logrus.WithFields(logrus.Fields{
+			"error": err,
+		}).Error("Failed to get project status")
+	}
+
+	project := ProjectStatusResponse{}
+	if err := json.Unmarshal(buf, &project); err != nil {
+		logrus.WithFields(logrus.Fields{
+			"error": err,
+		}).Fatal("Failed")
+		return "", nil
+	}
+
+	fmt.Printf("==> Report Result:\n")
+	fmt.Printf(string(buf))
+
+	// JUNUT
+	junitReport := ""
+	junitReport = string(buf) // returns a string of what was written to it
+	fmt.Printf("\n---------------------> JUNIT Exporter <---------------------\n")
+	bytesReport := []byte(junitReport)
+	var projectReport Project
+	err = json.Unmarshal(bytesReport, &projectReport)
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Printf("%+v", projectReport)
+	fmt.Printf("\n")
+	result := ParseJunit(projectReport, "BankingApp")
+	file, _ := xml.MarshalIndent(result, "", " ")
+	_ = ioutil.WriteFile("sonarResults.xml", file, 0644)
+
+	fmt.Printf("\n")
+	fmt.Printf("\n======> JUNIT Exporter <======\n")
+
+	//JUNIT
+	fmt.Printf("\n======> Harness Drone/CIE SonarQube Plugin <======\n\n====> Results:")
+
+	return project.ProjectStatus.Status, nil
+}
+
 func GetProjectStatus(sonarHost string, analysisId string, projectSlug string) ([]byte, error) {
 	token := os.Getenv("PLUGIN_SONAR_TOKEN")
 	fmt.Printf("\n")