Skip to content

Addition of the username property to RedisConfiguration #218

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

Open
pi-gm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Addition of the username property to RedisConfiguration #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Sources/Redis/RedisConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public struct RedisConfiguration: Sendable {
public typealias ValidationError = RedisConnection.Configuration.ValidationError

public var serverAddresses: [SocketAddress]
public var username: String?
public var password: String?
public var database: Int?
public var pool: PoolOptions
Expand Down Expand Up @@ -66,6 +67,7 @@ public struct RedisConfiguration: Sendable {
try self.init(
hostname: host,
port: url.port ?? RedisConnection.Configuration.defaultPort,
username: url.user,
password: url.password,
tlsConfiguration: defaultTLSConfig,
database: Int(url.lastPathComponent),
Expand All @@ -76,6 +78,7 @@ public struct RedisConfiguration: Sendable {
public init(
hostname: String,
port: Int = RedisConnection.Configuration.defaultPort,
username: String? = nil,
password: String? = nil,
tlsConfiguration: TLSConfiguration? = nil,
database: Int? = nil,
Expand All @@ -85,6 +88,7 @@ public struct RedisConfiguration: Sendable {

try self.init(
serverAddresses: [.makeAddressResolvingHost(hostname, port: port)],
username: username,
password: password,
tlsConfiguration: tlsConfiguration,
tlsHostname: hostname,
Expand All @@ -95,13 +99,15 @@ public struct RedisConfiguration: Sendable {

public init(
serverAddresses: [SocketAddress],
username: String? = nil,
password: String? = nil,
tlsConfiguration: TLSConfiguration? = nil,
tlsHostname: String? = nil,
database: Int? = nil,
pool: PoolOptions = .init()
) throws {
self.serverAddresses = serverAddresses
self.username = username
self.password = password
self.tlsConfiguration = tlsConfiguration
self.tlsHostname = tlsHostname
Expand All @@ -117,6 +123,7 @@ extension RedisConnectionPool.Configuration {
maximumConnectionCount: config.pool.maximumConnectionCount,
connectionFactoryConfiguration: .init(
connectionInitialDatabase: config.database,
connectionUsername: config.username,
connectionPassword: config.password,
connectionDefaultLogger: defaultLogger,
tcpClient: customClient
Expand Down