Merge pull request #72 from diegopereiraeng/main

wait for quality gate param independency

Author: diegopereiraeng

.drone.yml

@@ -9,53 +9,27 @@ pool:
   use: ubuntu
 
 steps:
-  - name: pr test java 11
-    image: plugins/docker:20
-    settings:
-      daemon_off: false
-      dockerfile: Dockerfile
-      repo: plugins/sonarqube-scanner
-      dry_run: true
-    when:
-      ref:
-        - "refs/pull/**" # Only run for pull requests
   - name: pr test java 17
     image: plugins/docker:20
     settings:
       daemon_off: false
-      dockerfile: DockerfileJava17
+      dockerfile: Dockerfile
       repo: plugins/sonarqube-scanner
       dry_run: true
     when:
       ref:
         - "refs/pull/**" # Only run for pull requests
-  # - name: publish
-  #   image: plugins/docker:18
-  #   settings:
-  #     auto_tag: true
-  #     auto_tag_suffix: linux-amd64
-  #     daemon_off: false
-  #     dockerfile: Dockerfile
-  #     password:
-  #       from_secret: docker_password
-  #     repo: plugins/sonarqube-scanner
-  #     username:
-  #       from_secret: docker_username
-  #   when:
-  #     ref:
-  #       - refs/heads/main
-  #       - refs/tags/**
-  - name: publish-2.0.4-java17
+  - name: publish-2.0.5-java17
     image: plugins/docker:20
     settings:
       # auto_tag: true
       # auto_tag_suffix: v2.0.2-java17
       tags:
-        - v2.0.4-java17
-        # - latest-java17
+        - v2.0.5
+        - latest
         # - stable-java17
       daemon_off: false
-      dockerfile: DockerfileJava17
+      dockerfile: Dockerfile
       password:
         from_secret: docker_password
       repo: plugins/sonarqube-scanner

Dockerfile

@@ -13,15 +13,17 @@ RUN go get github.com/urfave/cli
 RUN go get github.com/joho/godotenv
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o harness-sonar
 
-FROM openjdk:11.0.16-jre
+FROM amazoncorretto:17.0.8-alpine3.18
 
 ARG SONAR_VERSION=5.0.1.3006
 ARG SONAR_SCANNER_CLI=sonar-scanner-cli-${SONAR_VERSION}
 ARG SONAR_SCANNER=sonar-scanner-${SONAR_VERSION}
 
-RUN apt-get update \
-    && apt-get install -y nodejs curl \
-    && apt-get clean
+# RUN apt-get update \
+#     && apt-get install -y nodejs curl \
+#     && apt-get clean
+
+RUN apk --no-cache --update add nodejs curl unzip
 
 COPY --from=build /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner/harness-sonar /bin/
 WORKDIR /bin

DockerfileJava17 renamed to Dockerfile_Deprecated

@@ -13,17 +13,15 @@ RUN go get github.com/urfave/cli
 RUN go get github.com/joho/godotenv
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o harness-sonar
 
-FROM amazoncorretto:17.0.8-alpine3.18
+FROM openjdk:11.0.16-jre
 
 ARG SONAR_VERSION=5.0.1.3006
 ARG SONAR_SCANNER_CLI=sonar-scanner-cli-${SONAR_VERSION}
 ARG SONAR_SCANNER=sonar-scanner-${SONAR_VERSION}
 
-# RUN apt-get update \
-#     && apt-get install -y nodejs curl \
-#     && apt-get clean
-
-RUN apk --no-cache --update add nodejs curl unzip
+RUN apt-get update \
+    && apt-get install -y nodejs curl \
+    && apt-get clean
 
 COPY --from=build /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner/harness-sonar /bin/
 WORKDIR /bin

main.go

@@ -9,6 +9,7 @@ import (
 )
 
 var build = "1" // build number set at compile time
+
 func main() {
 	app := cli.NewApp()
 	app.Name = "Drone-Sonar-Plugin"
@@ -249,6 +250,11 @@ func main() {
 			Usage:  "Skip the SonarQube scan",
 			EnvVar: "PLUGIN_SKIP_SCAN",
 		},
+		cli.BoolTFlag{
+			Name:   "wait_qualitygate",
+			Usage:  "Wait for the SonarQube quality gate",
+			EnvVar: "PLUGIN_WAIT_QUALITYGATE",
+		},
 	}
 	app.Run(os.Args)
 }
@@ -295,6 +301,7 @@ func run(c *cli.Context) {
 			CustomJvmParams:           c.String("custom_jvm_params"),
 			TaskId:                    c.String("taskid"),
 			SkipScan:                  c.Bool("skip_scan"),
+			WaitQualityGate:           c.Bool("wait_qualitygate"),
 		},
 		Output: Output{
 			OutputFile: c.String("output-file"),

plugin.go

@@ -14,6 +14,7 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 	"time"
 
@@ -81,6 +82,7 @@ type (
 		CustomJvmParams           string
 		TaskId                    string
 		SkipScan                  bool
+		WaitQualityGate           bool
 	}
 	Output struct {
 		OutputFile string // File where plugin output are saved
@@ -179,6 +181,8 @@ type AnalysisResponse struct {
 	} `json:"analyses"`
 }
 
+const lineBreak = "----------------------------------------------"
+
 func init() {
 	netClient = &http.Client{
 		Timeout: time.Second * 10,
@@ -277,15 +281,15 @@ func displaySummary(total, passed, failed int, errors int, newErrors int, projec
 	fmt.Println("Successfully closed .env file")
 	fmt.Print("\n\n")
 	// Display the table
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|           STATUS           |      COUNT      |\n")
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|      (\033[32mPASSED\033[0m)              |      %d         |\n", passed)
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|      (\033[31mFAILED\033[0m)              |      %d         |\n", failed)
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|      TOTAL                 |      %d         |\n", total)
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("\n\nCategorization: %s\n", category)
 }
 
@@ -402,7 +406,7 @@ func (p Plugin) Exec() error {
 		"-Dsonar.showProfiling":                     p.Config.ShowProfiling,
 		"-Dsonar.java.binaries":                     p.Config.Binaries,
 		"-Dsonar.branch.name":                       p.Config.Branch,
-		"-Dsonar.qualitygate.wait":                  p.Config.QualityEnabled,
+		"-Dsonar.qualitygate.wait":                  strconv.FormatBool(p.Config.WaitQualityGate),
 		"-Dsonar.qualitygate.timeout":               p.Config.QualityTimeout,
 		"-Dsonar.javascript.lcov.reportPaths":       p.Config.JavascitptIcovReport,
 		"-Dsonar.coverage.jacoco.xmlReportPaths":    p.Config.JacocoReportPath,
@@ -694,17 +698,17 @@ func (p Plugin) Exec() error {
 }
 
 func displayQualityGateStatus(status string, qualityEnabled bool) {
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|         QUALITY GATE STATUS REPORT           |\n")
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 
 	if status == "OK" {
 		fmt.Printf("|         STATUS              |      \033[32m%s\033[0m       |\n", status)
 	} else {
 		fmt.Printf("|         STATUS              |      \033[31m%s\033[0m       |\n", status)
 	}
 
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 
 	if qualityEnabled {
 		fmt.Printf("|      QUALITY GATE ENABLED   |       \033[32mYES\033[0m       |\n")
@@ -713,9 +717,9 @@ func displayQualityGateStatus(status string, qualityEnabled bool) {
 	}
 
 	fmt.Printf("----------------------------------------------\n\n")
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|         Developed by: Diego Pereira          |\n")
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 }
 
 func staticScan(p *Plugin) (*SonarReport, error) {
@@ -778,7 +782,7 @@ func getStatus(task *TaskResponse, report *SonarReport) string {
 	// JUNUT
 	junitReport := ""
 	junitReport = string(buf) // returns a string of what was written to it
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|      SONAR SCAN + JUNIT EXPORTER PLUGIN      |\n")
 	fmt.Print("----------------------------------------------\n\n\n")
 	bytesReport := []byte(junitReport)
@@ -794,7 +798,7 @@ func getStatus(task *TaskResponse, report *SonarReport) string {
 	file, _ := xml.MarshalIndent(result, "", " ")
 	_ = ioutil.WriteFile("sonarResults.xml", file, 0644)
 
-	fmt.Println("----------------------------------------------")
+	fmt.Println(lineBreak)
 	fmt.Printf("|  Harness Drone/CIE SonarQube Plugin Results  |\n")
 	fmt.Print("----------------------------------------------\n\n\n")