Merge pull request #78 from diegopereiraeng/main

Quality Gate Type Check Param for selection

Author: diegopereiraeng

.drone.yml

@@ -19,14 +19,14 @@ steps:
     when:
       ref:
         - "refs/pull/**" # Only run for pull requests
-  - name: publish-2.1.0
+  - name: publish-2.1.1
     image: plugins/docker:20
     settings:
       # auto_tag: true
       # auto_tag_suffix: v2.0.2-java17
       tags:
-        - v2.1.0
-        - latest
+        - v2.1.1
+        # - latest
         # - stable-java17
       daemon_off: false
       dockerfile: Dockerfile

main.go

@@ -108,6 +108,12 @@ func main() {
 			Value:  "true",
 			EnvVar: "PLUGIN_SONAR_QUALITY_ENABLED",
 		},
+		cli.StringFlag{
+			Name:   "quality_gate_type",
+			Usage:  "if this setting is not set the default is analysisID, if you want to use other QG checks then choose: branch, pullRequest or projectKey",
+			Value:  "analysisID",
+			EnvVar: "PLUGIN_QG_TYPE",
+		},
 		cli.StringFlag{
 			Name:   "qualitygate_timeout",
 			Usage:  "number in seconds for timeout",

plugin.go

@@ -658,9 +658,36 @@ func staticScan(p *Plugin) (*SonarReport, error) {
 }
 
 func getStatus(task *TaskResponse, report *SonarReport) string {
-	reportRequest := url.Values{
-		"analysisId": {task.Task.AnalysisID},
+
+	qg_type := os.Getenv("PLUGIN_QG_TYPE")
+
+	var reportRequest url.Values
+
+	if qg_type == "branch" {
+		qg_branch := os.Getenv("PLUGIN_BRANCH")
+		reportRequest = url.Values{
+			"branch": {qg_branch},
+		}
+	} else if qg_type == "pullRequest" {
+		qg_pr := os.Getenv("PLUGIN_PR_KEY")
+		reportRequest = url.Values{
+			"pullRequest": {qg_pr},
+		}
+
+	} else if qg_type == "projectKey" {
+		qg_projectKey := os.Getenv("PLUGIN_SONAR_KEY")
+		reportRequest = url.Values{
+			"projectKey": {qg_projectKey},
+		}
+	} else {
+		reportRequest = url.Values{
+			"analysisId": {task.Task.AnalysisID},
+		}
 	}
+
+	// reportRequest := url.Values{
+	// 	"analysisId": {task.Task.AnalysisID},
+	// }
 	sonarToken := os.Getenv("PLUGIN_SONAR_TOKEN")
 
 	// First try with Basic Auth