fix: support sonar-project.Properties
This commit is contained in:
parent
15157105c5
commit
c0971c7f44
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,4 +14,4 @@
|
|||||||
.history
|
.history
|
||||||
.vscode
|
.vscode
|
||||||
.scannerwork
|
.scannerwork
|
||||||
|
.idea
|
||||||
|
10
DOCS.md
10
DOCS.md
@ -13,7 +13,7 @@ This plugin can scan your code quality and post the analysis report to your Sona
|
|||||||
The below pipeline configuration demonstrates simple usage:
|
The below pipeline configuration demonstrates simple usage:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
steps
|
steps:
|
||||||
- name: code-analysis
|
- name: code-analysis
|
||||||
image: aosapps/drone-sonar-plugin
|
image: aosapps/drone-sonar-plugin
|
||||||
settings:
|
settings:
|
||||||
@ -26,7 +26,7 @@ steps
|
|||||||
Customized parameters could be specified:
|
Customized parameters could be specified:
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
steps
|
steps:
|
||||||
- name: code-analysis
|
- name: code-analysis
|
||||||
image: aosapps/drone-sonar-plugin
|
image: aosapps/drone-sonar-plugin
|
||||||
settings:
|
settings:
|
||||||
@ -40,6 +40,7 @@ Customized parameters could be specified:
|
|||||||
+ level: DEBUG
|
+ level: DEBUG
|
||||||
+ showProfiling: true
|
+ showProfiling: true
|
||||||
+ exclusions: **/static/**/*,**/dist/**/*.js
|
+ exclusions: **/static/**/*,**/dist/**/*.js
|
||||||
|
+ usingProperties: false
|
||||||
```
|
```
|
||||||
|
|
||||||
# Secret Reference
|
# Secret Reference
|
||||||
@ -62,6 +63,11 @@ Safety first, the host and token are stored in Drone Secrets.
|
|||||||
* `showProfiling`: Display logs to see where the analyzer spends time. Default value `false`
|
* `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`
|
* `branchAnalysis`: Pass currently analysed branch to SonarQube. (Must not be active for initial scan!) Default value `false`
|
||||||
|
|
||||||
|
|
||||||
|
* `usingProperties`: Using the `sonar-project.properties` file in root directory as sonar parameters. (Not include `sonar_host` and
|
||||||
|
`sonar_token`.) Default value `false`
|
||||||
|
|
||||||
|
|
||||||
# Notes
|
# Notes
|
||||||
|
|
||||||
* projectKey: `DRONE_REPO`
|
* projectKey: `DRONE_REPO`
|
||||||
|
11
main.go
11
main.go
@ -87,6 +87,11 @@ func main() {
|
|||||||
Usage: "execute branchAnalysis",
|
Usage: "execute branchAnalysis",
|
||||||
EnvVar: "PLUGIN_BRANCHANALYSIS",
|
EnvVar: "PLUGIN_BRANCHANALYSIS",
|
||||||
},
|
},
|
||||||
|
cli.BoolFlag{
|
||||||
|
Name: "usingProperties",
|
||||||
|
Usage: "using sonar-project.properties",
|
||||||
|
EnvVar: "PLUGIN_USINGPROPERTIES",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
app.Run(os.Args)
|
app.Run(os.Args)
|
||||||
@ -107,8 +112,10 @@ func run(c *cli.Context) {
|
|||||||
Inclusions: c.String("inclusions"),
|
Inclusions: c.String("inclusions"),
|
||||||
Exclusions: c.String("exclusions"),
|
Exclusions: c.String("exclusions"),
|
||||||
Level: c.String("level"),
|
Level: c.String("level"),
|
||||||
showProfiling: c.String("showProfiling"),
|
ShowProfiling: c.String("showProfiling"),
|
||||||
branchAnalysis: c.Bool("branchAnalysis"),
|
BranchAnalysis: c.Bool("branchAnalysis"),
|
||||||
|
UsingProperties: c.Bool("usingProperties"),
|
||||||
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
21
plugin.go
21
plugin.go
@ -20,8 +20,9 @@ type (
|
|||||||
Inclusions string
|
Inclusions string
|
||||||
Exclusions string
|
Exclusions string
|
||||||
Level string
|
Level string
|
||||||
showProfiling string
|
ShowProfiling string
|
||||||
branchAnalysis bool
|
BranchAnalysis bool
|
||||||
|
UsingProperties bool
|
||||||
}
|
}
|
||||||
Plugin struct {
|
Plugin struct {
|
||||||
Config Config
|
Config Config
|
||||||
@ -30,23 +31,29 @@ type (
|
|||||||
|
|
||||||
func (p Plugin) Exec() error {
|
func (p Plugin) Exec() error {
|
||||||
args := []string{
|
args := []string{
|
||||||
"-Dsonar.projectKey=" + strings.Replace(p.Config.Key, "/", ":", -1),
|
|
||||||
"-Dsonar.projectName=" + p.Config.Name,
|
|
||||||
"-Dsonar.host.url=" + p.Config.Host,
|
"-Dsonar.host.url=" + p.Config.Host,
|
||||||
"-Dsonar.login=" + p.Config.Token,
|
"-Dsonar.login=" + p.Config.Token,
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.Config.UsingProperties {
|
||||||
|
argsParameter := []string{
|
||||||
|
"-Dsonar.projectKey=" + strings.Replace(p.Config.Key, "/", ":", -1),
|
||||||
|
"-Dsonar.projectName=" + p.Config.Name,
|
||||||
"-Dsonar.projectVersion=" + p.Config.Version,
|
"-Dsonar.projectVersion=" + p.Config.Version,
|
||||||
"-Dsonar.sources=" + p.Config.Sources,
|
"-Dsonar.sources=" + p.Config.Sources,
|
||||||
"-Dsonar.ws.timeout=" + p.Config.Timeout,
|
"-Dsonar.ws.timeout=" + p.Config.Timeout,
|
||||||
"-Dsonar.inclusions=" + p.Config.Inclusions,
|
"-Dsonar.inclusions=" + p.Config.Inclusions,
|
||||||
"-Dsonar.exclusions=" + p.Config.Exclusions,
|
"-Dsonar.exclusions=" + p.Config.Exclusions,
|
||||||
"-Dsonar.log.level=" + p.Config.Level,
|
"-Dsonar.log.level=" + p.Config.Level,
|
||||||
"-Dsonar.showProfiling=" + p.Config.showProfiling,
|
"-Dsonar.showProfiling=" + p.Config.ShowProfiling,
|
||||||
"-Dsonar.scm.provider=git",
|
"-Dsonar.scm.provider=git",
|
||||||
}
|
}
|
||||||
|
args = append(args, argsParameter)
|
||||||
|
}
|
||||||
|
|
||||||
if p.Config.branchAnalysis {
|
|
||||||
args = append(args, "-Dsonar.branch.name="+p.Config.Branch)
|
if p.Config.BranchAnalysis {
|
||||||
|
args = append(args, "-Dsonar.branch.name=" + p.Config.Branch)
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := exec.Command("sonar-scanner", args...)
|
cmd := exec.Command("sonar-scanner", args...)
|
||||||
|
Loading…
Reference in New Issue
Block a user