Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve config substitutions #185

Merged
merged 1 commit into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/Hocon.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Hocon extends HoconConfigDecoders {
hoconAt(ConfigFactory.load())(path)

def hoconAt(config: Config)(path: String): HoconAt =
new HoconAt(config, path)
new HoconAt(config.resolve(), path)
}

trait HoconConfigDecoders {
Expand Down
27 changes: 17 additions & 10 deletions src/test/scala/HoconSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import munit.CatsEffectSuite
class HoconSpec extends CatsEffectSuite {
import lt.dvim.ciris.Hocon._

private val config = ConfigFactory.parseString("""
private val config = ConfigFactory.parseString(s"""
|nested {
| config {
| int = 2
Expand All @@ -33,30 +33,34 @@ class HoconSpec extends CatsEffectSuite {
| per = 2 weeks
| }
|}
|subst {
| int = $${nested.config.int}
|}
""".stripMargin)

private val hocon = hoconAt(config)("nested.config")
private val nested = hoconAt(config)("nested.config")
private val subst = hoconAt(config)("subst")

test("parse Int") {
hocon("int").as[Int].load[IO] assertEquals 2
nested("int").as[Int].load[IO] assertEquals 2
}
test("parse String") {
hocon("str").as[String].load[IO] assertEquals "labas"
nested("str").as[String].load[IO] assertEquals "labas"
}
test("parse java Duration") {
hocon("dur").as[java.time.Duration].load[IO] assertEquals java.time.Duration.ofMillis(10)
nested("dur").as[java.time.Duration].load[IO] assertEquals java.time.Duration.ofMillis(10)
}
test("parse scala Duration") {
hocon("dur").as[FiniteDuration].load[IO] assertEquals 10.millis
nested("dur").as[FiniteDuration].load[IO] assertEquals 10.millis
}
test("parse Boolean") {
hocon("bool").as[Boolean].load[IO] assertEquals true
nested("bool").as[Boolean].load[IO] assertEquals true
}
test("parse Period") {
hocon("per").as[java.time.Period].load[IO] assertEquals java.time.Period.ofWeeks(2)
nested("per").as[java.time.Period].load[IO] assertEquals java.time.Period.ofWeeks(2)
}
test("handle missing") {
hocon("missing")
nested("missing")
.as[Int]
.attempt[IO]
.map {
Expand All @@ -66,7 +70,7 @@ class HoconSpec extends CatsEffectSuite {
.assertEquals("Missing nested.config.missing")
}
test("handle decode error") {
hocon("str")
nested("str")
.as[Int]
.attempt[IO]
.map {
Expand All @@ -75,4 +79,7 @@ class HoconSpec extends CatsEffectSuite {
}
.assertEquals("Nested.config.str with value labas cannot be converted to Int")
}
test("resolve substitutions") {
subst("int").as[Int].load[IO] assertEquals 2
}
}