Skip to content
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

fix(kafka-ssl-sasl-dsl): #67

Merged
merged 1 commit into from
Nov 11, 2024
Merged

fix(kafka-ssl-sasl-dsl): #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ github.repository.name=extra-ktor-plugins
kotlin.native.cacheKind.linuxX64=none
kotlin.native.ignoreDisabledTargets=true
gradle.publish.enable.module-metadata=true
version=2.1.0
version=2.1.1
gpr.user=flaxoos
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
kotlin.mpp.applyDefaultHierarchyTemplate=false
6 changes: 3 additions & 3 deletions ...kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/KafkaPluginConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class KafkaConfig : AbstractKafkaConfig() {
adminPropertiesBuilder
?.build()
?.propertiesContext(this@KafkaConfig)
?.withSslProperties(adminSslPropertiesBuilder)
?.withSslProperties(adminSslPropertiesBuilderPair)
?.withDefaultAdminConfig()
?.delegatingToCommon()
?.kafkaProperties
Expand Down Expand Up @@ -131,14 +131,14 @@ class KafkaConfig : AbstractKafkaConfig() {

// SSL Configurations
internal var commonSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null
internal var adminSslPropertiesBuilder: SslPropertiesBuilder? = null
internal var adminSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null
internal var producerSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null
internal var consumerSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null
internal var schemaRegistryClientSslPropertiesBuilder: SslPropertiesBuilder? = null

// SASL Configurations
internal var commonSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null
internal var adminSaslPropertiesBuilder: SaslPropertiesBuilderPair? = null
internal var adminSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null
internal var producerSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null
internal var consumerSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null
internal var schemaRegistryClientSaslPropertiesBuilder: SaslPropertiesBuilder? = null
Expand Down
6 changes: 3 additions & 3 deletions ...-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/SslConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ fun KafkaConfig.commonSsl(configuration: SslPropertiesBuilderPair.() -> Unit) {
* Sets a specific SSL configuration for the admin client.
*/
@KafkaDsl
fun KafkaConfig.adminSsl(configuration: SslPropertiesBuilder.() -> Unit) {
adminSslPropertiesBuilder = SslPropertiesBuilder().apply(configuration)
fun KafkaConfig.adminSsl(configuration: SslPropertiesBuilderPair.() -> Unit) {
adminSslPropertiesBuilderPair = SslPropertiesBuilderPair().apply(configuration)
}

/**
Expand Down Expand Up @@ -117,7 +117,7 @@ fun KafkaConfig.commonSasl(configuration: SaslPropertiesBuilderPair.() -> Unit)
*/
@KafkaDsl
fun KafkaConfig.adminSasl(configuration: SaslPropertiesBuilderPair.() -> Unit) {
adminSaslPropertiesBuilder = SaslPropertiesBuilderPair().apply(configuration)
adminSaslPropertiesBuilderPair = SaslPropertiesBuilderPair().apply(configuration)
}

/**
Expand Down
Loading