🐛 Fix --property option

JetBrains · Apr 10, 2022 · 798bd14 · 798bd14
1 parent 9e6094f
commit 798bd14
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/cmd/cmd_test.go b/cmd/cmd_test.go
@@ -45,7 +45,7 @@ var testOptions = &core.QodanaOptions{
 	SaveReport:            true,
 	ShowReport:            true,
 	Port:                  8888,
-	Property:              "foo=bar",
+	Property:              []string{"foo.baz=bar", "foo.bar=baz"},
 	Script:                "default",
 	FailThreshold:         "0",
 	Changes:               true,
@@ -162,14 +162,14 @@ func TestScanFlags(t *testing.T) {
 		"--baseline",
 		"qodana.sarif.json",
 		"--baseline-include-absent",
-		"--property",
-		"foo=bar",
 		"--fail-threshold",
 		"0",
 		"--changes",
 		"--send-report",
 		"--analysis-id",
 		"id",
+		"--property=foo.baz=bar",
+		"--property=foo.bar=baz",
 	}, " ")
 	actual := strings.Join(core.GetCmdOptions(testOptions), " ")
 	if expected != actual {
@@ -178,6 +178,7 @@ func TestScanFlags(t *testing.T) {
 }
 
 func TestAllCommands(t *testing.T) {
+	//goland:noinspection GoBoolExpressions
 	if _, err := exec.LookPath("docker"); err != nil || (runtime.GOOS == "windows" && isGitHubAction()) {
 		t.Skip(err)
 	}
@@ -218,6 +219,8 @@ func TestAllCommands(t *testing.T) {
 		"--fail-threshold", "5",
 		"--print-problems",
 		"--clear-cache",
+		"--property",
+		"idea.log.config.file=info.xml",
 	})
 	err = command.Execute()
 	if err != nil {

diff --git a/cmd/scan.go b/cmd/scan.go
@@ -131,7 +131,7 @@ But you can always override qodana.yaml options with the following command-line
 	flags.StringVar(&options.Script, "script", "default", "Override the run scenario")
 	flags.StringVar(&options.StubProfile, "stub-profile", "", "Absolute path to the fallback profile file. This option is applied in case the profile was not specified using any available options")
 
-	flags.StringVar(&options.Property, "property", "", "Set a JVM property to be used while running Qodana using the --property=property.name=value1,value2,...,valueN notation")
+	flags.StringArrayVar(&options.Property, "property", []string{}, "Set a JVM property to be used while running Qodana using the --property property.name=value1,value2,...,valueN notation")
 	flags.BoolVarP(&options.SaveReport, "save-report", "s", true, "Generate HTML report")
 	flags.BoolVar(&options.SendReport, "send-report", false, "Send the inspection report to Qodana Cloud, requires the '--token' option to be specified")
 

diff --git a/core/common.go b/core/common.go
@@ -42,7 +42,7 @@ type QodanaOptions struct {
 	SaveReport            bool
 	ShowReport            bool
 	Port                  int
-	Property              string
+	Property              []string
 	Script                string
 	FailThreshold         string
 	Changes               bool

diff --git a/core/docker.go b/core/docker.go
@@ -133,7 +133,8 @@ func ensureDockerInstalled() {
 func checkDockerMemory() {
 	docker := getDockerClient()
 	goos := runtime.GOOS
-	if goos != "windows" && goos != "darwin" {
+	if //goland:noinspection GoBoolExpressions
+	goos != "windows" && goos != "darwin" {
 		return
 	}
 	info, err := docker.Info(context.Background())
@@ -188,9 +189,6 @@ func GetCmdOptions(opts *QodanaOptions) []string {
 	if opts.BaselineIncludeAbsent {
 		arguments = append(arguments, "--baseline-include-absent")
 	}
-	if opts.Property != "" {
-		arguments = append(arguments, "--property", opts.Property)
-	}
 	if opts.FailThreshold != "" {
 		arguments = append(arguments, "--fail-threshold", opts.FailThreshold)
 	}
@@ -203,6 +201,9 @@ func GetCmdOptions(opts *QodanaOptions) []string {
 	if opts.AnalysisId != "" {
 		arguments = append(arguments, "--analysis-id", opts.AnalysisId)
 	}
+	for _, property := range opts.Property {
+		arguments = append(arguments, "--property="+property)
+	}
 	return arguments
 }