Skip to content

Fix typo tlsConfiguaration -> tlsConfiguration #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2023
Merged

Fix typo tlsConfiguaration -> tlsConfiguration #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
febdc6d
Fix typo `tlsConfiguaration` -> `tlsConfiguration`
felixschlegel Aug 17, 2023
39f8857
Fix swift-service-lifecyle warnings
felixschlegel Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Sources/Kafka/Configuration/KafkaConfiguration+Security.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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)
)
}

Expand Down
35 changes: 10 additions & 25 deletions Tests/IntegrationTests/KafkaTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions Tests/KafkaTests/KafkaConsumerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 12 additions & 30 deletions Tests/KafkaTests/KafkaProducerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down