From d3def128417a36f6631ffda9138914c19d37d086 Mon Sep 17 00:00:00 2001 From: greg linton Date: Fri, 28 Aug 2020 17:01:34 -0600 Subject: [PATCH 1/2] fix: use valid flux in test templates --- pkger/parser_models.go | 11 +++++++++-- pkger/testdata/dashboard_params.yml | 2 +- pkger/testdata/tasks_params.yml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkger/parser_models.go b/pkger/parser_models.go index 7606cf656b3..b902bb1c509 100644 --- a/pkger/parser_models.go +++ b/pkger/parser_models.go @@ -2322,7 +2322,11 @@ func astDurationFromIface(v interface{}) *ast.DurationLiteral { } s = d.String() } - dur, _ := parser.ParseSignedDuration(s) + + dur, err := parser.ParseSignedDuration(s) + if err != nil { + dur, _ = parser.ParseSignedDuration("-0m") + } return dur } @@ -2363,7 +2367,10 @@ func astTimeFromIface(v interface{}) *ast.DateTimeLiteral { return nil } - t, _ := parser.ParseTime(s) + t, err := parser.ParseTime(s) + if err != nil { + return ast.DateTimeLiteralFromValue(time.Now()) + } return t } diff --git a/pkger/testdata/dashboard_params.yml b/pkger/testdata/dashboard_params.yml index ca883512162..f83a1e26185 100644 --- a/pkger/testdata/dashboard_params.yml +++ b/pkger/testdata/dashboard_params.yml @@ -22,7 +22,7 @@ spec: } from(bucket: params.bucket) - |> range(start: params.start, end: params.stop) + |> range(start: params.start, stop: params.stop) |> filter(fn: (r) => r._measurement == "processes") |> filter(fn: (r) => r.floater == params.floatVal) |> filter(fn: (r) => r._value > params.minVal) diff --git a/pkger/testdata/tasks_params.yml b/pkger/testdata/tasks_params.yml index be7d1b0a57c..77f4e1c2bf0 100644 --- a/pkger/testdata/tasks_params.yml +++ b/pkger/testdata/tasks_params.yml @@ -15,7 +15,7 @@ spec: } from(bucket: params.bucket) - |> range(start: params.start, end: params.stop) + |> range(start: params.start, stop: params.stop) |> filter(fn: (r) => r._measurement == "processes") |> filter(fn: (r) => r.floater == params.floatVal) |> filter(fn: (r) => r._value > params.minVal) From 9c17ddd8c95ec4ccfb8fad7b502d86393b0e017e Mon Sep 17 00:00:00 2001 From: greg linton Date: Fri, 28 Aug 2020 17:14:05 -0600 Subject: [PATCH 2/2] chore: update tests --- pkger/parser_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkger/parser_test.go b/pkger/parser_test.go index 0936cef80aa..0e48d3d2cde 100644 --- a/pkger/parser_test.go +++ b/pkger/parser_test.go @@ -2414,7 +2414,7 @@ spec: } from(bucket: params.bucket) - |> range(start: params.start, end: params.stop) + |> range(start: params.start, stop: params.stop) |> filter(fn: (r) => (r._measurement == "processes")) |> filter(fn: (r) => @@ -3414,7 +3414,7 @@ spec: } from(bucket: params.bucket) - |> range(start: params.start, end: params.stop) + |> range(start: params.start, stop: params.stop) |> filter(fn: (r) => (r._measurement == "processes")) |> filter(fn: (r) =>