From 128a561fe0806f3665a86ed2e26125669b568bda Mon Sep 17 00:00:00 2001 From: qvalentin Date: Wed, 3 May 2023 08:44:36 +0200 Subject: [PATCH] refactor(kafka): rename extensions to oauthExtensions Signed-off-by: qvalentin --- pkg/scalers/kafka_scaler.go | 22 +++++++++++----------- pkg/scalers/kafka_scaler_test.go | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkg/scalers/kafka_scaler.go b/pkg/scalers/kafka_scaler.go index 23d1e47c70c..f7ccef049f5 100644 --- a/pkg/scalers/kafka_scaler.go +++ b/pkg/scalers/kafka_scaler.go @@ -54,7 +54,7 @@ type kafkaMetadata struct { // OAUTHBEARER scopes []string oauthTokenEndpointURI string - extensions map[string]string + oauthExtensions map[string]string // TLS enableTLS bool @@ -165,16 +165,16 @@ func parseKafkaAuthParams(config *ScalerConfig, meta *kafkaMetadata) error { } meta.oauthTokenEndpointURI = strings.TrimSpace(config.AuthParams["oauthTokenEndpointUri"]) - meta.extensions = make(map[string]string) - for _, extension := range strings.Split(config.AuthParams["extensions"], ",") { - if extension == "" { - continue + meta.oauthExtensions = make(map[string]string) + oauthExtensionsRaw := config.AuthParams["oauthExtensions"] + if oauthExtensionsRaw != "" { + for _, extension := range strings.Split(oauthExtensionsRaw, ",") { + splittedExtension := strings.Split(extension, "=") + if len(splittedExtension) != 2 { + return errors.New("invalid OAuthBearer extension, must be of format key=value") + } + meta.oauthExtensions[splittedExtension[0]] = splittedExtension[1] } - splittedExtension := strings.Split(extension, "=") - if len(splittedExtension) != 2 { - return errors.New("invalid OAuthBearer extension, must be of format key=value") - } - meta.extensions[splittedExtension[0]] = splittedExtension[1] } } } else { @@ -395,7 +395,7 @@ func getKafkaClients(metadata kafkaMetadata) (sarama.Client, sarama.ClusterAdmin if metadata.saslType == KafkaSASLTypeOAuthbearer { config.Net.SASL.Mechanism = sarama.SASLTypeOAuth - config.Net.SASL.TokenProvider = OAuthBearerTokenProvider(metadata.username, metadata.password, metadata.oauthTokenEndpointURI, metadata.scopes, metadata.extensions) + config.Net.SASL.TokenProvider = OAuthBearerTokenProvider(metadata.username, metadata.password, metadata.oauthTokenEndpointURI, metadata.scopes, metadata.oauthExtensions) } client, err := sarama.NewClient(metadata.bootstrapServers, config) diff --git a/pkg/scalers/kafka_scaler_test.go b/pkg/scalers/kafka_scaler_test.go index 941c9313c26..9b9175678aa 100644 --- a/pkg/scalers/kafka_scaler_test.go +++ b/pkg/scalers/kafka_scaler_test.go @@ -236,11 +236,11 @@ var parseKafkaOAuthbrearerAuthParamsTestDataset = []parseKafkaAuthParamsTestData // failure, SASL OAUTHBEARER + TLS missing oauthTokenEndpointUri {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "", "tls": "disable"}, true, false}, // success, SASL OAUTHBEARER + extension - {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "extensions": "extension_foo=bar"}, false, false}, + {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "oauthExtensions": "extension_foo=bar"}, false, false}, // success, SASL OAUTHBEARER + multiple extensions - {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "extensions": "extension_foo=bar,extension_baz=baz"}, false, false}, + {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "oauthExtensions": "extension_foo=bar,extension_baz=baz"}, false, false}, // failure, SASL OAUTHBEARER + bad extension - {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "extensions": "extension_foo=bar,extension_bazbaz"}, true, false}, + {map[string]string{"sasl": "oauthbearer", "username": "admin", "password": "admin", "scopes": "scope", "oauthTokenEndpointUri": "https://website.com", "tls": "disable", "oauthExtensions": "extension_foo=bar,extension_bazbaz"}, true, false}, } var kafkaMetricIdentifiers = []kafkaMetricIdentifier{ @@ -390,9 +390,9 @@ func TestKafkaOAuthbrearerAuthParams(t *testing.T) { t.Errorf("Expected scopes to be set to %v but got %v\n", strings.Count(testData.authParams["scopes"], ","), len(meta.scopes)) } } - if err == nil && testData.authParams["extensions"] != "" { - if len(meta.extensions) != strings.Count(testData.authParams["extensions"], ",")+1 { - t.Errorf("Expected number of extensions to be set to %v but got %v\n", strings.Count(testData.authParams["extensions"], ",")+1, len(meta.extensions)) + if err == nil && testData.authParams["oauthExtensions"] != "" { + if len(meta.oauthExtensions) != strings.Count(testData.authParams["oauthExtensions"], ",")+1 { + t.Errorf("Expected number of extensions to be set to %v but got %v\n", strings.Count(testData.authParams["oauthExtensions"], ",")+1, len(meta.oauthExtensions)) } } }