diff --git a/pkg/scalers/pulsar_scaler.go b/pkg/scalers/pulsar_scaler.go index c9732083113..8437736c66f 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" @@ -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 {