Merge pull request #63 from diegopereiraeng/main

java 17 support + error msg enhancement + docs

Author: diegopereiraeng

.drone.yml

@@ -9,13 +9,20 @@ pool:
   use: ubuntu
 
 steps:
-  - name: pr test
+  - name: pr test java 11
     image: plugins/docker:20
     settings:
       daemon_off: false
       dockerfile: Dockerfile
       repo: plugins/sonarqube-scanner
       dry_run: true
+  - name: pr test java 17
+    image: plugins/docker:20
+    settings:
+      daemon_off: false
+      dockerfile: DockerfileJava17
+      repo: plugins/sonarqube-scanner
+      dry_run: true
   # - name: publish
   #   image: plugins/docker:18
   #   settings:
@@ -32,11 +39,15 @@ steps:
   #     ref:
   #       - refs/heads/main
   #       - refs/tags/**
-  - name: publish-v2.0.1
+  - name: publish-2.0.2-java11
     image: plugins/docker:20
     settings:
-      auto_tag: true
-      auto_tag_suffix: v2.0.1
+      # auto_tag: true
+      # auto_tag_suffix: v2.0.2-java11
+      tags:
+        - v2.0.2-java11
+        - latest-java11
+        - stable-java11
       daemon_off: false
       dockerfile: Dockerfile
       password:
@@ -48,6 +59,26 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+  - name: publish-2.0.2-java17
+    image: plugins/docker:20
+    settings:
+      # auto_tag: true
+      # auto_tag_suffix: v2.0.2-java17
+      tags:
+        - v2.0.2-java17
+        - latest-java17
+        - stable-java17
+      daemon_off: false
+      dockerfile: DockerfileJava17
+      password:
+        from_secret: docker_password
+      repo: plugins/sonarqube-scanner
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
 trigger:
   ref:
     - refs/heads/main

DockerfileJava17

@@ -0,0 +1,37 @@
+FROM golang:1.20-alpine as build
+RUN apk add --no-cache --update git
+RUN mkdir -p /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner
+WORKDIR /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner 
+COPY *.go ./
+COPY *.mod ./
+
+RUN go env GOCACHE 
+
+RUN go get github.com/sirupsen/logrus
+RUN go get github.com/pelletier/go-toml/cmd/tomll
+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:8-alpine3.17-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 add nodejs curl unzip
+
+COPY --from=build /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner/harness-sonar /bin/
+WORKDIR /bin
+
+RUN curl https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/${SONAR_SCANNER_CLI}.zip -so /bin/${SONAR_SCANNER_CLI}.zip
+RUN unzip ${SONAR_SCANNER_CLI}.zip \
+    && rm ${SONAR_SCANNER_CLI}.zip 
+
+ENV PATH $PATH:/bin/${SONAR_SCANNER}/bin
+
+ENTRYPOINT /bin/harness-sonar

README.md

@@ -2,7 +2,7 @@
 
 This plugin is designed to run SonarQube scans and handle the results and convert it to JUnit Format. It's written in Go and check the report results for status OK.
 
-## Main Features - 2.0.1
+## Main Features - v2.0.2-java17
 
 - Execute SonarQube scans and handle the results
 - Generate JUnit reports based on the scan results
@@ -20,7 +20,7 @@ This plugin is designed to run SonarQube scans and handle the results and conver
     identifier: run_sonar
     spec:
         connectorRef: account.DockerHubDiego
-        image: plugins/sonarqube-scanner:2.0.1
+        image: plugins/sonarqube-scanner:v2.0.2-java17
         reports:
             type: JUnit
             spec:
@@ -42,7 +42,7 @@ This plugin is designed to run SonarQube scans and handle the results and conver
 type: Plugin
 spec:
     connectorRef: <+input>
-    image: plugins/sonarqube-scanner:2.0.1
+    image: plugins/sonarqube-scanner:v2.0.2-java17
     reports:
         type: JUnit
         spec:
@@ -78,11 +78,11 @@ spec:
 ```yaml
 - step:
     type: Plugin
-    name: "Check Sonar "
-    identifier: run_sonar
+    name: "Check Sonar Quality Gate"
+    identifier: check_sonar
     spec:
         connectorRef: account.DockerHubDiego
-        image: plugins/sonarqube-scanner:2.0.1
+        image: plugins/sonarqube-scanner:v2.0.2-java17
         reports:
             type: JUnit
             spec:
@@ -91,9 +91,9 @@ spec:
         privileged: false
         settings:
             sonar_host: https://sonarcloud.io
-            sonar_token: 66778345cea1a31d817f0deee3daa7868c431433
-            sonar_name: sonarqube-scanner
-            sonar_key: sonarqube-scanner
+            sonar_token: 66778345yourToken817f0deee3daa7868c431433
+            sonar_name: sonar-project-name
+            sonar_key: sonar-project-key
             skip_scan: true
 ```
 

plugin.go

@@ -962,6 +962,11 @@ func GetLatestTaskID(sonarHost string, projectSlug string) (string, error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
+		if resp.StatusCode == http.StatusForbidden {
+			fmt.Printf("\nError in Task discovery: %s\n", "Check your token permission - probably it does not have 'Browse' permission on the project")
+		} else if resp.StatusCode == http.StatusUnauthorized {
+			fmt.Printf("\nError in Task discovery: %s\n", "Invalid Credentials - your token is not valid")
+		}
 		return "", fmt.Errorf("HTTP request error. Status code: %d", resp.StatusCode)
 	}