Skip to content

Commit 2a1ced0

Browse files
felixschlegelfelixschlegel
authored
Fix typo tlsConfiguaration -> tlsConfiguration (#116)
1 parent a8eb315 commit 2a1ced0

File tree

5 files changed

+29
-65
lines changed

5 files changed

+29
-65
lines changed

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ let package = Package(
4646
],
4747
dependencies: [
4848
.package(url: "https://github.com/apple/swift-nio.git", from: "2.55.0"),
49-
.package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.0.0-alpha.1"),
49+
.package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.0.0-beta.1"),
5050
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
5151
// The zstd Swift package produces warnings that we cannot resolve:
5252
// https://github.com/facebook/zstd/issues/3328

‎Sources/Kafka/Configuration/KafkaConfiguration+Security.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
extension KafkaConfiguration {
1616
// MARK: - TLSConfiguration
1717

18-
/// Use to configure an TLS connection.
18+
/// Use to configure a TLS connection.
1919
public struct TLSConfiguration: Sendable, Hashable {
2020
/// Certificate chain consisting of one leaf certificate and potentially multiple intermediate certificates.
2121
/// The public key of the leaf certificate will be used for authentication.
@@ -486,7 +486,7 @@ extension KafkaConfiguration {
486486
case plaintext
487487
case tls(configuration: TLSConfiguration)
488488
case saslPlaintext(mechanism: SASLMechanism)
489-
case saslTLS(saslMechanism: SASLMechanism, tlsConfiguaration: TLSConfiguration)
489+
case saslTLS(saslMechanism: SASLMechanism, tlsConfiguration: TLSConfiguration)
490490
}
491491

492492
private let _internal: _SecurityProtocol
@@ -513,10 +513,10 @@ extension KafkaConfiguration {
513513
/// Use the Simple Authentication and Security Layer (SASL) with TLS.
514514
public static func saslTLS(
515515
saslMechanism: SASLMechanism,
516-
tlsConfiguaration: TLSConfiguration = TLSConfiguration()
516+
tlsConfiguration: TLSConfiguration = TLSConfiguration()
517517
) -> SecurityProtocol {
518518
return SecurityProtocol(
519-
_internal: .saslTLS(saslMechanism: saslMechanism, tlsConfiguaration: tlsConfiguaration)
519+
_internal: .saslTLS(saslMechanism: saslMechanism, tlsConfiguration: tlsConfiguration)
520520
)
521521
}
522522

‎Tests/IntegrationTests/KafkaTests.swift‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,8 @@ final class KafkaTests: XCTestCase {
102102
logger: .kafkaTest
103103
)
104104

105-
let serviceGroup = ServiceGroup(
106-
services: [producer, consumer],
107-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
108-
logger: .kafkaTest
109-
)
105+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest)
106+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
110107

111108
try await withThrowingTaskGroup(of: Void.self) { group in
112109
// Run Task
@@ -174,11 +171,8 @@ final class KafkaTests: XCTestCase {
174171
logger: .kafkaTest
175172
)
176173

177-
let serviceGroup = ServiceGroup(
178-
services: [producer, consumer],
179-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
180-
logger: .kafkaTest
181-
)
174+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest)
175+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
182176

183177
try await withThrowingTaskGroup(of: Void.self) { group in
184178
// Run Task
@@ -243,11 +237,8 @@ final class KafkaTests: XCTestCase {
243237
logger: .kafkaTest
244238
)
245239

246-
let serviceGroup = ServiceGroup(
247-
services: [producer, consumer],
248-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
249-
logger: .kafkaTest
250-
)
240+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest)
241+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
251242

252243
try await withThrowingTaskGroup(of: Void.self) { group in
253244
// Consumer Run Task
@@ -315,11 +306,8 @@ final class KafkaTests: XCTestCase {
315306
logger: .kafkaTest
316307
)
317308

318-
let serviceGroup1 = ServiceGroup(
319-
services: [producer, consumer1],
320-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
321-
logger: .kafkaTest
322-
)
309+
let serviceGroupConfiguration1 = ServiceGroupConfiguration(services: [producer, consumer1], logger: .kafkaTest)
310+
let serviceGroup1 = ServiceGroup(configuration: serviceGroupConfiguration1)
323311

324312
try await withThrowingTaskGroup(of: Void.self) { group in
325313
// Run Task
@@ -392,11 +380,8 @@ final class KafkaTests: XCTestCase {
392380
logger: .kafkaTest
393381
)
394382

395-
let serviceGroup2 = ServiceGroup(
396-
services: [consumer2],
397-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
398-
logger: .kafkaTest
399-
)
383+
let serviceGroupConfiguration2 = ServiceGroupConfiguration(services: [consumer2], logger: .kafkaTest)
384+
let serviceGroup2 = ServiceGroup(configuration: serviceGroupConfiguration2)
400385

401386
try await withThrowingTaskGroup(of: Void.self) { group in
402387
// Run Task

‎Tests/KafkaTests/KafkaConsumerTests.swift‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@ final class KafkaConsumerTests: XCTestCase {
5050

5151
let consumer = try KafkaConsumer(configuration: config, logger: mockLogger)
5252

53-
let serviceGroup = ServiceGroup(
54-
services: [consumer],
55-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
56-
logger: .kafkaTest
57-
)
53+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [consumer], logger: .kafkaTest)
54+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
5855

5956
await withThrowingTaskGroup(of: Void.self) { group in
6057
// Run Task

‎Tests/KafkaTests/KafkaProducerTests.swift‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ final class KafkaProducerTests: XCTestCase {
5959
func testSend() async throws {
6060
let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest)
6161

62-
let serviceGroup = ServiceGroup(
63-
services: [producer],
64-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
65-
logger: .kafkaTest
66-
)
62+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest)
63+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
6764

6865
try await withThrowingTaskGroup(of: Void.self) { group in
6966
// Run Task
@@ -117,11 +114,8 @@ final class KafkaProducerTests: XCTestCase {
117114
func testSendEmptyMessage() async throws {
118115
let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest)
119116

120-
let serviceGroup = ServiceGroup(
121-
services: [producer],
122-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
123-
logger: .kafkaTest
124-
)
117+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest)
118+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
125119

126120
try await withThrowingTaskGroup(of: Void.self) { group in
127121
// Run Task
@@ -173,11 +167,8 @@ final class KafkaProducerTests: XCTestCase {
173167
func testSendTwoTopics() async throws {
174168
let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest)
175169

176-
let serviceGroup = ServiceGroup(
177-
services: [producer],
178-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
179-
logger: .kafkaTest
180-
)
170+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest)
171+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
181172

182173
try await withThrowingTaskGroup(of: Void.self) { group in
183174
// Run Task
@@ -251,11 +242,8 @@ final class KafkaProducerTests: XCTestCase {
251242

252243
let producer = try KafkaProducer(configuration: config, logger: mockLogger)
253244

254-
let serviceGroup = ServiceGroup(
255-
services: [producer],
256-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
257-
logger: .kafkaTest
258-
)
245+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest)
246+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
259247

260248
await withThrowingTaskGroup(of: Void.self) { group in
261249
// Run Task
@@ -286,11 +274,8 @@ final class KafkaProducerTests: XCTestCase {
286274
func testSendFailsAfterTerminatingAcknowledgementSequence() async throws {
287275
let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest)
288276

289-
let serviceGroup = ServiceGroup(
290-
services: [producer],
291-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
292-
logger: .kafkaTest
293-
)
277+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest)
278+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
294279

295280
try await withThrowingTaskGroup(of: Void.self) { group in
296281
// Run Task
@@ -338,11 +323,8 @@ final class KafkaProducerTests: XCTestCase {
338323

339324
await withThrowingTaskGroup(of: Void.self) { group in
340325
// Initialize serviceGroup here so it gets dereferenced when this closure is complete
341-
let serviceGroup = ServiceGroup(
342-
services: [producer!],
343-
configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []),
344-
logger: .kafkaTest
345-
)
326+
let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer!], logger: .kafkaTest)
327+
let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration)
346328

347329
// Run Task
348330
group.addTask {

0 commit comments

Comments
 (0)