feat: Add RuleLevel enum to the config file

felipebz · felipebz · commit 44e980af940d · 2024-07-11T21:41:44.000-03:00
diff --git a/src/main/kotlin/br/com/felipezorzo/zpa/cli/Main.kt b/src/main/kotlin/br/com/felipezorzo/zpa/cli/Main.kt
@@ -110,7 +110,7 @@ class Main(private val args: Arguments) {
                     ActiveRuleConfiguration(
                         repositoryKey,
                         ruleKey,
-                        it.value.options.level,
+                        it.value.options.level.toString(),
                         it.value.options.parameters
                     )
                 })
diff --git a/src/main/kotlin/br/com/felipezorzo/zpa/cli/config/ConfigFile.kt b/src/main/kotlin/br/com/felipezorzo/zpa/cli/config/ConfigFile.kt
@@ -1,12 +1,15 @@
 package br.com.felipezorzo.zpa.cli.config
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.*
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 
+@JsonIgnoreProperties(value = ["\$schema"])
 data class ConfigFile(
     val rules: Map<String, RuleConfiguration>
 )
@@ -17,11 +20,25 @@ class RuleConfiguration {
     var options: RuleOptions = RuleOptions()
 }
 
+enum class RuleLevel {
+    @JsonProperty("on")
+    ON,
+    @JsonProperty("off")
+    OFF,
+    @JsonProperty("blocker")
+    BLOCKER,
+    @JsonProperty("critical")
+    CRITICAL,
+    @JsonProperty("major")
+    MAJOR,
+    @JsonProperty("minor")
+    MINOR,
+    @JsonProperty("info")
+    INFO
+}
+
 class RuleOptions {
-    var level: String? = null
-        set(value) {
-            field = value?.lowercase()
-        }
+    lateinit var level: RuleLevel
     var parameters: Map<String, String> = emptyMap()
 }
 
@@ -32,7 +49,7 @@ class RuleCategoryDeserializer : JsonDeserializer<RuleConfiguration>() {
         val mapper = jacksonObjectMapper()
 
         if (node.isTextual) {
-            ruleConfiguration.options.level = node.asText().uppercase()
+            ruleConfiguration.options.level = RuleLevel.valueOf(node.asText().uppercase())
         } else if (node.isObject) {
             ruleConfiguration.options = mapper.treeToValue(node, RuleOptions::class.java)
         }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class Main(private val args: Arguments) {`
`110`	`110`	`ActiveRuleConfiguration(`
`111`	`111`	`repositoryKey,`
`112`	`112`	`ruleKey,`
`113`		`- it.value.options.level,`
	`113`	`+ it.value.options.level.toString(),`
`114`	`114`	`it.value.options.parameters`
`115`	`115`	`)`
`116`	`116`	`})`