refactor liklus scaler #6433
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,7 @@ package scalers | |
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/go-logr/logr" | ||
|
|
@@ -15,12 +14,10 @@ import ( | |
| ) | ||
|
|
||
| type parseLiiklusMetadataTestData struct { | ||
| name string | ||
| metadata map[string]string | ||
| ExpectedErr error | ||
| ExpectedMetatada *liiklusMetadata | ||
| } | ||
|
|
||
| type liiklusMetricIdentifier struct { | ||
|
|
@@ -30,12 +27,64 @@ type liiklusMetricIdentifier struct { | |
| } | ||
|
|
||
| var parseLiiklusMetadataTestDataset = []parseLiiklusMetadataTestData{ | ||
| { | ||
| name: "Empty metadata", | ||
| metadata: map[string]string{}, | ||
| ExpectedErr: fmt.Errorf("error parsing liiklus metadata: " + | ||
| "missing required parameter \"address\" in [triggerMetadata]\n" + | ||
| "missing required parameter \"topic\" in [triggerMetadata]\n" + | ||
| "missing required parameter \"group\" in [triggerMetadata]"), | ||
| ExpectedMetatada: nil, | ||
| }, | ||
| { | ||
| name: "Empty address", | ||
| metadata: map[string]string{"topic": "foo"}, | ||
| ExpectedErr: fmt.Errorf("error parsing liiklus metadata: " + | ||
| "missing required parameter \"address\" in [triggerMetadata]\n" + | ||
| "missing required parameter \"group\" in [triggerMetadata]"), | ||
| ExpectedMetatada: nil, | ||
| }, | ||
| { | ||
| name: "Empty group", | ||
| metadata: map[string]string{"topic": "foo", "address": "using-mock"}, | ||
| ExpectedErr: fmt.Errorf("error parsing liiklus metadata: " + | ||
| "missing required parameter \"group\" in [triggerMetadata]"), | ||
| ExpectedMetatada: nil, | ||
| }, | ||
| { | ||
| name: "Valid", | ||
| metadata: map[string]string{"topic": "foo", "address": "using-mock", "group": "mygroup"}, | ||
| ExpectedErr: nil, | ||
| ExpectedMetatada: &liiklusMetadata{ | ||
| LagThreshold: defaultLiiklusLagThreshold, | ||
| ActivationLagThreshold: defaultLiiklusActivationLagThreshold, | ||
| Address: "using-mock", | ||
| Topic: "foo", | ||
| Group: "mygroup", | ||
| GroupVersion: 0, | ||
| triggerIndex: 0, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Invalid activationLagThreshold", | ||
| metadata: map[string]string{"topic": "foo", "address": "using-mock", "group": "mygroup", "activationLagThreshold": "invalid"}, | ||
| ExpectedErr: fmt.Errorf("error parsing liiklus metadata: unable to set param \"activationLagThreshold\" value \"invalid\": unable to unmarshal to field type int64: invalid character 'i' looking for beginning of value"), | ||
| ExpectedMetatada: nil, | ||
| }, | ||
| { | ||
| name: "Custom lagThreshold", | ||
| metadata: map[string]string{"topic": "foo", "address": "using-mock", "group": "mygroup", "lagThreshold": "20"}, | ||
| ExpectedErr: nil, | ||
| ExpectedMetatada: &liiklusMetadata{ | ||
| LagThreshold: 20, | ||
| ActivationLagThreshold: defaultLiiklusActivationLagThreshold, | ||
| Address: "using-mock", | ||
| Topic: "foo", | ||
| Group: "mygroup", | ||
| GroupVersion: 0, | ||
| triggerIndex: 0, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| var liiklusMetricIdentifiers = []liiklusMetricIdentifier{ | ||
|
|
@@ -45,38 +94,44 @@ var liiklusMetricIdentifiers = []liiklusMetricIdentifier{ | |
|
|
||
| func TestLiiklusParseMetadata(t *testing.T) { | ||
| for _, testData := range parseLiiklusMetadataTestDataset { | ||
| t.Run(testData.name, func(t *testing.T) { | ||
| meta, err := parseLiiklusMetadata(&scalersconfig.ScalerConfig{TriggerMetadata: testData.metadata}) | ||
|
|
||
| // error cases | ||
| if testData.ExpectedErr != nil { | ||
| if err == nil { | ||
| t.Errorf("Expected error %v but got success", testData.ExpectedErr) | ||
| } else if err.Error() != testData.ExpectedErr.Error() { | ||
| t.Errorf("Expected error %v but got %v", testData.ExpectedErr, err) | ||
| } | ||
| return // Skip the rest of the checks for error cases | ||
| } | ||
|
|
||
| // success cases | ||
| if err != nil { | ||
| t.Errorf("Expected success but got error %v", err) | ||
| } | ||
| if testData.ExpectedMetatada != nil { | ||
| if testData.ExpectedMetatada.Address != meta.Address { | ||
| t.Errorf("Expected address %q but got %q", testData.ExpectedMetatada.Address, meta.Address) | ||
| } | ||
| if meta.Group != testData.ExpectedMetatada.Group { | ||
| t.Errorf("Expected group %q but got %q", testData.ExpectedMetatada.Group, meta.Group) | ||
| } | ||
| if meta.Topic != testData.ExpectedMetatada.Topic { | ||
| t.Errorf("Expected topic %q but got %q", testData.ExpectedMetatada.Topic, meta.Topic) | ||
| } | ||
| if meta.LagThreshold != testData.ExpectedMetatada.LagThreshold { | ||
| t.Errorf("Expected threshold %d but got %d", testData.ExpectedMetatada.LagThreshold, meta.LagThreshold) | ||
| } | ||
| if meta.ActivationLagThreshold != testData.ExpectedMetatada.ActivationLagThreshold { | ||
| t.Errorf("Expected activation threshold %d but got %d", testData.ExpectedMetatada.ActivationLagThreshold, meta.ActivationLagThreshold) | ||
| } | ||
| if meta.GroupVersion != testData.ExpectedMetatada.GroupVersion { | ||
| t.Errorf("Expected group version %d but got %d", testData.ExpectedMetatada.GroupVersion, meta.GroupVersion) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -172,16 +227,17 @@ func TestLiiklusScalerGetMetricsBehavior(t *testing.T) { | |
|
|
||
| func TestLiiklusGetMetricSpecForScaling(t *testing.T) { | ||
| for _, testData := range liiklusMetricIdentifiers { | ||
| t.Run(testData.name, func(t *testing.T) { | ||
| meta, err := parseLiiklusMetadata(&scalersconfig.ScalerConfig{TriggerMetadata: testData.metadataTestData.metadata}) | ||
| if err != nil { | ||
| t.Fatal("Could not parse metadata:", err) | ||
| } | ||
| meta.triggerIndex = testData.triggerIndex | ||
|
There was a problem hiding this comment. tests shouldn't modify the meta from |
||
| mockLiiklusScaler := liiklusScaler{"", meta, nil, nil, logr.Discard()} | ||
| metricSpec := mockLiiklusScaler.GetMetricSpecForScaling(context.Background()) | ||
| if metricSpec[0].External.Metric.Name != testData.name { | ||
| t.Errorf("Wrong External metric source name: %s", metricSpec[0].External.Metric.Name) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be safe to remove because
Topic,Address, andGroupare not marked asoptionalin the field tags so theTypedConfigparsing will throw an errorThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I agree. fixed in: 4934fd0