fix: use valid flux in pkger test templates (#19465)

influxdata · Oct 19, 2020 · b63bcb4 · b63bcb4
1 parent 2b828c5
commit b63bcb4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/pkger/parser_models.go b/pkger/parser_models.go
@@ -2346,7 +2346,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
 }
 
@@ -2387,7 +2391,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/parser_test.go b/pkger/parser_test.go
@@ -2433,7 +2433,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) =>
@@ -3433,7 +3433,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) =>

diff --git 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
@@ -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)