Merge pull request #8 from saitho/feature/branch-configuration

Pass branch name to Sonar

DOCS.md

@@ -60,6 +60,7 @@ Safety first, the host and token are stored in Drone Secrets.
     * DEBUG: Display INFO logs + more details at DEBUG level.
     * TRACE: Display DEBUG logs + the timings of all ElasticSearch queries and Web API calls executed by the SonarQube Scanner.
 * `showProfiling`: Display logs to see where the analyzer spends time. Default value `false`
+* `branchAnalysis`: Pass currently analysed branch to SonarQube. (Must not be active for initial scan!) Default value `false`
 
 # Notes
 

main.go

@@ -43,6 +43,11 @@ func main() {
 			Usage:  "Project version",
 			EnvVar: "DRONE_BUILD_NUMBER",
 		},
+		cli.StringFlag{
+			Name:   "branch",
+			Usage:  "Project branch",
+			EnvVar: "DRONE_BRANCH",
+		},
 		cli.StringFlag{
 			Name:   "timeout",
 			Usage:  "Web request timeout",
@@ -77,6 +82,11 @@ func main() {
 			Value:  "false",
 			EnvVar: "PLUGIN_SHOWPROFILING",
 		},
+		cli.BoolFlag{
+			Name:   "branchAnalysis",
+			Usage:  "execute branchAnalysis",
+			EnvVar: "PLUGIN_BRANCHANALYSIS",
+		},
 	}
 
 	app.Run(os.Args)
@@ -90,13 +100,15 @@ func run(c *cli.Context) {
 			Host:  c.String("host"),
 			Token: c.String("token"),
 
-			Version:       c.String("ver"),
+			Version:        c.String("ver"),
-			Timeout:       c.String("timeout"),
+			Branch:         c.String("branch"),
-			Sources:       c.String("sources"),
+			Timeout:        c.String("timeout"),
-			Inclusions:    c.String("inclusions"),
+			Sources:        c.String("sources"),
-			Exclusions:    c.String("exclusions"),
+			Inclusions:     c.String("inclusions"),
-			Level:         c.String("level"),
+			Exclusions:     c.String("exclusions"),
-			showProfiling: c.String("showProfiling"),
+			Level:          c.String("level"),
+			showProfiling:  c.String("showProfiling"),
+			branchAnalysis: c.Bool("branchAnalysis"),
 		},
 	}
 

plugin.go

@@ -1,25 +1,27 @@
 package main
 
 import (
-	"strings"
 	"fmt"
 	"os/exec"
+	"strings"
 )
 
 type (
 	Config struct {
-		Key   			string
+		Key   string
-		Name    		string
+		Name  string
-		Host  			string
+		Host  string
-		Token 			string
+		Token string
 
-		Version    		string
+		Version        string
-		Sources    		string
+		Branch         string
-		Timeout   		string
+		Sources        string
-		Inclusions    	string
+		Timeout        string
-		Exclusions  	string
+		Inclusions     string
-		Level 			string
+		Exclusions     string
-		showProfiling 	string
+		Level          string
+		showProfiling  string
+		branchAnalysis bool
 	}
 	Plugin struct {
 		Config Config
@@ -41,8 +43,12 @@ func (p Plugin) Exec() error {
 		"-Dsonar.log.level=" + p.Config.Level,
 		"-Dsonar.showProfiling=" + p.Config.showProfiling,
 		"-Dsonar.scm.provider=git",
-		
 	}
+
+	if p.Config.branchAnalysis {
+		args = append(args, "-Dsonar.branch.name="+p.Config.Branch)
+	}
+
 	cmd := exec.Command("sonar-scanner", args...)
 	// fmt.Printf("==> Executing: %s\n", strings.Join(cmd.Args, " "))
 	output, err := cmd.CombinedOutput()