🐛 Cli option takes precedence over the YAML (#348)

JetBrains · May 3, 2024 · c932f22 · c932f22
1 parent 774bc8c
commit c932f22
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/platform/run.go b/platform/run.go
@@ -67,7 +67,7 @@ func RunAnalysis(options *QodanaOptions) (int, error) {
 	}
 	log.Debugf("Java executable path: %s", mountInfo.JavaPath)
 
-	thresholds := getFailureThresholds(yaml)
+	thresholds := getFailureThresholds(yaml, options)
 	var analysisResult int
 	if analysisResult, err = computeBaselinePrintResults(options, mountInfo, thresholds); err != nil {
 		ErrorMessage(err.Error())

diff --git a/platform/thresholds.go b/platform/thresholds.go
@@ -28,7 +28,7 @@ const severityModerate = "moderate"
 const severityLow = "low"
 const severityInfo = "info"
 
-func getFailureThresholds(yaml *QodanaYaml) map[string]string {
+func getFailureThresholds(yaml *QodanaYaml, options *QodanaOptions) map[string]string {
 	ret := make(map[string]string)
 	if yaml.FailThreshold != nil {
 		ret[severityAny] = strconv.Itoa(*yaml.FailThreshold)
@@ -54,6 +54,10 @@ func getFailureThresholds(yaml *QodanaYaml) map[string]string {
 			ret[severityInfo] = strconv.Itoa(*thresholds.Info)
 		}
 	}
+	if options.FailThreshold != "" { // console option overrides the behavior
+		ret = make(map[string]string)
+		ret[severityAny] = options.FailThreshold
+	}
 	return ret
 }
 

diff --git a/platform/thresholds_test.go b/platform/thresholds_test.go
@@ -27,16 +27,19 @@ func TestFailureThresholds(t *testing.T) {
 	for _, testData := range []struct {
 		name     string
 		yaml     string
+		option   string
 		expected string
 	}{
 		{
 			name:     "empty",
 			yaml:     "",
+			option:   "",
 			expected: "",
 		},
 		{
 			name:     "failThreshold set to 0",
 			yaml:     `failThreshold: 0`,
+			option:   "",
 			expected: " --threshold-any=0",
 		},
 		{
@@ -50,6 +53,7 @@ func TestFailureThresholds(t *testing.T) {
     low: 5
     info: 6
 `,
+			option:   "",
 			expected: " --threshold-any=1 --threshold-critical=2 --threshold-high=3 --threshold-info=6 --threshold-low=5 --threshold-moderate=4",
 		},
 		{
@@ -64,6 +68,7 @@ func TestFailureThresholds(t *testing.T) {
     info: 6
 failThreshold: 123
 `,
+			option:   "",
 			expected: " --threshold-any=1 --threshold-critical=2 --threshold-high=3 --threshold-info=6 --threshold-low=5 --threshold-moderate=4",
 		},
 		{
@@ -77,8 +82,23 @@ failThreshold: 123
     info: 6
 failThreshold: 123
 `,
+			option:   "",
 			expected: " --threshold-any=123 --threshold-critical=2 --threshold-high=3 --threshold-info=6 --threshold-low=5 --threshold-moderate=4",
 		},
+		{
+			name: "cli option ovevrrides yaml settings",
+			yaml: `failureConditions:
+  severityThresholds:
+    any: 1
+    critical: 2
+    high: 3
+    moderate: 4
+    low: 5
+    info: 6
+`,
+			option:   "123",
+			expected: " --threshold-any=123",
+		},
 	} {
 		t.Run(testData.name, func(t *testing.T) {
 			tempDir := t.TempDir()
@@ -89,7 +109,7 @@ failThreshold: 123
 				}
 			}
 			yaml := LoadQodanaYaml(tempDir, "qodana.yaml")
-			thresholds := getFailureThresholds(yaml)
+			thresholds := getFailureThresholds(yaml, &QodanaOptions{FailThreshold: testData.option})
 			thresholdArgs := thresholdsToArgs(thresholds)
 			sort.Strings(thresholdArgs)
 			argString := ""