Move ExtractQueryOpts

Signed-off-by: SungJin1212 <[email protected]>

Author: SungJin1212

pkg/api/query/handler.go

@@ -93,7 +93,7 @@ func (q *QueryAPI) RangeQueryHandler(r *http.Request) (result apiFuncResult) {
 		defer cancel()
 	}
 
-	opts, err := api.ExtractQueryOpts(r)
+	opts, err := ExtractQueryOpts(r)
 	if err != nil {
 		return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
 	}
@@ -147,7 +147,7 @@ func (q *QueryAPI) InstantQueryHandler(r *http.Request) (result apiFuncResult) {
 		defer cancel()
 	}
 
-	opts, err := api.ExtractQueryOpts(r)
+	opts, err := ExtractQueryOpts(r)
 	if err != nil {
 		return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
 	}

pkg/api/query/util.go

@@ -5,9 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/util/annotations"
+
+	"github.com/cortexproject/cortex/pkg/util/api"
 )
 
 const (
@@ -79,3 +82,17 @@ func invalidParamError(err error, parameter string) apiFuncResult {
 		errorBadData, fmt.Errorf("invalid parameter %q: %w", parameter, err),
 	}, nil, nil}
 }
+
+func ExtractQueryOpts(r *http.Request) (promql.QueryOpts, error) {
+	var duration time.Duration
+
+	if strDuration := r.FormValue("lookback_delta"); strDuration != "" {
+		parsedDuration, err := api.ParseDuration(strDuration)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing lookback delta duration: %w", err)
+		}
+		duration = parsedDuration
+	}
+
+	return promql.NewPrometheusQueryOpts(r.FormValue("stats") == "all", duration), nil
+}

pkg/util/api/parse.go

@@ -39,20 +39,6 @@ var (
 	maxTimeFormatted = MaxTime.Format(time.RFC3339Nano)
 )
 
-func ExtractQueryOpts(r *http.Request) (promql.QueryOpts, error) {
-	var duration time.Duration
-
-	if strDuration := r.FormValue("lookback_delta"); strDuration != "" {
-		parsedDuration, err := ParseDuration(strDuration)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing lookback delta duration: %w", err)
-		}
-		duration = parsedDuration
-	}
-
-	return promql.NewPrometheusQueryOpts(r.FormValue("stats") == "all", duration), nil
-}
-
 func ParseTime(s string) (time.Time, error) {
 	if t, err := strconv.ParseFloat(s, 64); err == nil {
 		s, ns := math.Modf(t)