Merge pull request #97 from drone-plugins/feat/force-nodejs-18

Force NodeJs 18

Author: diegopereiraeng

.drone.yml

@@ -19,13 +19,13 @@ steps:
     when:
       ref:
         - "refs/pull/**" # Only run for pull requests
-  - name: publish-2.4.0
+  - name: publish-2.4.1
     image: plugins/docker:20
     settings:
       # auto_tag: true
       # auto_tag_suffix: v2.0.2-java17
       tags:
-        - v2.4.0
+        - v2.4.1
         # - latest
         # - stable-java17
       daemon_off: false

Dockerfile

@@ -13,7 +13,7 @@ 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 amazoncorretto:17.0.11-alpine3.19
 
 ARG SONAR_VERSION=5.0.1.3006
 ARG SONAR_SCANNER_CLI=sonar-scanner-cli-${SONAR_VERSION}
@@ -23,7 +23,7 @@ ARG SONAR_SCANNER=sonar-scanner-${SONAR_VERSION}
 #     && apt-get install -y nodejs curl \
 #     && apt-get clean
 
-RUN apk --no-cache --update add nodejs curl unzip git php python3 py3-pip maven gcc g++ make ruby ruby-dev perl
+RUN apk --no-cache --update add nodejs-current npm curl unzip git php python3 py3-pip maven gcc g++ make ruby ruby-dev perl
 
 COPY --from=build /go/src/github.com/diegopereiraeng/harness-cie-sonarqube-scanner/harness-sonar /bin/
 WORKDIR /bin

main.go

@@ -267,6 +267,11 @@ func main() {
 			Value:  "/harness",
 			EnvVar: "PLUGIN_WORKSPACE",
 		},
+		cli.StringFlag{
+			Name:   "sonar_scanner_opts",
+			Usage:  "sonar scanner jvm ops",
+			EnvVar: "PLUGIN_SONAR_SCANNER_OPTS",
+		},
 	}
 	app.Run(os.Args)
 }
@@ -315,6 +320,7 @@ func run(c *cli.Context) {
 			SkipScan:                  c.Bool("skip_scan"),
 			WaitQualityGate:           c.Bool("wait_qualitygate"),
 			Workspace:                 c.String("workspace"),
+			SonarOPS:                  c.String("sonar_scanner_opts"),
 		},
 		Output: Output{
 			OutputFile: c.String("output-file"),

plugin.go

@@ -89,6 +89,7 @@ type (
 		SkipScan                  bool
 		WaitQualityGate           bool
 		Workspace                 string
+		SonarOPS		  string
 	}
 	Output struct {
 		OutputFile string // File where plugin output are saved
@@ -473,6 +474,13 @@ func (p Plugin) Exec() error {
 		params := strings.Split(p.Config.CustomJvmParams, ",")
 		args = append(args, params...)
 	}
+
+	if len(p.Config.SonarOPS) >= 1 {
+		existingOpts := os.Getenv("SONAR_SCANNER_OPTS")
+		newOpts := existingOpts + " " + p.Config.SonarOPS
+		os.Setenv("SONAR_SCANNER_OPTS", newOpts)
+	}
+	
 	taskFilePath := ".scannerwork/report-task.txt"
 
 	if len(p.Config.Workspace) >= 1 {