From 6ef8e87492dc4a180d57773aa7c59a534f0108ad Mon Sep 17 00:00:00 2001 From: Anis Eleuch Date: Wed, 8 Nov 2023 20:04:01 -0800 Subject: [PATCH] Support case insensitive kafka SASL mechanism config values (#18398) --- internal/event/target/kafka_scram_client_contrib.go | 3 ++- internal/logger/target/kafka/kafka_scram_client_contrib.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/event/target/kafka_scram_client_contrib.go b/internal/event/target/kafka_scram_client_contrib.go index 65e548a8d..6bb02ed41 100644 --- a/internal/event/target/kafka_scram_client_contrib.go +++ b/internal/event/target/kafka_scram_client_contrib.go @@ -18,6 +18,7 @@ package target import ( "crypto/sha512" + "strings" "github.com/IBM/sarama" "github.com/xdg/scram" @@ -26,7 +27,7 @@ import ( ) func initScramClient(args KafkaArgs, config *sarama.Config) { - switch args.SASL.Mechanism { + switch strings.ToLower(args.SASL.Mechanism) { case "sha512": config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} } config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512) diff --git a/internal/logger/target/kafka/kafka_scram_client_contrib.go b/internal/logger/target/kafka/kafka_scram_client_contrib.go index c81cb1417..3e11bea3c 100644 --- a/internal/logger/target/kafka/kafka_scram_client_contrib.go +++ b/internal/logger/target/kafka/kafka_scram_client_contrib.go @@ -19,6 +19,7 @@ package kafka import ( "crypto/sha512" + "strings" "github.com/IBM/sarama" "github.com/xdg/scram" @@ -27,7 +28,7 @@ import ( ) func initScramClient(cfg Config, config *sarama.Config) { - switch cfg.SASL.Mechanism { + switch strings.ToLower(cfg.SASL.Mechanism) { case "sha512": config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} } config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512)