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.

Sign up for GitHub

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

Jump to bottom

Update zio-config to 4.0.1 #932

Merged
merged 7 commits into from
Feb 15, 2024
Merged

Update zio-config to 4.0.1 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
062b848
Update zio-config to 4.0.1
drmarjanovic Feb 8, 2024
c71ff55
Fix code remarks
drmarjanovic Feb 10, 2024
d54d8e3
Format code
drmarjanovic Feb 10, 2024
d66941d
Extract layer to AppConfig
drmarjanovic Feb 10, 2024
37383cc
Move provider to bootstrap
drmarjanovic Feb 14, 2024
f996cf3
Adapt layer constructing
drmarjanovic Feb 14, 2024
99b7ea0
Remove 'fromZIO'
drmarjanovic Feb 14, 2024
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
8 changes: 8 additions & 0 deletions modules/example/src/main/scala/zio/redis/example/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,24 @@

package zio.redis.example

import com.typesafe.config.ConfigFactory
import sttp.client3.httpclient.zio.HttpClientZioBackend
import zhttp.service.Server
import zio._
import zio.config.typesafe.TypesafeConfigProvider
import zio.redis._
import zio.redis.example.api.Api
import zio.redis.example.config.AppConfig
import zio.schema.Schema
import zio.schema.codec.{BinaryCodec, ProtobufCodec}

object Main extends ZIOAppDefault {

override val bootstrap: Layer[Nothing, Unit] = {
val provider = TypesafeConfigProvider.fromTypesafeConfig(ConfigFactory.load.getConfig("example"))
Runtime.setConfigProvider(provider)
}

def run: ZIO[ZIOAppArgs with Scope, Any, ExitCode] =
Server
.start(9000, Api.routes)
Expand Down
15 changes: 4 additions & 11 deletions modules/example/src/main/scala/zio/redis/example/config/AppConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,16 @@

package zio.redis.example.config

import com.typesafe.config.ConfigFactory
import zio._
import zio.config.ReadError
import zio.config.magnolia.descriptor
import zio.config.syntax._
import zio.config.typesafe.TypesafeConfig
import zio.config.magnolia.deriveConfig
import zio.redis.RedisConfig
import zio.{Config, Layer, ZIO, ZLayer}

final case class AppConfig(redis: RedisConfig)

object AppConfig {
type Env = AppConfig with RedisConfig

private[this] final val Config = ZIO.attempt(ConfigFactory.load.getConfig("example"))
private[this] final val Descriptor = descriptor[AppConfig]
private[this] final val config = ZIO.config(deriveConfig[AppConfig])

lazy val layer: ZLayer[Any, ReadError[String], Env] =
TypesafeConfig.fromTypesafeConfig(Config, Descriptor) >+>
ZLayer.service[AppConfig].narrow(_.redis)
final val layer: Layer[Config.Error, Env] = ZLayer(config) ++ ZLayer(config.map(_.redis))
}
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {
val Sttp = "3.9.2"
val TlsChannel = "0.8.1"
val ZHttp = "2.0.0-RC11"
val ZioConfig = "3.0.7"
val ZioConfig = "4.0.1"
val ZioJson = "0.6.2"
val ZioSchema = "0.4.17"
val ZioTestContainers = "0.4.1"
Expand Down
Loading