Rename enforceTls to requireTls

Signed-off-by: Piotr Piotrowski <piotr@synadia.com>
nats-io · Feb 15, 2024 · cf2703f · cf2703f
1 parent 8ca251b
commit cf2703f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Sources/NatsSwift/NatsClient/NatsClientOptions.swift b/Sources/NatsSwift/NatsClient/NatsClientOptions.swift
@@ -75,7 +75,7 @@ public class ClientOptions {
         return self
     }
 
-    public func enforceTls() -> ClientOptions {
+    public func requireTls() -> ClientOptions {
         self.withTls = true
         return self
     }
@@ -105,7 +105,7 @@ public class ClientOptions {
             maxReconnects: maxReconnects,
             pingInterval: pingInterval,
             auth: auth,
-            withTls: withTls,
+            requireTls: withTls,
             tlsFirst: tlsFirst,
             clientCertificate: clientCertificate,
             clientKey: clientKey,

diff --git a/Sources/NatsSwift/NatsConnection.swift b/Sources/NatsSwift/NatsConnection.swift
@@ -26,7 +26,7 @@ class ConnectionHandler: ChannelInboundHandler {
     internal let reconnectWait: UInt64
     internal let maxReconnects: Int?
     internal let pingInterval: TimeInterval
-    internal let withTls: Bool
+    internal let requireTls: Bool
     internal let tlsFirst: Bool
     internal var rootCertificate: URL?
     internal var clientCertificate: URL?
@@ -137,7 +137,7 @@ class ConnectionHandler: ChannelInboundHandler {
     }
     init(
         inputBuffer: ByteBuffer, urls: [URL], reconnectWait: TimeInterval, maxReconnects: Int?,
-        pingInterval: TimeInterval, auth: Auth?, withTls: Bool, tlsFirst: Bool,
+        pingInterval: TimeInterval, auth: Auth?, requireTls: Bool, tlsFirst: Bool,
         clientCertificate: URL?, clientKey: URL?,
         rootCertificate: URL?
     ) {
@@ -150,7 +150,7 @@ class ConnectionHandler: ChannelInboundHandler {
         self.maxReconnects = maxReconnects
         self.auth = auth
         self.pingInterval = pingInterval
-        self.withTls = withTls
+        self.requireTls = requireTls
         self.tlsFirst = tlsFirst
         self.clientCertificate = clientCertificate
         self.clientKey = clientKey
@@ -175,7 +175,7 @@ class ConnectionHandler: ChannelInboundHandler {
                             value: 1
                         )
                         .channelInitializer { channel in
-                            if self.withTls && self.tlsFirst {
+                            if self.requireTls && self.tlsFirst {
                                 var tlsConfiguration = TLSConfiguration.makeClientConfiguration()
                                 do {
                                     if let rootCertificate = self.rootCertificate {
@@ -239,7 +239,7 @@ class ConnectionHandler: ChannelInboundHandler {
             // Wait for the first message after sending the connect request
         }
         self.serverInfo = info
-        if (info.tlsRequired ?? false || self.withTls) && !self.tlsFirst {
+        if (info.tlsRequired ?? false || self.requireTls) && !self.tlsFirst {
             var tlsConfiguration = TLSConfiguration.makeClientConfiguration()
             if let rootCertificate = self.rootCertificate {
                 tlsConfiguration.trustRoots = .file(rootCertificate.path)

diff --git a/Tests/NatsSwiftTests/Integration/ConnectionTests.swift b/Tests/NatsSwiftTests/Integration/ConnectionTests.swift
@@ -261,7 +261,7 @@ class CoreNatsTests: XCTestCase {
         natsServer.start()
         let client = ClientOptions()
             .url(URL(string: "tls://demo.nats.io:4222")!)
-            .enforceTls()
+            .requireTls()
             .build()
 
         try await client.connect()
@@ -284,7 +284,7 @@ class CoreNatsTests: XCTestCase {
             "Integration/Resources/certs/rootCA.pem", isDirectory: false)
         let client = ClientOptions()
             .url(URL(string: natsServer.clientURL)!)
-            .enforceTls()
+            .requireTls()
             .rootCertificates(certsURL)
             .clientCertificate(
                 testsDir.appendingPathComponent(
@@ -314,7 +314,7 @@ class CoreNatsTests: XCTestCase {
             "Integration/Resources/certs/rootCA.pem", isDirectory: false)
         let client = ClientOptions()
             .url(URL(string: natsServer.clientURL)!)
-            .enforceTls()
+            .requireTls()
             .rootCertificates(certsURL)
             .clientCertificate(
                 testsDir.appendingPathComponent(
@@ -345,7 +345,7 @@ class CoreNatsTests: XCTestCase {
             "Integration/Resources/certs/rootCA.pem", isDirectory: false)
         let client = ClientOptions()
             .url(URL(string: natsServer.clientURL)!)
-            .enforceTls()
+            .requireTls()
             .rootCertificates(certsURL)
             .clientCertificate(
                 testsDir.appendingPathComponent(