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

Provide support for configuring authentication through TriggerAuthentication for Stan scaler #2167

Merged
merged 4 commits into from
Oct 13, 2021
Merged

Provide support for configuring authentication through TriggerAuthentication for Stan scaler #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2111f8
Provide support for configuring authentication through TriggerAuthent…
Ritikaa96 Oct 7, 2021
52f16e5
updating changelog
Ritikaa96 Oct 12, 2021
a77e0ef
updating test codes-stan scaler
Ritikaa96 Oct 13, 2021
bf0a624
Merge branch 'main' into nats-streaming-authentication
zroubalik Oct 13, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
- Add support to get connection data from Trigger Authorization in MSSQL Scaler ([#2112](https://github.com/kedacore/keda/pull/2112))
- Add support to get connection data from Trigger Authorization in PostgreSQL Scaler ([#2114](https://github.com/kedacore/keda/pull/2114))
- Add support to provide the metric name in Azure Log Analytics Scaler ([#2106](https://github.com/kedacore/keda/pull/2106))
- Provide support for configuring authentication through TriggerAuthentication for Stan scaler ([#2167](https://github.com/kedacore/keda/pull/2167))
- Add `pageSize` (using regex) in RabbitMQ Scaler ([#2162](https://github.com/kedacore/keda/pull/2162))
- Add `unsafeSsl` parameter in InfluxDB scaler ([#2157](https://github.com/kedacore/keda/pull/2157))

Expand Down
8 changes: 4 additions & 4 deletions pkg/scalers/stan_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ func NewStanScaler(config *ScalerConfig) (Scaler, error) {

func parseStanMetadata(config *ScalerConfig) (stanMetadata, error) {
meta := stanMetadata{}

if config.TriggerMetadata["natsServerMonitoringEndpoint"] == "" {
return meta, errors.New("no monitoring endpoint given")
var err error
meta.natsServerMonitoringEndpoint, err = GetFromAuthOrMeta(config, "natsServerMonitoringEndpoint")
if err != nil {
return meta, err
}
meta.natsServerMonitoringEndpoint = config.TriggerMetadata["natsServerMonitoringEndpoint"]

if config.TriggerMetadata["queueGroup"] == "" {
return meta, errors.New("no queue group given")
Expand Down
24 changes: 14 additions & 10 deletions pkg/scalers/stan_scaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
)

type parseStanMetadataTestData struct {
metadata map[string]string
isError bool
metadata map[string]string
authParams map[string]string
isError bool
}

type stanMetricIdentifier struct {
Expand All @@ -17,15 +18,19 @@ type stanMetricIdentifier struct {

var testStanMetadata = []parseStanMetadataTestData{
// nothing passed
{map[string]string{}, true},
{map[string]string{}, map[string]string{}, true},
// Missing subject name, should fail
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "durableName": "ImDurable"}, true},
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "durableName": "ImDurable"}, map[string]string{}, true},
// Missing durable name, should fail
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "subject": "mySubject"}, true},
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "subject": "mySubject"}, map[string]string{}, true},
// Missing nats server monitoring endpoint, should fail
{map[string]string{"queueGroup": "grp1", "subject": "mySubject"}, true},
{map[string]string{"queueGroup": "grp1", "subject": "mySubject"}, map[string]string{}, true},
// All good.
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "durableName": "ImDurable", "subject": "mySubject"}, false},
{map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss", "queueGroup": "grp1", "durableName": "ImDurable", "subject": "mySubject"}, map[string]string{}, false},
// natsServerMonitoringEndpoint is defined in authParams
{map[string]string{"queueGroup": "grp1", "durableName": "ImDurable", "subject": "mySubject"}, map[string]string{"natsServerMonitoringEndpoint": "stan-nats-ss"}, false},
// Missing nats server monitoring endpoint , should fail
{map[string]string{"queueGroup": "grp1", "durableName": "ImDurable", "subject": "mySubject"}, map[string]string{"natsServerMonitoringEndpoint": ""}, true},
}

var stanMetricIdentifiers = []stanMetricIdentifier{
Expand All @@ -34,11 +39,10 @@ var stanMetricIdentifiers = []stanMetricIdentifier{

func TestStanParseMetadata(t *testing.T) {
for _, testData := range testStanMetadata {
_, err := parseStanMetadata(&ScalerConfig{TriggerMetadata: testData.metadata})
_, err := parseStanMetadata(&ScalerConfig{TriggerMetadata: testData.metadata, AuthParams: testData.authParams})
if err != nil && !testData.isError {
t.Error("Expected success but got error", err)
}
if testData.isError && err == nil {
} else if testData.isError && err == nil {
t.Error("Expected error but got success")
}
}
Expand Down