Add support SSL/TLS connection (832) #930
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
mijicd
reviewed
Feb 1, 2024
Comment on lines
20
to
23
| override def toString: String = ssl match { | ||
| case true => s"rediss://$host:$port" | ||
| case false => s"redis://$host:$port" | ||
| } |
There was a problem hiding this comment.
Suggested change
| override def toString: String = ssl match { | |
| case true => s"rediss://$host:$port" | |
| case false => s"redis://$host:$port" | |
| } | |
| override def toString: String = | |
| if (ssl) s"rediss://$host:$port" else s"redis://$host:$port" |
| @@ -101,7 +101,7 @@ object Output { | |||
| val host = MultiStringOutput.unsafeDecode(values(0)) | |||
| val port = LongOutput.unsafeDecode(values(1)) | |||
| val nodeId = MultiStringOutput.unsafeDecode(values(2)) | |||
| Node(nodeId, RedisUri(host, port.toInt)) | |||
| Node(nodeId, RedisUri(host, port.toInt, false, None)) | |||
| ZIO.attempt(docker.getServiceHost(s"cluster-node-$n", port)).map(host => RedisUri(host, port)) | ||
| ZIO | ||
| .attempt(docker.getServiceHost(s"cluster-node-$n", port)) | ||
| .map(host => RedisUri(host, port, false, None)) |
There was a problem hiding this comment.
RedisUri change looks unnecessary (see RedisUri.apply).
| @@ -31,7 +31,7 @@ trait BaseSpec extends ZIOSpecDefault { | |||
| for { | |||
| docker <- ZIO.service[DockerComposeContainer] | |||
| hostAndPort <- docker.getHostAndPort(BaseSpec.MasterNode)(6379) | |||
| uri = RedisUri(hostAndPort._1, hostAndPort._2) | |||
| uri = RedisUri(hostAndPort._1, hostAndPort._2, false, None) | |||
There was a problem hiding this comment.
It looks unnecessary (see RedisUri.apply).
Comment on lines
24
to
25
| ssl: Boolean = false, | ||
| sni: Option[String] = None, |
There was a problem hiding this comment.
Please keep the alphabetical ordering.
| @@ -161,7 +161,7 @@ private[redis] object ClusterExecutor { | |||
| private def redis(address: RedisUri) = | |||
| for { | |||
| closableScope <- Scope.make | |||
| configLayer = ZLayer.succeed(RedisConfig(address.host, address.port)) | |||
| configLayer = ZLayer.succeed(RedisConfig(address.host, address.port, address.ssl)) | |||
Comment on lines
97
to
100
| channel <- ssl match { | ||
| case true => openTlsChannel(address, sni) | ||
| case false => openChannel(address) | ||
| } |
There was a problem hiding this comment.
Suggested change
| channel <- ssl match { | |
| case true => openTlsChannel(address, sni) | |
| case false => openChannel(address) | |
| } | |
| channel <- if (ssl) openTlsChannel(address, sni) else openChannel(address) |
| val sslContext = SSLContext.getDefault() | ||
| val sslEngine = sslContext.createSSLEngine() | ||
| val params = sslEngine.getSSLParameters | ||
| sni match { |
| rawChannel.finishConnect() | ||
| rawChannel.register(selector, SelectionKey.OP_WRITE) | ||
| val channelGroup = new AsynchronousTlsChannelGroup() | ||
| val channel = new AsynchronousTlsChannel(channelGroup, tlsChannel, rawChannel) |
| ): ZIO[Scope, IOException, AsynchronousTlsChannel] = | ||
| ZIO.fromAutoCloseable { | ||
| for { | ||
| channel <- ZIO.attempt { |
There was a problem hiding this comment.
I'd extract the attempt block into a function, something like createChannel
mijicd
previously approved these changes
Feb 8, 2024
modules/redis/src/main/scala/zio/redis/internal/RedisConnection.scala
Outdated
Show resolved
Hide resolved
mijicd
approved these changes
Feb 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #832
Hi,
I added support for SSL/TLS