Skip to content

Commit 675d6d1

Browse files
authored
fix: allowing usage of sasl none on kafka scaler (#7070)
* fix: allowing usage of sasl none on kafka scaler Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com> * docs: allowing usage of sasl none on kafka scaler Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com> * ci: allowing usage of sasl none on kafka scaler Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com> * ci: allowing usage of sasl none on kafka scaler Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com> --------- Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com>
1 parent cf508d7 commit 675d6d1

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
105105
- **General**: Sets hpaName in Status when ScaledObject adopts/finds an existing HPA ([#6336](https://github.com/kedacore/keda/issues/6336))
106106
- **Cron Scaler**: Fix cron scaler to return zero metric value by default([#6886](https://github.com/kedacore/keda/issues/6886))
107107
- **Hashicorp Vault**: Fix Vault PKI param using camel case param when making API call to Vault PKI endpoint ([#6864](https://github.com/kedacore/keda/issues/6864))
108+
- **Kafka Scaler**: Fix throwing error when using sasl=none ([#7061](https://github.com/kedacore/keda/issues/7061))
108109
- **Pulsar Scaler**: Resolve nil pointer dereference in Pulsar scaler redirect handling ([#7024](https://github.com/kedacore/keda/issues/7024))
109110
- **RabbitMQ Scaler**: Fix incorrect URL encoding in RabbitMQ vhosts containing %2f ([#6963](https://github.com/kedacore/keda/issues/6963))
110111

‎pkg/scalers/kafka_scaler.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,9 @@ func parseKafkaAuthParams(config *scalersconfig.ScalerConfig, meta *kafkaMetadat
222222
saslAuthType = val
223223
}
224224

225-
if saslAuthType != "" {
226-
saslAuthType = strings.TrimSpace(saslAuthType)
227-
mode := kafkaSaslType(saslAuthType)
228-
225+
saslAuthType = strings.TrimSpace(saslAuthType)
226+
mode := kafkaSaslType(saslAuthType)
227+
if saslAuthType != "" && mode != KafkaSASLTypeNone {
229228
switch {
230229
case mode == KafkaSASLTypePlaintext || mode == KafkaSASLTypeSCRAMSHA256 || mode == KafkaSASLTypeSCRAMSHA512:
231230
err := parseSaslParams(config, meta, mode)

‎pkg/scalers/kafka_scaler_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ var parseKafkaAuthParamsTestDataset = []parseKafkaAuthParamsTestData{
213213
{map[string]string{"sasl": "gssapi", "username": "admin", "keytab": "/path/to/keytab", "kerberosConfig": "<config>", "realm": "tst.com", "kerberosDisableFAST": "true"}, false, false},
214214
// failure, SASL GSSAPI/disableFast incorrect
215215
{map[string]string{"sasl": "gssapi", "username": "admin", "keytab": "/path/to/keytab", "kerberosConfig": "<config>", "realm": "tst.com", "kerberosDisableFAST": "notabool"}, true, false},
216+
// success, SASL none
217+
{map[string]string{"sasl": "none"}, false, false},
216218
}
217219
var parseAuthParamsTestDataset = []parseAuthParamsTestDataSecondAuthMethod{
218220
// success, SASL plaintext
@@ -305,6 +307,8 @@ var parseAuthParamsTestDataset = []parseAuthParamsTestDataSecondAuthMethod{
305307
{map[string]string{"bootstrapServers": "foobar:9092", "consumerGroup": "my-group", "topic": "my-topic", "allowIdleConsumers": "true", "version": "1.0.0"}, map[string]string{"sasl": "scram_sha512\n", "username": "admin", "password": "admin"}, false, true},
306308
// success, setting SASL scram_sha512 value with extra space in TriggerAuthentication
307309
{map[string]string{"bootstrapServers": "foobar:9092", "consumerGroup": "my-group", "topic": "my-topic", "allowIdleConsumers": "true", "version": "1.0.0"}, map[string]string{"sasl": "scram_sha512 ", "username": "admin", "password": "admin"}, false, true},
310+
// success, SASL none
311+
{map[string]string{"sasl": "none", "bootstrapServers": "foobar:9092", "consumerGroup": "my-group", "topic": "my-topic", "allowIdleConsumers": "true", "version": "1.0.0"}, map[string]string{}, false, false},
308312
}
309313

310314
var parseKafkaOAuthbearerAuthParamsTestDataset = []parseKafkaOAuthbearerAuthParamsTestData{

0 commit comments

Comments
 (0)