Update after feedback

Signed-off-by: Rick Brouwer <[email protected]>

Author: rickbrouwer

CHANGELOG.md

@@ -79,7 +79,6 @@ Here is an overview of all new **experimental** features:
 ### Improvements
 
 - **General**: Add SecretKey to AWS SecretsManager TriggerAuthentication to allow parsing JSON / Key/Value Pairs in secrets ([#5940](https://github.com/kedacore/keda/issues/5940))
-- **General**: Add time.Duration in TypedConfig ([#6650](https://github.com/kedacore/keda/pull/6650))
 - **Azure Log Analytics Scaler**: Add custom HTTP client timeout ([#6607](https://github.com/kedacore/keda/pull/6607))
 - **Elasticsearch Scaler**: Support IgnoreNullValues at Elasticsearch scaler ([#6599](https://github.com/kedacore/keda/pull/6599))
 - **GitHub Scaler**: Add support to use ETag for conditional requests against the Github API ([#6503](https://github.com/kedacore/keda/issues/6503))
@@ -126,6 +125,7 @@ New deprecation(s):
 ### Other
 
 - **General**: Add debug logs tracking validation of ScaledObjects on webhook ([#6498](https://github.com/kedacore/keda/pull/6498))
+- **General**: Add time.Duration in TypedConfig ([#6650](https://github.com/kedacore/keda/pull/6650))
 - **General**: Fix fallback validation check bug ([#6407](https://github.com/kedacore/keda/pull/6407))
 - **General**: New eventreason KEDAScalersInfo to display important information ([#6328](https://github.com/kedacore/keda/issues/6328))
 - **Apache Kafka Scaler**: Remove unused awsEndpoint in Apache Kafka scaler ([#6627](https://github.com/kedacore/keda/pull/6627))

pkg/scalers/rabbitmq_scaler.go

@@ -96,7 +96,7 @@ type rabbitMQMetadata struct {
 	// specify the operation to apply in case of multiples queues
 	Operation string `keda:"name=operation,                       order=triggerMetadata, default=sum"`
 	// custom http timeout for a specific trigger
-	TimeoutMs int `keda:"name=timeout,                            order=triggerMetadata, optional"`
+	Timeout time.Duration `keda:"name=timeout,                  order=triggerMetadata, optional"`
 
 	Username string `keda:"name=username, order=authParams;resolvedEnv, optional"`
 	Password string `keda:"name=password, order=authParams;resolvedEnv, optional"`
@@ -210,13 +210,10 @@ func (r *rabbitMQMetadata) validateTrigger() error {
 		return fmt.Errorf("protocol %s not supported; must be http to use mode %s", r.Protocol, rabbitModeMessageRate)
 	}
 
-	if r.Protocol == amqpProtocol && r.TimeoutMs != 0 {
-		return fmt.Errorf("amqp protocol doesn't support custom timeouts: %d", r.TimeoutMs)
+	if r.Protocol == amqpProtocol && r.Timeout != 0 {
+		return fmt.Errorf("amqp protocol doesn't support custom timeouts: %d", r.Timeout)
 	}
 
-	if r.TimeoutMs < 0 {
-		return fmt.Errorf("timeout must be greater than 0: %d", r.TimeoutMs)
-	}
 	return nil
 }
 
@@ -260,11 +257,9 @@ func NewRabbitMQScaler(config *scalersconfig.ScalerConfig) (Scaler, error) {
 
 	s.metadata = meta
 
-	var timeout time.Duration
-	if s.metadata.TimeoutMs != 0 {
-		timeout = time.Duration(s.metadata.TimeoutMs) * time.Millisecond
-	} else {
-		timeout = config.GlobalHTTPTimeout
+	timeout := config.GlobalHTTPTimeout
+	if s.metadata.Timeout != 0 {
+		timeout = s.metadata.Timeout * time.Millisecond
 	}
 
 	s.httpClient = kedautil.CreateHTTPClient(timeout, meta.UnsafeSsl)