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

Jump to bottom

moving rabbitMq host to resolved value #347

Merged
merged 1 commit into from
Sep 9, 2019
Merged

moving rabbitMq host to resolved value #347

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions pkg/scalers/rabbitmq_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type rabbitMQMetadata struct {

// NewRabbitMQScaler creates a new rabbitMQ scaler
func NewRabbitMQScaler(resolvedEnv, metadata map[string]string) (Scaler, error) {
meta, err := parseRabbitMQMetadata(metadata)
meta, err := parseRabbitMQMetadata(resolvedEnv, metadata)
if err != nil {
return nil, fmt.Errorf("error parsing rabbitmq metadata: %s", err)
}
Expand All @@ -49,13 +49,19 @@ func NewRabbitMQScaler(resolvedEnv, metadata map[string]string) (Scaler, error)
}, nil
}

func parseRabbitMQMetadata(metadata map[string]string) (*rabbitMQMetadata, error) {
func parseRabbitMQMetadata(resolvedEnv, metadata map[string]string) (*rabbitMQMetadata, error) {
meta := rabbitMQMetadata{}

if val, ok := metadata["host"]; ok {
meta.host = val
} else {
return nil, fmt.Errorf("no host given")
hostSetting := val

if val, ok := resolvedEnv[hostSetting]; ok {
meta.host = val
}
}

if meta.host == "" {
return nil, fmt.Errorf("no host setting given")
}

if val, ok := metadata["queueName"]; ok {
Expand Down
16 changes: 12 additions & 4 deletions pkg/scalers/rabbitmq_scaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@ import (
"testing"
)

const (
host = "myHostSecret"
)

type parseRabbitMQMetadataTestData struct {
metadata map[string]string
isError bool
}

var sampleRabbitMqResolvedEnv = map[string]string{
host: "none",
}

var testRabbitMQMetadata = []parseRabbitMQMetadataTestData{
// nothing passed
{map[string]string{}, true},
// properly formed metadata
{map[string]string{"queueLength": "10", "queueName": "sample", "host": "amqp://rabbitmq"}, false},
{map[string]string{"queueLength": "10", "queueName": "sample", "host": host}, false},
// malformed queueLength
{map[string]string{"queueLength": "AA", "queueName": "sample", "host": "amqp://rabbitmq"}, true},
{map[string]string{"queueLength": "AA", "queueName": "sample", "host": host}, true},
// missing host
{map[string]string{"queueLength": "AA", "queueName": "sample"}, true},
// missing queueName
{map[string]string{"queueLength": "10", "host": "amqp://rabbitmq"}, true},
{map[string]string{"queueLength": "10", "host": host}, true},
}

func TestRabbitMQParseMetadata(t *testing.T) {
for _, testData := range testRabbitMQMetadata {
_, err := parseRabbitMQMetadata(testData.metadata)
_, err := parseRabbitMQMetadata(sampleRabbitMqResolvedEnv, testData.metadata)
if err != nil && !testData.isError {
t.Error("Expected success but got error", err)
}
Expand Down