github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Switch some parse errors to return HTTP 400 instead of the default (500)

Browse Source
This commit is contained in:
Brendan Burns 2015-03-09 20:32:33 -07:00
parent a4d871a100
commit 5b3b330bb8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/apiserver/resthandler.go
View File

@ -82,17 +82,19 @@ func GetResource(r RESTGetter, ctxFn ContextFunc, namer ScopeNamer, codec runtim
} }
func parseSelectorQueryParams(query url.Values, version, apiResource string) (label, field labels.Selector, err error) { func parseSelectorQueryParams(query url.Values, version, apiResource string) (label, field labels.Selector, err error) {
label, err = labels.Parse(query.Get("labels")) labelString := query.Get("labels")
label, err = labels.Parse(labelString)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, errors.NewBadRequest(fmt.Sprintf("The 'labels' selector parameter (%s) could not be parsed: %v", labelString, err))
} }
convertToInternalVersionFunc := func(label, value string) (newLabel, newValue string, err error) { convertToInternalVersionFunc := func(label, value string) (newLabel, newValue string, err error) {
return api.Scheme.ConvertFieldLabel(version, apiResource, label, value) return api.Scheme.ConvertFieldLabel(version, apiResource, label, value)
} }
field, err = labels.ParseAndTransformSelector(query.Get("fields"), convertToInternalVersionFunc) fieldString := query.Get("fields")
field, err = labels.ParseAndTransformSelector(fieldString, convertToInternalVersionFunc)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, errors.NewBadRequest(fmt.Sprintf("The 'fields' selector parameter (%s) could not be parsed: %v", fieldString, err))
} }
return label, field, nil return label, field, nil
} }