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

Use RabbitMQ vhostName from authParams when declared #6373

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use RabbitMQ vhostName from authParams when declared #6373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
977de43
use vhostName from authParams when declared
michemache Nov 28, 2024
83d9508
Update CHANGELOG.md
michemache Nov 28, 2024
c80dfc7
Merge branch 'main' into trigger-authentication-vhost-name
michemache Dec 2, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Here is an overview of all new **experimental** features:

### Improvements

- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
- **RabbitMQ Scaler**: Support use of the ‘vhostName’ parameter in the ‘TriggerAuthentication’ resource ([#6369](https://github.com/kedacore/keda/issues/6369))

### Fixes

Expand Down
2 changes: 1 addition & 1 deletion pkg/scalers/rabbitmq_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type rabbitMQMetadata struct {
// either http or amqp protocol
Protocol string `keda:"name=protocol, order=triggerMetadata;authParams, optional, default=auto"`
// override the vhost from the connection info
VhostName string `keda:"name=vhostName, order=triggerMetadata, optional"`
VhostName string `keda:"name=vhostName, order=triggerMetadata;authParams, optional"`
// specify if the queueName contains a rexeg
UseRegex bool `keda:"name=useRegex, order=triggerMetadata, optional"`
// specify if the QueueLength value should exclude Unacknowledged messages (Ready messages only)
Expand Down
4 changes: 4 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 @@ -161,6 +161,10 @@ var testRabbitMQAuthParamData = []parseRabbitMQAuthParamTestData{
{map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"username": "user"}, true, rmqTLSDisable, false},
// failure, password but no username
{map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"password": "PASSWORD"}, true, rmqTLSDisable, false},
// success, vhostName
{map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"vhostName": "myVhost"}, false, rmqTLSDisable, false},
// success, vhostName but empty
{map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"vhostName": ""}, false, rmqTLSDisable, false},
// success, username and password from env
{map[string]string{"queueName": "sample", "hostFromEnv": host, "usernameFromEnv": rabbitMQUsername, "passwordFromEnv": rabbitMQPassword}, v1alpha1.AuthPodIdentity{}, map[string]string{}, false, rmqTLSDisable, false},
// failure, username from env but not password
Expand Down
Loading