Update strings to not include .

Author: adam-fowler

Sources/Hummingbird/Application+ConfigReader.swift

@@ -23,8 +23,8 @@ extension ApplicationConfiguration {
     /// - Configuration keys:
     ///   - `host` (string, optional, default: "127.0.0.1"): Hostname or IP to bind server to
     ///   - `port` (int, optional, default: 8080): Port to bind server to
-    ///   - `unix.domain.socket` (string, optional): Unix domain socket name
-    ///   - `server.name` (string, optional): Server name reported in HTTP headers
+    ///   - `unixDomainSocket` (string, optional): Unix domain socket name
+    ///   - `serverName` (string, optional): Server name reported in HTTP headers
     ///
     /// - Parameters
     ///   - reader: ConfigReader
@@ -33,10 +33,10 @@ extension ApplicationConfiguration {
         if let hostname = reader.string(forKey: "host") {
             let port = reader.int(forKey: "port", default: 8080)
             configuration.address = .hostname(hostname, port: port)
-        } else if let unixDomainSocket = reader.string(forKey: "unix.domain.socket") {
+        } else if let unixDomainSocket = reader.string(forKey: "unixDomainSocket") {
             configuration.address = .unixDomainSocket(path: unixDomainSocket)
         }
-        if let serverName = reader.string(forKey: "server.name") {
+        if let serverName = reader.string(forKey: "serverName") {
             configuration.serverName = serverName
         }
         self = configuration

Sources/HummingbirdCore/Server/HTTP/HTTP1Channel+ConfigReader.swift

@@ -21,13 +21,13 @@ extension HTTP1Channel.Configuration {
     /// Initialize a HTTP1Channel.Configuration from a ConfigReader
     ///
     /// - Configuration keys
-    ///   - `idle.timeout` (double, optional): Time in seconds a connection can be left idle before closing
+    ///   - `idleTimeout` (double, optional): Time in seconds a connection can be left idle before closing
     ///
     /// - Parameters
     ///   - reader: ConfigReader
     public init(reader: ConfigReader) {
         var configuration = Self()
-        if let idleTimeout = reader.double(forKey: "idle.timeout") {
+        if let idleTimeout = reader.double(forKey: "idleTimeout") {
             configuration.idleTimeout = .nanoseconds(Int64(idleTimeout * 1_000_000_000))
         }
         self = configuration

Sources/HummingbirdHTTP2/HTTP2Channel+ConfigReader.swift

@@ -22,26 +22,26 @@ extension HTTP2Channel.Configuration {
     /// Initialize a HTTP2Channel.Configuration from a ConfigReader
     ///
     /// - Configuration Keys
-    ///   - `h2.idle.timeout` (double optional): Time in seconds before an HTTP2 connection should be closed.
-    ///   - `h2.graceful.close.timeout` (double optional): Time in seconds to wait for client response after
+    ///   - `h2.idleTimeout` (double optional): Time in seconds before an HTTP2 connection should be closed.
+    ///   - `h2.gracefulCloseTimeout` (double optional): Time in seconds to wait for client response after
     ///     all streams have been closed.
-    ///   - `h2.max.age.timeout` (double optional): Maximum time in seconds a connection can stay open.
+    ///   - `h2.maxAgeTimeout` (double optional): Maximum time in seconds a connection can stay open.
     ///   - `h2.stream`: HTTP2 stream options. See ``HummingbirdCore/HTTP1Channel/Configuration/init(reader:)``
     ///
     /// - Parameters
     ///   - reader: ConfigReader
     public init(reader: ConfigReader) {
         var configuration = Self()
-        if let idleTimeout = reader.double(forKey: "h2.idle.timeout") {
+        if let idleTimeout = reader.double(forKey: "http2.idleTimeout") {
             configuration.idleTimeout = .seconds(idleTimeout)
         }
-        if let gracefulCloseTimeout = reader.double(forKey: "h2.graceful.close.timeout") {
+        if let gracefulCloseTimeout = reader.double(forKey: "http2.gracefulCloseTimeout") {
             configuration.gracefulCloseTimeout = .seconds(gracefulCloseTimeout)
         }
-        if let maxAgeTimeout = reader.double(forKey: "h2.max.age.timeout") {
+        if let maxAgeTimeout = reader.double(forKey: "http2.maxAgeTimeout") {
             configuration.maxAgeTimeout = .seconds(maxAgeTimeout)
         }
-        let streamReader = reader.scoped(to: "h2.stream")
+        let streamReader = reader.scoped(to: "http2.stream")
         configuration.streamConfiguration = HTTP1Channel.Configuration(reader: streamReader)
         self = configuration
     }

Sources/HummingbirdTLS/TLSChannel+ConfigReader.swift

@@ -32,20 +32,20 @@ extension TLSChannelConfiguration {
     /// Initialize a TLSChannelConfiguration from a ConfigReader
     ///
     /// - Configuration Keys
-    ///   - `tls.certificate.chain` (string, required): TLS certificate chain in PEM format
-    ///   - `tls.private.key` (string required): TLS private key in PEM format
-    ///   - `tls.trust.roots` (string optional): TLS trust roots in PEM format
+    ///   - `tls.certificateChain` (string, required): TLS certificate chain in PEM format
+    ///   - `tls.privateKey` (string required): TLS private key in PEM format
+    ///   - `tls.trustRoots` (string optional): TLS trust roots in PEM format
     ///
     /// - Parameter reader: ConfigReader
     /// - Throws: TLSConfigError if "tls.certificate.chain" or "tls.private.key" values are missing
     public init(reader: ConfigReader) throws {
-        guard let certificateChainPEM = reader.string(forKey: "tls.certificate.chain") else {
+        guard let certificateChainPEM = reader.string(forKey: "tls.certificateChain") else {
             throw TLSConfigError.missingCertificateChain
         }
-        guard let privateKeyPEM = reader.string(forKey: "tls.private.key") else {
+        guard let privateKeyPEM = reader.string(forKey: "tls.privateKey") else {
             throw TLSConfigError.missingPrivateKey
         }
-        let trustRootsPEM = reader.string(forKey: "tls.trust.roots")
+        let trustRootsPEM = reader.string(forKey: "tls.trustRoots")
 
         let certificateChain = try NIOSSLCertificate.fromPEMBytes([UInt8](certificateChainPEM.utf8))
         let privateKey = try NIOSSLPrivateKey(bytes: [UInt8](privateKeyPEM.utf8), format: .pem)

Tests/HummingbirdHTTP2Tests/ConfigReaderTests.swift

@@ -26,9 +26,9 @@ struct ConfigReaderTests {
         let configReader = ConfigReader(
             providers: [
                 InMemoryProvider(values: [
-                    "tls.certificate.chain": .init(stringLiteral: serverCertificateData),
-                    "tls.private.key": .init(stringLiteral: serverPrivateKeyData),
-                    "tls.trust.roots": .init(stringLiteral: caCertificateData),
+                    "tls.certificateChain": .init(stringLiteral: serverCertificateData),
+                    "tls.privateKey": .init(stringLiteral: serverPrivateKeyData),
+                    "tls.trustRoots": .init(stringLiteral: caCertificateData),
                 ])
             ]
         )
@@ -46,10 +46,10 @@ struct ConfigReaderTests {
         let configReader = ConfigReader(
             providers: [
                 InMemoryProvider(values: [
-                    "h2.idle.timeout": 46.0,
-                    "h2.max.age.timeout": 500.5,
-                    "h2.graceful.close.timeout": 2.25,
-                    "h2.stream.idle.timeout": 15.0,
+                    "http2.idleTimeout": 46.0,
+                    "http2.maxAgeTimeout": 500.5,
+                    "http2.gracefulCloseTimeout": 2.25,
+                    "http2.stream.idleTimeout": 15.0,
                 ])
             ]
         )

Tests/HummingbirdTests/ConfigReaderTests.swift

@@ -29,7 +29,7 @@ struct ConfigReaderTests {
                 InMemoryProvider(values: [
                     "http.host": "0.0.0.0",
                     "http.port": 12300,
-                    "http.server.name": "Test HB",
+                    "http.serverName": "Test HB",
                 ])
             ]
         )
@@ -45,7 +45,7 @@ struct ConfigReaderTests {
         let configReader = ConfigReader(
             providers: [
                 InMemoryProvider(values: [
-                    "http.unix.domain.socket": "/tmp/hb"
+                    "http.unixDomainSocket": "/tmp/hb"
                 ])
             ]
         )
@@ -60,7 +60,7 @@ struct ConfigReaderTests {
         let configReader = ConfigReader(
             providers: [
                 InMemoryProvider(values: [
-                    "idle.timeout": 65.0
+                    "idleTimeout": 65.0
                 ])
             ]
         )