Support query at the Elasticsearch scaler test

Signed-off-by: rickbrouwer <rickbrouwer@gmail.com>
rickbrouwer · Oct 21, 2024 · 858c8a3 · 858c8a3
1 parent ca52fae
commit 858c8a3
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 7 deletions.
diff --git a/pkg/scalers/elasticsearch_scaler_test.go b/pkg/scalers/elasticsearch_scaler_test.go
@@ -73,13 +73,34 @@ var testCases = []parseElasticsearchMetadataTestData{
 		expectedError: fmt.Errorf("missing required parameter \"index\""),
 	},
 	{
-		name: "no searchTemplateName given",
+		name: "query and searchTemplateName provided",
 		metadata: map[string]string{
-			"addresses": "http://localhost:9200",
-			"index":     "index1",
+			"addresses":          "http://localhost:9200",
+			"index":              "index1",
+			"query":              `{"match": {"field": "value"}}`,
+			"searchTemplateName": "myTemplate",
+			"valueLocation":      "hits.total.value",
+			"targetValue":        "12",
 		},
-		authParams:    map[string]string{"username": "admin"},
-		expectedError: fmt.Errorf("missing required parameter \"searchTemplateName\""),
+		authParams: map[string]string{
+			"username": "admin",
+			"password": "password",
+		},
+		expectedError: fmt.Errorf("cannot provide both searchTemplateName and query"),
+	},
+	{
+		name: "neither query nor searchTemplateName provided",
+		metadata: map[string]string{
+			"addresses":     "http://localhost:9200",
+			"index":         "index1",
+			"valueLocation": "hits.total.value",
+			"targetValue":   "12",
+		},
+		authParams: map[string]string{
+			"username": "admin",
+			"password": "password",
+		},
+		expectedError: fmt.Errorf("either searchTemplateName or query must be provided"),
 	},
 	{
 		name: "no valueLocation given",
@@ -306,6 +327,31 @@ var testCases = []parseElasticsearchMetadataTestData{
 		},
 		expectedError: nil,
 	},
+	{
+		name: "valid query parameter",
+		metadata: map[string]string{
+			"addresses":     "http://localhost:9200",
+			"index":         "index1",
+			"query":         `{"match": {"field": "value"}}`,
+			"valueLocation": "hits.total.value",
+			"targetValue":   "12",
+		},
+		authParams: map[string]string{
+			"username": "admin",
+			"password": "password",
+		},
+		expectedMetadata: &elasticsearchMetadata{
+			Addresses:     []string{"http://localhost:9200"},
+			Index:         []string{"index1"},
+			Username:      "admin",
+			Password:      "password",
+			Query:         `{"match": {"field": "value"}}`,
+			ValueLocation: "hits.total.value",
+			TargetValue:   12,
+			MetricName:    "s0-elasticsearch-query",
+		},
+		expectedError: nil,
+	},
 }
 
 func TestParseElasticsearchMetadata(t *testing.T) {

diff --git a/tests/scalers/elasticsearch/elasticsearch_test.go b/tests/scalers/elasticsearch/elasticsearch_test.go
@@ -445,5 +445,3 @@ func getTemplateData() (templateData, []Template) {
 			{Name: "deploymentTemplate", Config: deploymentTemplate},
 		}
 }
-
-