Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG 1825851: Ensure malformed IntOrPercent returns error #562

Merged
merged 1 commit into from Apr 20, 2020
Merged

BUG 1825851: Ensure malformed IntOrPercent returns error #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
View file
Open in desktop
Expand Up @@ -692,9 +692,9 @@ func getIntOrPercentValue(intOrStr *intstr.IntOrString) (int, bool, error) {
case intstr.String:
isPercent := false
s := intOrStr.StrVal
if strings.Contains(s, "%") {
if strings.HasSuffix(s, "%") {
isPercent = true
s = strings.Replace(intOrStr.StrVal, "%", "", -1)
s = strings.TrimSuffix(intOrStr.StrVal, "%")
}
v, err := strconv.Atoi(s)
if err != nil {
Expand Down
8 changes: 8 additions & 0 deletions pkg/controller/machinehealthcheck/machinehealthcheck_controller_test.go
View file
Open in desktop
Expand Up @@ -2648,6 +2648,7 @@ func TestGetIntOrPercentValue(t *testing.T) {
intInString30 := intstr.FromString("30")
invalidStringA := intstr.FromString("a")
invalidStringAPercent := intstr.FromString("a%")
invalidStringNumericPercent := intstr.FromString("1%0")

testCases := []struct {
name string
Expand Down Expand Up @@ -2691,6 +2692,13 @@ func TestGetIntOrPercentValue(t *testing.T) {
expectedPercent: true,
expectedError: fmt.Errorf("invalid value \"a%%\": strconv.Atoi: parsing \"a\": invalid syntax"),
},
{
name: "with an '1%0' string",
in: &invalidStringNumericPercent,
expectedValue: 0,
expectedPercent: false,
expectedError: fmt.Errorf("invalid value \"1%%0\": strconv.Atoi: parsing \"1%%0\": invalid syntax"),
},
}

for _, tc := range testCases {
Expand Down