First round of reviews

Author: fabianfett

Diff for: Sources/AsyncHTTPClient/ConnectionPool.swift

@@ -243,7 +243,7 @@ class HTTP1ConnectionProvider {
 
         self.factory = HTTPConnectionPool.ConnectionFactory(
             key: self.key,
-            tlsConfiguration: tlsConfiguration ?? configuration.tlsConfiguration ?? .forClient(),
+            tlsConfiguration: tlsConfiguration,
             clientConfiguration: self.configuration,
             sslContextCache: sslContextCache
         )
@@ -455,7 +455,7 @@ class HTTP1ConnectionProvider {
                              logger: Logger) -> EventLoopFuture<Channel> {
         let connectionID = HTTPConnectionPool.Connection.ID.globalGenerator.next()
         let eventLoop = preference.bestEventLoop ?? self.eventLoop
-        return self.factory.makeBestChannel(connectionID: connectionID, eventLoop: eventLoop, logger: logger).flatMapThrowing {
+        return self.factory.makeChannel(connectionID: connectionID, eventLoop: eventLoop, logger: logger).flatMapThrowing {
             (channel, _) -> Channel in
 
             // add the http1.1 channel handlers

Diff for: Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Factory.swift

@@ -47,8 +47,7 @@ extension HTTPConnectionPool {
 }
 
 extension HTTPConnectionPool.ConnectionFactory {
-    func makeBestChannel(connectionID: HTTPConnectionPool.Connection.ID, eventLoop: EventLoop, logger: Logger) -> EventLoopFuture<(Channel, HTTPVersion)> {
-        
+    func makeChannel(connectionID: HTTPConnectionPool.Connection.ID, eventLoop: EventLoop, logger: Logger) -> EventLoopFuture<(Channel, HTTPVersion)> {
         if self.key.scheme.isProxyable, let proxy = self.clientConfiguration.proxy {
             switch proxy.type {
             case .socks:
@@ -57,11 +56,11 @@ extension HTTPConnectionPool.ConnectionFactory {
                 return self.makeHTTPProxyChannel(proxy, connectionID: connectionID, eventLoop: eventLoop, logger: logger)
             }
         } else {
-            return self.makeChannel(eventLoop: eventLoop, logger: logger)
+            return self.makeNonProxiedChannel(eventLoop: eventLoop, logger: logger)
         }
     }
 
-    private func makeChannel(eventLoop: EventLoop, logger: Logger) -> EventLoopFuture<(Channel, HTTPVersion)> {
+    private func makeNonProxiedChannel(eventLoop: EventLoop, logger: Logger) -> EventLoopFuture<(Channel, HTTPVersion)> {
         switch self.key.scheme {
         case .http, .http_unix, .unix:
             return self.makePlainChannel(eventLoop: eventLoop).map { ($0, .http1_1) }
@@ -128,7 +127,7 @@ extension HTTPConnectionPool.ConnectionFactory {
             }
         }
     }
-    
+
     private func makeSOCKSProxyChannel(
         _ proxy: HTTPClient.Configuration.Proxy,
         connectionID: HTTPConnectionPool.Connection.ID,
@@ -144,7 +143,8 @@ extension HTTPConnectionPool.ConnectionFactory {
 
             let socksConnectHandler = SOCKSClientHandler(
                 targetAddress: .domain(self.key.host, port: self.key.port),
-                connectionEstablishedPromise: connectionEstablishedPromise)
+                connectionEstablishedPromise: connectionEstablishedPromise
+            )
 
             do {
                 try channel.pipeline.syncOperations.addHandler(socksConnectHandler)
@@ -159,7 +159,7 @@ extension HTTPConnectionPool.ConnectionFactory {
             }
         }
     }
-    
+
     private func setupTLSInProxyConnectionIfNeeded(_ channel: Channel, logger: Logger) -> EventLoopFuture<(Channel, HTTPVersion)> {
         switch self.key.scheme {
         case .unix, .http_unix, .https_unix:
@@ -301,9 +301,8 @@ extension HTTPConnectionPool.ConnectionFactory {
             .addTimeoutIfNeeded(self.clientConfiguration.timeout)
             .channelInitializer { channel in
                 sslContextFuture.flatMap { (sslContext) -> EventLoopFuture<Void> in
-                    let sync = channel.pipeline.syncOperations
-
                     do {
+                        let sync = channel.pipeline.syncOperations
                         let sslHandler = try NIOSSLClientHandler(
                             context: sslContext,
                             serverHostname: hostname

Diff for: Tests/AsyncHTTPClientTests/HTTP1ProxyConnectHandlerTests.swift

@@ -22,7 +22,7 @@ class HTTP1ProxyConnectHandlerTests: XCTestCase {
         let embedded = EmbeddedChannel()
         defer { XCTAssertNoThrow(try embedded.finish(acceptAlreadyClosed: false)) }
 
-        let socketAddress = try! SocketAddress(ipAddress: "127.0.0.1", port: 3000)
+        let socketAddress = try! SocketAddress.makeAddressResolvingHost("localhost", port: 3000)
         XCTAssertNoThrow(try embedded.connect(to: socketAddress).wait())
 
         let connectPromise = embedded.eventLoop.makePromise(of: Void.self)
@@ -57,7 +57,7 @@ class HTTP1ProxyConnectHandlerTests: XCTestCase {
     func testProxyConnectWithAuthorization() {
         let embedded = EmbeddedChannel()
 
-        let socketAddress = try! SocketAddress(ipAddress: "127.0.0.1", port: 3000)
+        let socketAddress = try! SocketAddress.makeAddressResolvingHost("localhost", port: 3000)
         XCTAssertNoThrow(try embedded.connect(to: socketAddress).wait())
 
         let connectPromise = embedded.eventLoop.makePromise(of: Void.self)
@@ -92,7 +92,7 @@ class HTTP1ProxyConnectHandlerTests: XCTestCase {
     func testProxyConnectWithoutAuthorizationFailure500() {
         let embedded = EmbeddedChannel()
 
-        let socketAddress = try! SocketAddress(ipAddress: "127.0.0.1", port: 3000)
+        let socketAddress = try! SocketAddress.makeAddressResolvingHost("localhost", port: 3000)
         XCTAssertNoThrow(try embedded.connect(to: socketAddress).wait())
 
         let connectPromise = embedded.eventLoop.makePromise(of: Void.self)
@@ -130,7 +130,7 @@ class HTTP1ProxyConnectHandlerTests: XCTestCase {
     func testProxyConnectWithoutAuthorizationButAuthorizationNeeded() {
         let embedded = EmbeddedChannel()
 
-        let socketAddress = try! SocketAddress(ipAddress: "127.0.0.1", port: 3000)
+        let socketAddress = try! SocketAddress.makeAddressResolvingHost("localhost", port: 3000)
         XCTAssertNoThrow(try embedded.connect(to: socketAddress).wait())
 
         let connectPromise = embedded.eventLoop.makePromise(of: Void.self)
@@ -168,7 +168,7 @@ class HTTP1ProxyConnectHandlerTests: XCTestCase {
     func testProxyConnectReceivesBody() {
         let embedded = EmbeddedChannel()
 
-        let socketAddress = try! SocketAddress(ipAddress: "127.0.0.1", port: 3000)
+        let socketAddress = try! SocketAddress.makeAddressResolvingHost("localhost", port: 3000)
         XCTAssertNoThrow(try embedded.connect(to: socketAddress).wait())
 
         let connectPromise = embedded.eventLoop.makePromise(of: Void.self)