Skip to content

Commit 39c62db

Browse files
committed
Remove erroneous trailing separator in KubernetesClientConfig
1 parent 518c43c commit 39c62db

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

Sources/SwiftkubeClient/Config/KubernetesClientConfig.swift

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ extension KubernetesClientConfig {
8484
public static func from(
8585
kubeConfig: KubeConfig,
8686
timeout: HTTPClient.Configuration.Timeout? = nil,
87-
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? =
88-
nil,
87+
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? = nil,
8988
logger: Logger?
9089
) throws -> KubernetesClientConfig? {
9190
let timeout = timeout ?? .init()
@@ -117,8 +116,7 @@ extension KubernetesClientConfig {
117116
kubeConfig: KubeConfig,
118117
context: String,
119118
timeout: HTTPClient.Configuration.Timeout? = nil,
120-
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? =
121-
nil,
119+
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? = nil,
122120
logger: Logger?
123121
) throws -> KubernetesClientConfig? {
124122
let timeout = timeout ?? .init()
@@ -153,8 +151,7 @@ extension KubernetesClientConfig {
153151
/// - Returns: An instance of KubernetesClientConfig for the Swiftkube KubernetesClient
154152
public static func fromServiceAccount(
155153
timeout: HTTPClient.Configuration.Timeout? = nil,
156-
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? =
157-
nil,
154+
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration? = nil,
158155
logger: Logger? = SwiftkubeClient.loggingDisabled
159156
) throws -> KubernetesClientConfig? {
160157
let timeout = timeout ?? .init()
@@ -205,9 +202,7 @@ extension KubernetesClientConfig {
205202
namedContext.name == kubeConfig.currentContext
206203
}
207204

208-
internal static func contextSelector(context: String) -> (NamedContext, KubeConfig)
209-
-> Bool
210-
{
205+
internal static func contextSelector(context: String) -> (NamedContext, KubeConfig) -> Bool {
211206
{ namedContext, _ in
212207
namedContext.name == context
213208
}
@@ -217,7 +212,7 @@ extension KubernetesClientConfig {
217212
contextSelector: @escaping (NamedContext, KubeConfig) -> Bool,
218213
logger: Logger?,
219214
timeout: HTTPClient.Configuration.Timeout,
220-
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration,
215+
redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration
221216
) -> (KubeConfig) -> KubernetesClientConfig? {
222217
{ kubeConfig in
223218
guard
@@ -279,9 +274,7 @@ extension KubernetesClientConfig {
279274
}
280275
}
281276

282-
func loadTrustRoots(caFile: URL, logger: Logger?)
283-
-> NIOSSLTrustRoots?
284-
{
277+
func loadTrustRoots(caFile: URL, logger: Logger?) -> NIOSSLTrustRoots? {
285278
guard
286279
let caData = try? Data(contentsOf: caFile),
287280
let certificates = try? NIOSSLCertificate.fromPEMBytes(

0 commit comments

Comments
 (0)