From 28b5841cc0b89cd8aa56a44614f100b395efa8b7 Mon Sep 17 00:00:00 2001 From: rickbrouwer Date: Mon, 7 Oct 2024 17:33:27 +0200 Subject: [PATCH] Add operation test Signed-off-by: rickbrouwer --- pkg/scalers/ibmmq_scaler.go | 4 ++-- pkg/scalers/ibmmq_scaler_test.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/scalers/ibmmq_scaler.go b/pkg/scalers/ibmmq_scaler.go index b5d12e8cd09..11df92c4716 100644 --- a/pkg/scalers/ibmmq_scaler.go +++ b/pkg/scalers/ibmmq_scaler.go @@ -30,7 +30,7 @@ type ibmmqMetadata struct { QueueName []string `keda:"name=queueName;queueNames, order=triggerMetadata"` QueueDepth int64 `keda:"name=queueDepth, order=triggerMetadata, default=20"` ActivationQueueDepth int64 `keda:"name=activationQueueDepth, order=triggerMetadata, default=0"` - Operation string `keda:"name=operation, order=triggerMetadata, default=max"` + Operation string `keda:"name=operation, order=triggerMetadata, enum=max;avg;sum, default=max"` Username string `keda:"name=username, order=authParams;resolvedEnv;triggerMetadata"` Password string `keda:"name=password, order=authParams;resolvedEnv;triggerMetadata"` UnsafeSsl bool `keda:"name=unsafeSsl, order=triggerMetadata, default=false"` @@ -191,7 +191,7 @@ func (s *ibmmqScaler) getQueueDepthViaHTTP(ctx context.Context) (int64, error) { case maxOperation: return maxDepth(depths), nil default: - return 0, fmt.Errorf("operation mode %s must be one of %s, %s, %s", s.metadata.Operation, sumOperation, avgOperation, maxOperation) + return 0, nil } } diff --git a/pkg/scalers/ibmmq_scaler_test.go b/pkg/scalers/ibmmq_scaler_test.go index 5618fd68578..f5c1d73aa2b 100644 --- a/pkg/scalers/ibmmq_scaler_test.go +++ b/pkg/scalers/ibmmq_scaler_test.go @@ -55,6 +55,8 @@ var testIBMMQMetadata = []parseIBMMQMetadataTestData{ {map[string]string{"host": testValidMQQueueURL, "queueName": "testQueue1, testQueue2", "queueDepth": "10"}, false, map[string]string{"username": "testUsername", "password": "Pass123"}}, // Properly formed metadata with 2 queues with param queueNames {map[string]string{"host": testValidMQQueueURL, "queueNames": "testQueue1, testQueue2", "queueDepth": "10"}, false, map[string]string{"username": "testUsername", "password": "Pass123"}}, + // Invalid operation + {map[string]string{"host": testValidMQQueueURL, "queueName": "testQueue1, testQueue2", "operation": "test", "queueDepth": "10"}, true, map[string]string{"username": "testUsername", "password": "Pass123"}}, // Invalid queueDepth using a string {map[string]string{"host": testValidMQQueueURL, "queueName": "testQueue", "queueDepth": "AA"}, true, map[string]string{"username": "testUsername", "password": "Pass123"}}, // Invalid activationQueueDepth using a string @@ -222,6 +224,7 @@ func TestIBMMQScalerGetQueueDepthViaHTTP(t *testing.T) { metadata: ibmmqMetadata{ Host: server.URL, QueueName: []string{"TEST.QUEUE"}, + Operation: "max", }, httpClient: server.Client(), }