validateTypeStringNullableIntOrPercent should tolerate 100% value (#…

…1107) * validateTypeStringNullableIntOrPercent should tolerate `100%` value * Add unit test for validateTypeStringNullableIntOrPercent Co-authored-by: John Houston <[email protected]>
hashicorp · Mar 31, 2021 · ddc3070 · ddc3070
1 parent 1039c8f
commit ddc3070
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/kubernetes/validators.go b/kubernetes/validators.go
@@ -281,7 +281,7 @@ func validateTypeStringNullableIntOrPercent(v interface{}, key string) (ws []str
 		if err != nil {
 			es = append(es, fmt.Errorf("%s: cannot parse '%s' as percent: %s", key, value, err))
 		}
-		if percent < 0 || percent >= 100 {
+		if percent < 0 || percent > 100 {
 			es = append(es, fmt.Errorf("%s: '%s' is not between 0%% and 100%%", key, value))
 		}
 	} else if _, err := strconv.ParseInt(value, 10, 32); err != nil {

diff --git a/kubernetes/validators_test.go b/kubernetes/validators_test.go
@@ -131,3 +131,33 @@ func TestValidateNonNegativeInteger(t *testing.T) {
 		}
 	}
 }
+
+func TestValidateTypeStringNullableIntOrPercent(t *testing.T) {
+	validCases := []string{
+		"",
+		"1",
+		"100",
+		"1%",
+		"100%",
+	}
+	for _, data := range validCases {
+		_, es := validateTypeStringNullableIntOrPercent(data, "replicas")
+		if len(es) > 0 {
+			t.Fatalf("Expected %q to be valid: %#v", data, es)
+		}
+	}
+	invalidCases := []string{
+		" ",
+		"0.1",
+		"test",
+		"!@@#$",
+		"💣",
+		"%",
+	}
+	for _, data := range invalidCases {
+		_, es := validateTypeStringNullableIntOrPercent(data, "replicas")
+		if len(es) == 0 {
+			t.Fatalf("Expected %q to be invalid", data)
+		}
+	}
+}