diff --git a/Package.swift b/Package.swift index 491fd55a..2a1d99e8 100644 --- a/Package.swift +++ b/Package.swift @@ -46,7 +46,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-nio.git", from: "2.55.0"), - .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.0.0-alpha.1"), + .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.0.0-beta.1"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), // The zstd Swift package produces warnings that we cannot resolve: // https://github.com/facebook/zstd/issues/3328 diff --git a/Sources/Kafka/Configuration/KafkaConfiguration+Security.swift b/Sources/Kafka/Configuration/KafkaConfiguration+Security.swift index 473d0cdd..5919e985 100644 --- a/Sources/Kafka/Configuration/KafkaConfiguration+Security.swift +++ b/Sources/Kafka/Configuration/KafkaConfiguration+Security.swift @@ -15,7 +15,7 @@ extension KafkaConfiguration { // MARK: - TLSConfiguration - /// Use to configure an TLS connection. + /// Use to configure a TLS connection. public struct TLSConfiguration: Sendable, Hashable { /// Certificate chain consisting of one leaf certificate and potentially multiple intermediate certificates. /// The public key of the leaf certificate will be used for authentication. @@ -486,7 +486,7 @@ extension KafkaConfiguration { case plaintext case tls(configuration: TLSConfiguration) case saslPlaintext(mechanism: SASLMechanism) - case saslTLS(saslMechanism: SASLMechanism, tlsConfiguaration: TLSConfiguration) + case saslTLS(saslMechanism: SASLMechanism, tlsConfiguration: TLSConfiguration) } private let _internal: _SecurityProtocol @@ -513,10 +513,10 @@ extension KafkaConfiguration { /// Use the Simple Authentication and Security Layer (SASL) with TLS. public static func saslTLS( saslMechanism: SASLMechanism, - tlsConfiguaration: TLSConfiguration = TLSConfiguration() + tlsConfiguration: TLSConfiguration = TLSConfiguration() ) -> SecurityProtocol { return SecurityProtocol( - _internal: .saslTLS(saslMechanism: saslMechanism, tlsConfiguaration: tlsConfiguaration) + _internal: .saslTLS(saslMechanism: saslMechanism, tlsConfiguration: tlsConfiguration) ) } diff --git a/Tests/IntegrationTests/KafkaTests.swift b/Tests/IntegrationTests/KafkaTests.swift index 45245606..31d65231 100644 --- a/Tests/IntegrationTests/KafkaTests.swift +++ b/Tests/IntegrationTests/KafkaTests.swift @@ -102,11 +102,8 @@ final class KafkaTests: XCTestCase { logger: .kafkaTest ) - let serviceGroup = ServiceGroup( - services: [producer, consumer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -174,11 +171,8 @@ final class KafkaTests: XCTestCase { logger: .kafkaTest ) - let serviceGroup = ServiceGroup( - services: [producer, consumer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -243,11 +237,8 @@ final class KafkaTests: XCTestCase { logger: .kafkaTest ) - let serviceGroup = ServiceGroup( - services: [producer, consumer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer, consumer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Consumer Run Task @@ -315,11 +306,8 @@ final class KafkaTests: XCTestCase { logger: .kafkaTest ) - let serviceGroup1 = ServiceGroup( - services: [producer, consumer1], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration1 = ServiceGroupConfiguration(services: [producer, consumer1], logger: .kafkaTest) + let serviceGroup1 = ServiceGroup(configuration: serviceGroupConfiguration1) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -392,11 +380,8 @@ final class KafkaTests: XCTestCase { logger: .kafkaTest ) - let serviceGroup2 = ServiceGroup( - services: [consumer2], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration2 = ServiceGroupConfiguration(services: [consumer2], logger: .kafkaTest) + let serviceGroup2 = ServiceGroup(configuration: serviceGroupConfiguration2) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task diff --git a/Tests/KafkaTests/KafkaConsumerTests.swift b/Tests/KafkaTests/KafkaConsumerTests.swift index f6de27e4..212853c6 100644 --- a/Tests/KafkaTests/KafkaConsumerTests.swift +++ b/Tests/KafkaTests/KafkaConsumerTests.swift @@ -50,11 +50,8 @@ final class KafkaConsumerTests: XCTestCase { let consumer = try KafkaConsumer(configuration: config, logger: mockLogger) - let serviceGroup = ServiceGroup( - services: [consumer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [consumer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) await withThrowingTaskGroup(of: Void.self) { group in // Run Task diff --git a/Tests/KafkaTests/KafkaProducerTests.swift b/Tests/KafkaTests/KafkaProducerTests.swift index 300de4fe..f4124898 100644 --- a/Tests/KafkaTests/KafkaProducerTests.swift +++ b/Tests/KafkaTests/KafkaProducerTests.swift @@ -59,11 +59,8 @@ final class KafkaProducerTests: XCTestCase { func testSend() async throws { let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest) - let serviceGroup = ServiceGroup( - services: [producer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -117,11 +114,8 @@ final class KafkaProducerTests: XCTestCase { func testSendEmptyMessage() async throws { let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest) - let serviceGroup = ServiceGroup( - services: [producer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -173,11 +167,8 @@ final class KafkaProducerTests: XCTestCase { func testSendTwoTopics() async throws { let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest) - let serviceGroup = ServiceGroup( - services: [producer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -251,11 +242,8 @@ final class KafkaProducerTests: XCTestCase { let producer = try KafkaProducer(configuration: config, logger: mockLogger) - let serviceGroup = ServiceGroup( - services: [producer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -286,11 +274,8 @@ final class KafkaProducerTests: XCTestCase { func testSendFailsAfterTerminatingAcknowledgementSequence() async throws { let (producer, events) = try KafkaProducer.makeProducerWithEvents(configuration: self.config, logger: .kafkaTest) - let serviceGroup = ServiceGroup( - services: [producer], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) try await withThrowingTaskGroup(of: Void.self) { group in // Run Task @@ -338,11 +323,8 @@ final class KafkaProducerTests: XCTestCase { await withThrowingTaskGroup(of: Void.self) { group in // Initialize serviceGroup here so it gets dereferenced when this closure is complete - let serviceGroup = ServiceGroup( - services: [producer!], - configuration: ServiceGroupConfiguration(gracefulShutdownSignals: []), - logger: .kafkaTest - ) + let serviceGroupConfiguration = ServiceGroupConfiguration(services: [producer!], logger: .kafkaTest) + let serviceGroup = ServiceGroup(configuration: serviceGroupConfiguration) // Run Task group.addTask {