pkg/custom-provider: update expected test queries

kubernetes-sigs · Aug 13, 2024 · 69ae2d1 · 69ae2d1
1 parent 7d89537
commit 69ae2d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/pkg/custom-provider/series_registry_test.go b/pkg/custom-provider/series_registry_test.go
@@ -164,7 +164,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}) by (pod)",
+				expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}) by (pod)",
 			},
 			{
 				title:          "container metrics counter",
@@ -173,7 +173,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)",
+				expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}[1m])) by (pod)",
 			},
 			{
 				title:          "container metrics seconds counter",
@@ -182,7 +182,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)",
+				expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}[1m])) by (pod)",
 			},
 			// namespaced metrics
 			{

diff --git a/pkg/naming/metrics_query.go b/pkg/naming/metrics_query.go
@@ -364,12 +364,6 @@ func compactRegexp(values []string) (string, error) {
 			return "", ErrMalformedQuery
 		}
 	}
-	if len(values) == 0 {
-		return "", nil
-	}
-	if len(values) == 1 {
-		return values[0], nil
-	}
 	expr := strings.Join(values, "|")
 	re, err := syntax.Parse(expr, syntax.POSIX)
 	if err != nil {