From 9e51a78c31f0d2c188ff01c5f84cb6816c0d1c51 Mon Sep 17 00:00:00 2001 From: Michael Yoo Date: Wed, 4 Sep 2024 22:30:16 +0900 Subject: [PATCH] Pulsar: remove deprecated trigger name (#6092) * remove deprecated trigger name in Pulsar scaler Signed-off-by: Kun Woo Yoo * Update CHANGELOG.md Signed-off-by: Jorge Turrado Ferrero Signed-off-by: Kun Woo Yoo * remove deprecated Pulsar trigger name from test Signed-off-by: Kun Woo Yoo --------- Signed-off-by: Kun Woo Yoo Signed-off-by: Jorge Turrado Ferrero Co-authored-by: Jorge Turrado Ferrero --- CHANGELOG.md | 2 +- pkg/scalers/pulsar_scaler.go | 19 ++++--------------- pkg/scalers/pulsar_scaler_test.go | 9 +-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f86988e080..2692e6e4181 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,7 +91,7 @@ New deprecation(s): ### Breaking Changes -- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX)) +- **Pulsar Scaler**: remove `msgBacklog` trigger name ([#6059](https://github.com/kedacore/keda/issues/6059)) ### Other diff --git a/pkg/scalers/pulsar_scaler.go b/pkg/scalers/pulsar_scaler.go index c9732083113..66015982bd5 100644 --- a/pkg/scalers/pulsar_scaler.go +++ b/pkg/scalers/pulsar_scaler.go @@ -43,7 +43,6 @@ type pulsarMetadata struct { } const ( - msgBacklogMetricName = "msgBacklog" pulsarMetricType = "External" defaultMsgBacklogThreshold = 10 enable = "enable" @@ -133,7 +132,7 @@ func NewPulsarScaler(config *scalersconfig.ScalerConfig) (Scaler, error) { }, nil } -func parsePulsarMetadata(config *scalersconfig.ScalerConfig, logger logr.Logger) (pulsarMetadata, error) { +func parsePulsarMetadata(config *scalersconfig.ScalerConfig, _ logr.Logger) (pulsarMetadata, error) { meta := pulsarMetadata{} switch { case config.TriggerMetadata["adminURLFromEnv"] != "": @@ -182,23 +181,13 @@ func parsePulsarMetadata(config *scalersconfig.ScalerConfig, logger logr.Logger) meta.msgBacklogThreshold = defaultMsgBacklogThreshold - // FIXME: msgBacklog support DEPRECATED to be removed in v2.14 - fmt.Println(config.TriggerMetadata) - if val, ok := config.TriggerMetadata[msgBacklogMetricName]; ok { - logger.V(1).Info("\"msgBacklog\" is deprecated and will be removed in v2.14, please use \"msgBacklogThreshold\" instead") + if val, ok := config.TriggerMetadata["msgBacklogThreshold"]; ok { t, err := strconv.ParseInt(val, 10, 64) if err != nil { - return meta, fmt.Errorf("error parsing %s: %w", msgBacklogMetricName, err) - } - meta.msgBacklogThreshold = t - } else if val, ok := config.TriggerMetadata["msgBacklogThreshold"]; ok { - t, err := strconv.ParseInt(val, 10, 64) - if err != nil { - return meta, fmt.Errorf("error parsing %s: %w", msgBacklogMetricName, err) + return meta, fmt.Errorf("error parsing %s: %w", "msgBacklogThreshold", err) } meta.msgBacklogThreshold = t } - // END FIXME // For backwards compatibility, we need to map "tls: enable" to if tls, ok := config.TriggerMetadata["tls"]; ok { @@ -212,7 +201,7 @@ func parsePulsarMetadata(config *scalersconfig.ScalerConfig, logger logr.Logger) } auth, err := authentication.GetAuthConfigs(config.TriggerMetadata, config.AuthParams) if err != nil { - return meta, fmt.Errorf("error parsing %s: %w", msgBacklogMetricName, err) + return meta, fmt.Errorf("error parsing %s: %w", "msgBacklogThreshold", err) } if auth != nil && auth.EnableOAuth { diff --git a/pkg/scalers/pulsar_scaler_test.go b/pkg/scalers/pulsar_scaler_test.go index 5c7148cf5b6..68b183488eb 100644 --- a/pkg/scalers/pulsar_scaler_test.go +++ b/pkg/scalers/pulsar_scaler_test.go @@ -156,14 +156,7 @@ func TestParsePulsarMetadata(t *testing.T) { } var testDataMsgBacklogThreshold int64 - // FIXME: msgBacklog support DEPRECATED to be removed in v2.14 - if val, ok := testData.metadata["msgBacklog"]; ok { - testDataMsgBacklogThreshold, err = strconv.ParseInt(val, 10, 64) - if err != nil { - t.Errorf("error parseing msgBacklog: %v", err) - } - // END FiXME - } else if val, ok := testData.metadata["msgBacklogThreshold"]; ok { + if val, ok := testData.metadata["msgBacklogThreshold"]; ok { testDataMsgBacklogThreshold, err = strconv.ParseInt(val, 10, 64) if err != nil { t.Errorf("error parseing msgBacklogThreshold: %v", err)