query rejection

     small fixes.

Signed-off-by: Erlan Zholdubai uulu <[email protected]>

Author: erlan-z

pkg/querier/tripperware/query_attribute_matcher.go

@@ -15,7 +15,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/util/validation"
 )
 
-const queryRejectErrorMessage = "Query was rejected by operator. Please contact the support for further questions"
+const queryRejectErrorMessage = "This query has been rejected by the service operator. Please contact customer support for more information."
 
 func rejectQueryOrSetPriority(r *http.Request, now time.Time, lookbackDelta time.Duration, limits Limits, userStr string, rejectedQueriesPerTenant *prometheus.CounterVec) error {
 	if limits == nil || !(limits.QueryPriority(userStr).Enabled || limits.QueryRejection(userStr).Enabled) {
@@ -162,14 +162,14 @@ func isWithinQueryStepLimit(queryStepLimit validation.QueryStepLimit, r *http.Re
 	}
 
 	step, err := util.ParseDurationMs(r.FormValue("step"))
-	if err == nil {
-		if queryStepLimit.Min != 0 && time.Duration(queryStepLimit.Min).Milliseconds() > step {
-			return false
-		}
-
-		if queryStepLimit.Max != 0 && time.Duration(queryStepLimit.Max).Milliseconds() < step {
-			return false
-		}
+	if err != nil {
+		return false
+	}
+	if queryStepLimit.Min != 0 && time.Duration(queryStepLimit.Min).Milliseconds() > step {
+		return false
+	}
+	if queryStepLimit.Max != 0 && time.Duration(queryStepLimit.Max).Milliseconds() < step {
+		return false
 	}
 
 	var subQueryStep time.Duration

pkg/querier/tripperware/query_attribute_matcher_test.go

@@ -240,11 +240,10 @@ func Test_isWithinQueryStepLimit(t *testing.T) {
 			step:           "15s",
 			expectedResult: true,
 		},
-		"query should be considered within the step limit if query doesn't have steps": {
+		"query should be considered outside of the step limit if query doesn't have steps": {
 			queryString:    "count(sum(up))",
 			step:           "not_parseable",
 			queryStepLimit: queryStepLimit,
-			expectedResult: true,
 		},
 		"should match if step limit set and step is within the range": {
 			step:           "15s",