Handle units in some YAML settings (post CASSANDRA-15234)

montecristo/src/main/kotlin/com/datastax/montecristo/model/application/CassandraYaml.kt

@@ -31,7 +31,9 @@ data class CassandraYaml(val data : JsonNode)  : YamlConfig(data) {
     val partitioner get() = get("partitioner")
     val memtableAllocationType get() = get("memtable_allocation_type")
     val authorizer get() = get("authorizer")
-    private val rowCacheSizeInMB get() = (get("row_cache_size","0")).toInt()
+    val rowCacheSizeInMB get() = (
+            get("row_cache_size", "0").replace("\\D+".toRegex(), "")
+            ).toInt()
      fun isRowCacheEnabled(): Boolean {
         return (rowCacheSizeInMB.toString().toInt() > 0)
     }

montecristo/src/test/kotlin/com/datastax/montecristo/model/application/YamlConfigTest.kt

@@ -16,10 +16,13 @@
 
 package com.datastax.montecristo.model.application
 
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import org.assertj.core.api.Assertions
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
 import org.junit.Before
 import org.junit.Test
 import java.io.File
@@ -28,21 +31,36 @@ internal class YamlConfigTest {
     lateinit var yamlNoFile: YamlConfig
     lateinit var yamlWithFile: YamlConfig
 
-    @Before
-    fun setUp() {
-        yamlNoFile = YamlConfig(JsonNodeFactory.instance.objectNode())
-
-        val yamlFile = File(this.javaClass.getResource("/helpers/generic.yaml").path)
+    private fun openYamlFile(filePath: String): JsonNode {
+        val yamlFile = File(this.javaClass.getResource(filePath).path)
         val yamlReader = ObjectMapper(YAMLFactory())
         val obj = yamlReader.readValue(yamlFile.readText(), Any::class.java)
         val jsonWriter = ObjectMapper()
         val json = jsonWriter.readTree(jsonWriter.writeValueAsString(obj))
-        yamlWithFile = YamlConfig(json)
+        return json
+    }
+
+    @Before
+    fun setUp() {
+        yamlNoFile = YamlConfig(JsonNodeFactory.instance.objectNode())
+        yamlWithFile = YamlConfig(openYamlFile("/helpers/generic.yaml"))
     }
 
     @Test
     fun testIsEmpty() {
         Assertions.assertThat(yamlNoFile.isEmpty())
         Assertions.assertThat(!yamlWithFile.isEmpty())
     }
-}
+
+    @Test
+    fun testParseRowCache() {
+        var yamlFile = openYamlFile("/helpers/rowCacheEnabled.yaml")
+        var cassandraYaml = CassandraYaml(yamlFile)
+        assertTrue(cassandraYaml.isRowCacheEnabled())
+
+        yamlFile = openYamlFile("/helpers/rowCacheDisabled.yaml")
+        cassandraYaml = CassandraYaml(yamlFile)
+        // this should fail but the Assertions are somehow not effective
+        assertFalse(cassandraYaml.isRowCacheEnabled())
+    }
+}

montecristo/src/test/resources/helpers/rowCacheDisabled.yaml

@@ -0,0 +1,2 @@
+row_cache_size: 0MiB
+key: "value"

montecristo/src/test/resources/helpers/rowCacheEnabled.yaml

@@ -0,0 +1,2 @@
+row_cache_size: 1
+key: "value"