From 6ec2c54c5bcbf5871d047dddaeb10fda4ea1d084 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:56:57 +0200 Subject: [PATCH] Interval: Use gtime for parsing of time string to duration (#40624) --- pkg/tsdb/intervalv2/intervalv2.go | 3 ++- pkg/tsdb/intervalv2/intervalv2_test.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/intervalv2/intervalv2.go b/pkg/tsdb/intervalv2/intervalv2.go index 14014cd1306..3d7b3b0d20c 100644 --- a/pkg/tsdb/intervalv2/intervalv2.go +++ b/pkg/tsdb/intervalv2/intervalv2.go @@ -7,6 +7,7 @@ import ( "time" "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana/pkg/tsdb/interval" ) @@ -120,7 +121,7 @@ func ParseIntervalStringToTimeDuration(interval string) (time.Duration, error) { if isPureNum { formattedInterval += "s" } - parsedInterval, err := time.ParseDuration(formattedInterval) + parsedInterval, err := gtime.ParseDuration(formattedInterval) if err != nil { return time.Duration(0), err } diff --git a/pkg/tsdb/intervalv2/intervalv2_test.go b/pkg/tsdb/intervalv2/intervalv2_test.go index c5c8f5db858..6f779d8d86c 100644 --- a/pkg/tsdb/intervalv2/intervalv2_test.go +++ b/pkg/tsdb/intervalv2/intervalv2_test.go @@ -112,6 +112,7 @@ func TestGetIntervalFrom(t *testing.T) { {"45s", nil, "45s", 0, time.Second * 15, time.Second * 45}, {"45", nil, "45", 0, time.Second * 15, time.Second * 45}, {"2m", nil, "2m", 0, time.Second * 15, time.Minute * 2}, + {"1d", nil, "1d", 0, time.Second * 15, time.Hour * 24}, {"intervalMs", nil, "", 45000, time.Second * 15, time.Second * 45}, {"intervalMs sub-seconds", nil, "", 45200, time.Second * 15, time.Millisecond * 45200}, {"defaultInterval when interval empty", nil, "", 0, time.Second * 15, time.Second * 15},