Skip to content

Commit 7074035

Browse files
(feat): pre-commit changes + add tests
Signed-off-by: mittalvaibhav1 <[email protected]>
1 parent aa1b6bb commit 7074035

File tree

5 files changed

+273
-20
lines changed

5 files changed

+273
-20
lines changed

pkg/scalers/sumologic/metrics.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ func (c *Client) createMetricsQuery(query string, quantization time.Duration, fr
6464

6565
func (c *Client) createMultiMetricsQuery(queries map[string]string, quantization time.Duration, from, to, rollup string) ([]byte, error) {
6666
metricsQueries := make([]MetricsQuery, 0)
67-
for rowId, query := range queries {
67+
for rowID, query := range queries {
6868
metricsQuery := MetricsQuery{
69-
RowID: rowId,
69+
RowID: rowID,
7070
Query: query,
7171
Quantization: int64(quantization / time.Millisecond),
7272
Rollup: rollup,

pkg/scalers/sumologic/sumologic.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func (c *Client) GetMetricsSearchResult(
233233

234234
func (c *Client) GetMultiMetricsSearchResult(
235235
queries map[string]string,
236-
resultQueryRowId string,
236+
resultQueryRowID string,
237237
quantization time.Duration,
238238
rollup string,
239239
timerange time.Duration,
@@ -262,14 +262,14 @@ func (c *Client) GetMultiMetricsSearchResult(
262262
var selectedResultSet QueryResult
263263

264264
for _, queryResult := range parsedResp.QueryResult {
265-
if queryResult.RowID == resultQueryRowId {
265+
if queryResult.RowID == resultQueryRowID {
266266
selectedResultSet = queryResult
267267
break
268268
}
269269
}
270270

271271
if selectedResultSet.RowID == "" {
272-
return nil, fmt.Errorf("no query result with matching resultQueryRowId %s found in metrics query response", resultQueryRowId)
272+
return nil, fmt.Errorf("no query result with matching resultQueryRowID %s found in metrics query response", resultQueryRowID)
273273
}
274274

275275
if len(selectedResultSet.TimeSeriesList.TimeSeries) == 0 {
@@ -304,7 +304,7 @@ func (c *Client) GetQueryResult(
304304
queryType string,
305305
query string,
306306
queries map[string]string,
307-
resultQueryRowId string,
307+
resultQueryRowID string,
308308
quantization time.Duration,
309309
rollup string,
310310
resultField string,
@@ -336,15 +336,14 @@ func (c *Client) GetQueryResult(
336336
} else {
337337
result, err = c.GetMultiMetricsSearchResult(
338338
queries,
339-
resultQueryRowId,
339+
resultQueryRowID,
340340
quantization,
341341
rollup,
342342
timerange,
343343
timezone,
344344
queryAggregator,
345345
)
346346
}
347-
348347
}
349348

350349
if err != nil {

pkg/scalers/sumologic/sumologic_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func TestGetMultiMetricsSearchResult(t *testing.T) {
403403
name string
404404
config *Config
405405
queries map[string]string
406-
resultQueryRowId string
406+
resultQueryRowID string
407407
quantization time.Duration
408408
rollup string
409409
timerange time.Duration
@@ -426,7 +426,7 @@ func TestGetMultiMetricsSearchResult(t *testing.T) {
426426
"A": "query1",
427427
"B": "query2",
428428
},
429-
resultQueryRowId: "A",
429+
resultQueryRowID: "A",
430430
quantization: 1 * time.Minute,
431431
rollup: "Avg",
432432
timerange: 10 * time.Minute,
@@ -477,7 +477,7 @@ func TestGetMultiMetricsSearchResult(t *testing.T) {
477477
"A": "query1",
478478
"B": "query2",
479479
},
480-
resultQueryRowId: "C",
480+
resultQueryRowID: "C",
481481
quantization: 1 * time.Minute,
482482
rollup: "Avg",
483483
timerange: 10 * time.Minute,
@@ -514,7 +514,7 @@ func TestGetMultiMetricsSearchResult(t *testing.T) {
514514
queries: map[string]string{
515515
"A": "query1",
516516
},
517-
resultQueryRowId: "A",
517+
resultQueryRowID: "A",
518518
quantization: 1 * time.Minute,
519519
rollup: "Avg",
520520
timerange: 10 * time.Minute,
@@ -551,7 +551,7 @@ func TestGetMultiMetricsSearchResult(t *testing.T) {
551551

552552
result, err := client.GetMultiMetricsSearchResult(
553553
test.queries,
554-
test.resultQueryRowId,
554+
test.resultQueryRowID,
555555
test.quantization,
556556
test.rollup,
557557
test.timerange,

pkg/scalers/sumologic_scaler_test.go

+23-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ var validSumologicMetadata = map[string]string{
2929
"unsafeSsl": "false",
3030
"query": "fakeQuery",
3131
"queryType": "logs",
32-
"dimension": "fakeDimension",
3332
"timerange": "5",
3433
"resultField": "fakeResultField",
3534
"timezone": "UTC",
@@ -44,7 +43,6 @@ var validSumologicMetricsMetadata = map[string]string{
4443
"unsafeSsl": "false",
4544
"query": "fakeQuery",
4645
"queryType": "metrics",
47-
"dimension": "fakeDimension",
4846
"timerange": "5",
4947
"timezone": "UTC",
5048
"quantization": "1",
@@ -54,11 +52,30 @@ var validSumologicMetricsMetadata = map[string]string{
5452
"rollup": "Sum",
5553
}
5654

55+
var validSumologicMultiMetricsMetadata = map[string]string{
56+
"host": "https://api.sumologic.com",
57+
"unsafeSsl": "false",
58+
"queryType": "metrics",
59+
"timerange": "5",
60+
"timezone": "UTC",
61+
"quantization": "1",
62+
"activationThreshold": "5",
63+
"threshold": "1",
64+
"queryAggregator": "Avg",
65+
"rollup": "Sum",
66+
"query.A": "fakeQueryA",
67+
"query.B": "fakeQueryB",
68+
"query.C": "fakeQueryC",
69+
"resultQueryRowId": "C",
70+
}
71+
5772
var testSumologicMetadata = []parseSumologicMetadataTestData{
5873
// Valid metadata, pass.
5974
{validSumologicMetadata, validSumologicAuthParams, false},
6075
// Valid metrics metadata with rollup, pass.
6176
{validSumologicMetricsMetadata, validSumologicAuthParams, false},
77+
// Valid multi-metrics metadata, pass.
78+
{validSumologicMultiMetricsMetadata, validSumologicAuthParams, false},
6279
// Missing host, fail.
6380
{map[string]string{"query": "fakeQuery"}, validSumologicAuthParams, true},
6481
// Missing accessID, fail.
@@ -69,8 +86,6 @@ var testSumologicMetadata = []parseSumologicMetadataTestData{
6986
{map[string]string{"host": "https://api.sumologic.com", "query": "fakeQuery", "queryType": "invalid"}, validSumologicAuthParams, true},
7087
// Missing query, fail.
7188
{map[string]string{"host": "https://api.sumologic.com", "queryType": "logs"}, validSumologicAuthParams, true},
72-
// Missing query, fail.
73-
{map[string]string{"host": "https://api.sumologic.com", "queryType": "metrics"}, validSumologicAuthParams, true},
7489
// Missing timerange, fail.
7590
{map[string]string{"host": "https://api.sumologic.com", "query": "fakeQuery", "queryType": "logs"}, validSumologicAuthParams, true},
7691
// Invalid timerange, fail.
@@ -86,13 +101,14 @@ var testSumologicMetadata = []parseSumologicMetadataTestData{
86101
var sumologicMetricIdentifiers = []sumologicMetricIdentifier{
87102
{&testSumologicMetadata[0], 0, "s0-sumologic-logs"},
88103
{&testSumologicMetadata[1], 0, "s0-sumologic-metrics"},
104+
{&testSumologicMetadata[2], 0, "s0-sumologic-metrics"},
89105
}
90106

91107
func TestSumologicParseMetadata(t *testing.T) {
92108
for _, testData := range testSumologicMetadata {
93109
_, err := parseSumoMetadata(&scalersconfig.ScalerConfig{TriggerMetadata: testData.metadata, AuthParams: testData.authParams})
94110
if err != nil && !testData.isError {
95-
t.Error("Expected success but got error", err)
111+
t.Errorf("Expected success but got error: %v", err)
96112
} else if testData.isError && err == nil {
97113
t.Error("Expected error but got success")
98114
}
@@ -104,7 +120,7 @@ func TestSumologicGetMetricSpecForScaling(t *testing.T) {
104120
ctx := context.Background()
105121
meta, err := parseSumoMetadata(&scalersconfig.ScalerConfig{TriggerMetadata: testData.metadataTestData.metadata, AuthParams: validSumologicAuthParams, TriggerIndex: testData.triggerIndex})
106122
if err != nil {
107-
t.Fatal("Could not parse metadata:", err)
123+
t.Fatalf("Could not parse metadata: %v", err)
108124
}
109125
mockSumologicScaler := sumologicScaler{
110126
metadata: meta,
@@ -113,7 +129,7 @@ func TestSumologicGetMetricSpecForScaling(t *testing.T) {
113129
metricSpec := mockSumologicScaler.GetMetricSpecForScaling(ctx)
114130
metricName := metricSpec[0].External.Metric.Name
115131
if metricName != testData.name {
116-
t.Error("Wrong External metric source name:", metricName)
132+
t.Errorf("Wrong External metric source name: got %s, expected %s", metricName, testData.name)
117133
}
118134
}
119135
}

0 commit comments

Comments
 (0)