model.Duration: disallow empty string

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
prometheus · Aug 3, 2020 · 3b24f1e · 3b24f1e
1 parent 9c5aa1e
commit 3b24f1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/model/time.go b/model/time.go
@@ -190,6 +190,9 @@ func ParseDuration(durationStr string) (Duration, error) {
 	if durationStr == "0" {
 		return 0, nil
 	}
+	if durationStr == "" {
+		return 0, fmt.Errorf("empty duration string")
+	}
 	matches := durationRE.FindStringSubmatch(durationStr)
 	if matches == nil {
 		return 0, fmt.Errorf("not a valid duration string: %q", durationStr)

diff --git a/model/time_test.go b/model/time_test.go
@@ -163,6 +163,7 @@ func TestParseBadDuration(t *testing.T) {
 		"1y1m1d",
 		"-1w",
 		"1.5d",
+		"",
 	}
 
 	for _, c := range cases {
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,6 +163,7 @@ func TestParseBadDuration(t *testing.T) { @@
     		"1y1m1d",
     		"-1w",
     		"1.5d",
+    		"",
     	}
     	for _, c := range cases {
@@ Expand Down @@