Skip to content

Fix field path in error message for HTTPRoute path validation #587

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

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Fix field path in error message for HTTPRoute path validation #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96da3f5
Fix field path in error message for HTTPRoute path validation
pleshakov Apr 21, 2023
5d2d47d
Fix unit test
pleshakov Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/state/graph/httproute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,12 @@ func validatePathMatch(
}

if *path.Type != v1beta1.PathMatchPathPrefix {
valErr := field.NotSupported(fieldPath, *path.Type, []string{string(v1beta1.PathMatchPathPrefix)})
valErr := field.NotSupported(fieldPath.Child("type"), *path.Type, []string{string(v1beta1.PathMatchPathPrefix)})
allErrs = append(allErrs, valErr)
}

if err := validator.ValidatePathInPrefixMatch(*path.Value); err != nil {
valErr := field.Invalid(fieldPath, *path.Value, err.Error())
valErr := field.Invalid(fieldPath.Child("value"), *path.Value, err.Error())
allErrs = append(allErrs, valErr)
}

Expand Down
4 changes: 2 additions & 2 deletions internal/state/graph/httproute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ func TestBuildRoute(t *testing.T) {
},
Conditions: []conditions.Condition{
conditions.NewRouteUnsupportedValue(
`All rules are invalid: spec.rules[0].matches[0].path: Invalid value: "/invalid": invalid path`,
`All rules are invalid: spec.rules[0].matches[0].path.value: Invalid value: "/invalid": invalid path`,
),
},
Rules: []Rule{
Expand Down Expand Up @@ -581,7 +581,7 @@ func TestBuildRoute(t *testing.T) {
Conditions: []conditions.Condition{
conditions.NewTODO(
`Some rules are invalid: ` +
`[spec.rules[0].matches[0].path: Invalid value: "/invalid": invalid path, ` +
`[spec.rules[0].matches[0].path.value: Invalid value: "/invalid": invalid path, ` +
`spec.rules[1].filters[0].requestRedirect.hostname: Invalid value: ` +
`"invalid.example.com": invalid hostname]`,
),
Expand Down