use util

pkg/costmodel/aggregation.go

@@ -3,7 +3,6 @@ package costmodel
 import (
 	"fmt"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
@@ -12,6 +11,7 @@ import (
 	"github.com/opencost/opencost/core/pkg/filter/allocation"
 	"github.com/opencost/opencost/core/pkg/opencost"
 	"github.com/opencost/opencost/core/pkg/util/httputil"
+	"github.com/opencost/opencost/core/pkg/util/timeutil"
 	"github.com/opencost/opencost/pkg/env"
 )
 
@@ -160,7 +160,7 @@ func resolveStepFromQuery(qp httputil.QueryParams, window opencost.Window, accum
 		// quarter accumulation operates on daily inputs and calendar-rounded query windows
 		return resolveStepForAccumulate(24*time.Hour, accumulateBy), nil
 	default:
-		step, err := parseStepDuration(stepRaw)
+		step, err := timeutil.ParseDuration(stepRaw)
 		if err != nil {
 			return 0, fmt.Errorf("invalid step %q: must be a Go duration or one of hour, day, week, month, quarter: %w", stepRaw, err)
 		}
@@ -168,26 +168,6 @@ func resolveStepFromQuery(qp httputil.QueryParams, window opencost.Window, accum
 	}
 }
 
-func parseStepDuration(stepRaw string) (time.Duration, error) {
-	if strings.HasSuffix(stepRaw, "d") {
-		n, err := strconv.Atoi(strings.TrimSuffix(stepRaw, "d"))
-		if err != nil {
-			return 0, err
-		}
-		return time.Duration(n) * 24 * time.Hour, nil
-	}
-
-	if strings.HasSuffix(stepRaw, "w") {
-		n, err := strconv.Atoi(strings.TrimSuffix(stepRaw, "w"))
-		if err != nil {
-			return 0, err
-		}
-		return time.Duration(n) * 7 * 24 * time.Hour, nil
-	}
-
-	return time.ParseDuration(stepRaw)
-}
-
 func resolveQueryWindowForAccumulate(window opencost.Window, accumulateBy opencost.AccumulateOption) (opencost.Window, error) {
 	switch accumulateBy {
 	case opencost.AccumulateOptionHour, opencost.AccumulateOptionDay, opencost.AccumulateOptionWeek, opencost.AccumulateOptionMonth, opencost.AccumulateOptionQuarter: