diff --git a/src/main/scala/com/yotpo/metorikku/utils/FileUtils.scala b/src/main/scala/com/yotpo/metorikku/utils/FileUtils.scala index 6799accda..6514de8d5 100644 --- a/src/main/scala/com/yotpo/metorikku/utils/FileUtils.scala +++ b/src/main/scala/com/yotpo/metorikku/utils/FileUtils.scala @@ -2,7 +2,7 @@ package com.yotpo.metorikku.utils import java.io.{File, FileNotFoundException} -import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper} import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import com.yotpo.metorikku.exceptions.MetorikkuException import org.apache.commons.io.FilenameUtils @@ -41,8 +41,8 @@ object FileUtils { def getObjectMapperByExtension(fileName: String): Option[ObjectMapper] = { val extension = FilenameUtils.getExtension(fileName) extension match { - case "json" => Option(new ObjectMapper()) - case "yaml" => Option(new ObjectMapper(new YAMLFactory())) + case "json" => Option(new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)) + case "yaml" | "yml" | _ => Option(new ObjectMapper(new YAMLFactory()).configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)) } } } diff --git a/src/test/scala/com/yotpo/metorikku/test/MetorikkuTest.scala b/src/test/scala/com/yotpo/metorikku/test/MetorikkuTest.scala index 615c20bb8..2518d3e51 100644 --- a/src/test/scala/com/yotpo/metorikku/test/MetorikkuTest.scala +++ b/src/test/scala/com/yotpo/metorikku/test/MetorikkuTest.scala @@ -62,11 +62,4 @@ class MetorikkuTest extends FunSuite with BeforeAndAfterAll { } assert(thrown.getCause.getMessage.startsWith("cannot resolve '`non_existing_column`'")) } - - - test("Test Metorikku should Fail on invalid step type") { - assertThrows[MetorikkuInvalidMetricFileException] { - Metorikku.main(Array("-c", "src/test/scala/com/yotpo/metorikku/test/metorikku-test-config-invalid-step-type.yaml")) - } - } } \ No newline at end of file diff --git a/src/test/scala/com/yotpo/metorikku/test/metorikku-test-config-invalid-step-type.yaml b/src/test/scala/com/yotpo/metorikku/test/metorikku-test-config-invalid-step-type.yaml deleted file mode 100644 index c8d2f6062..000000000 --- a/src/test/scala/com/yotpo/metorikku/test/metorikku-test-config-invalid-step-type.yaml +++ /dev/null @@ -1,7 +0,0 @@ -metrics: - - src/test/calculations/invalid_metric_step_type/ -inputs: - employees: src/test/tables/employees.parquet -output: - file: - dir: src/test/out/