Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RabbitMQ: make queueLength optional #881

Merged
merged 1 commit into from
Jun 16, 2020
Merged

RabbitMQ: make queueLength optional #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/operator-framework/operator-sdk v0.0.0-00010101000000-000000000000
github.com/pkg/errors v0.8.1
github.com/spf13/pflag v1.0.5
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/pflag v1.0.5
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
github.com/stretchr/testify v1.4.0
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
Expand Down
3 changes: 2 additions & 1 deletion pkg/scalers/rabbitmq_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

const (
rabbitQueueLengthMetricName = "queueLength"
defaultRabbitMQQueueLength = 20
rabbitMetricType = "External"
rabbitIncludeUnacked = "includeUnacked"
defaultIncludeUnacked = false
Expand Down Expand Up @@ -127,7 +128,7 @@ func parseRabbitMQMetadata(resolvedEnv, metadata, authParams map[string]string)

meta.queueLength = queueLength
} else {
return nil, fmt.Errorf("no queue length given")
meta.queueLength = defaultRabbitMQQueueLength
}

return &meta, nil
Expand Down
20 changes: 20 additions & 0 deletions pkg/scalers/rabbitmq_scaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,26 @@ func TestRabbitMQParseMetadata(t *testing.T) {
}
}

var testDefaultQueueLength = []parseRabbitMQMetadataTestData{
// use default queueLength
{map[string]string{"queueName": "sample", "host": host}, false, map[string]string{}},
// use default queueLength with includeUnacked
{map[string]string{"queueName": "sample", "apiHost": apiHost, "includeUnacked": "true"}, false, map[string]string{}},
}

func TestParseDefaultQueueLength(t *testing.T) {
for _, testData := range testDefaultQueueLength {
metadata, err := parseRabbitMQMetadata(sampleRabbitMqResolvedEnv, testData.metadata, testData.authParams)
if err != nil && !testData.isError {
t.Error("Expected success but got error", err)
} else if testData.isError && err == nil {
t.Error("Expected error but got success")
} else if metadata.queueLength != defaultRabbitMQQueueLength {
t.Error("Expected default queueLength =", defaultRabbitMQQueueLength, "but got", metadata.queueLength)
}
}
}

type getQueueInfoTestData struct {
response string
responseStatus int
Expand Down