Update Dockerfile and .drone.yml, add workspace flag and fixed dashboard link

Author: diegopereiraeng

.drone.yml

@@ -19,13 +19,13 @@ steps:
     when:
       ref:
         - "refs/pull/**" # Only run for pull requests
-  - name: publish-2.1.3
+  - name: publish-2.2.0
     image: plugins/docker:20
     settings:
       # auto_tag: true
       # auto_tag_suffix: v2.0.2-java17
       tags:
-        - v2.1.3-sonar-4.6.2.2472
+        - v2.2.0
         # - latest
         # - stable-java17
       daemon_off: false

Dockerfile

@@ -15,7 +15,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o harness-sonar
 
 FROM amazoncorretto:17.0.8-alpine3.18
 
-ARG SONAR_VERSION=4.6.2.2472
+ARG SONAR_VERSION=5.0.1.3006
 ARG SONAR_SCANNER_CLI=sonar-scanner-cli-${SONAR_VERSION}
 ARG SONAR_SCANNER=sonar-scanner-${SONAR_VERSION}
 

main.go

@@ -261,6 +261,12 @@ func main() {
 			Usage:  "Wait for the SonarQube quality gate",
 			EnvVar: "PLUGIN_WAIT_QUALITYGATE",
 		},
+		cli.StringFlag{
+			Name:   "workspace",
+			Usage:  "sonar workspace execution",
+			Value:  "/harness",
+			EnvVar: "PLUGIN_WORKSPACE",
+		},
 	}
 	app.Run(os.Args)
 }
@@ -308,6 +314,7 @@ func run(c *cli.Context) {
 			TaskId:                    c.String("taskid"),
 			SkipScan:                  c.Bool("skip_scan"),
 			WaitQualityGate:           c.Bool("wait_qualitygate"),
+			Workspace:                 c.String("workspace"),
 		},
 		Output: Output{
 			OutputFile: c.String("output-file"),

plugin.go

@@ -35,7 +35,7 @@ var (
 
 	// sonarDashStatic is a static string used in the dashboard URL.
 	sonarDashStatic = "/dashboard?id="
-
+	//https://sonar.dfinsolutions.com/dashboard?id=dfinsolutions_Saturn-UI_AYezvlRKNrcjU-xpGTBl&pullRequest=1244
 	// basicAuth is the basic authentication string.
 	basicAuth = "Basic "
 )
@@ -88,6 +88,7 @@ type (
 		TaskId                    string
 		SkipScan                  bool
 		WaitQualityGate           bool
+		Workspace                 string
 	}
 	Output struct {
 		OutputFile string // File where plugin output are saved
@@ -346,6 +347,11 @@ func ParseJunit(projectArray Project, projectName string) Testsuites {
 	os.Setenv("SONAR_RESULT_OVERALL_ERRORS", fmt.Sprintf("%d", errors)) // Set the number of errors as an environment variable
 
 	dashboardLink := os.Getenv("PLUGIN_SONAR_HOST") + sonarDashStatic + os.Getenv("PLUGIN_SONAR_KEY")
+	if os.Getenv("PLUGIN_PR_KEY") != "" {
+		dashboardLink = os.Getenv("PLUGIN_SONAR_HOST") + sonarDashStatic + os.Getenv("PLUGIN_SONAR_KEY") + "&pullRequest=" + os.Getenv("PLUGIN_PR_KEY")
+	} else if os.Getenv("PLUGIN_BRANCHANALYSIS") == "true" {
+		dashboardLink = os.Getenv("PLUGIN_SONAR_HOST") + sonarDashStatic + os.Getenv("PLUGIN_SONAR_KEY") + "&branch=" + os.Getenv("PLUGIN_BRANCH")
+	}
 	SonarJunitReport := &Testsuites{
 		TestSuite: []Testsuite{
 			Testsuite{
@@ -468,6 +474,10 @@ func (p Plugin) Exec() error {
 		args = append(args, params...)
 	}
 
+	if len(p.Config.Workspace) >= 1 {
+		args = append(args, "-Dsonar.projectBaseDir="+p.Config.Workspace)
+	}
+
 	// Assuming your struct has a print or log method
 	if len(p.Config.JacocoReportPath) >= 1 {
 		fmt.Printf("\n\n==> Sonar Java Plugin Jacoco configured!\n\n")