support d and w

pkg/costmodel/aggregation.go

@@ -3,6 +3,7 @@ package costmodel
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
@@ -159,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 := time.ParseDuration(stepRaw)
+		step, err := parseStepDuration(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)
 		}
@@ -167,6 +168,26 @@ 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:

pkg/costmodel/aggregation_test.go

@@ -304,6 +304,18 @@ func TestResolveStepFromQuery(t *testing.T) {
 			accumulateBy: opencost.AccumulateOptionWeek,
 			expected:     7 * 24 * time.Hour,
 		},
+		{
+			name:         "day shorthand duration supported",
+			stepRaw:      "1d",
+			accumulateBy: opencost.AccumulateOptionNone,
+			expected:     24 * time.Hour,
+		},
+		{
+			name:         "week shorthand duration supported",
+			stepRaw:      "1w",
+			accumulateBy: opencost.AccumulateOptionNone,
+			expected:     7 * 24 * time.Hour,
+		},
 		{
 			name:         "invalid duration errors",
 			stepRaw:      "not-a-duration",