github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40225 from shiywang/newtest

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40066, 36250, 40255, 40225, 40204)

Fix validation errors in cli are cryptic

fix issue https://github.com/kubernetes/kubernetes/issues/39811

now the error message is like: 
`error validating "/home/shiywang/template/test.yaml": error validating data: field ports for v1.ServiceSpec: is required; if you choose to ignore these errors, turn validation off with --validate=false`

still need add some unit test, plz don't test now
This commit is contained in:
Kubernetes Submit Queue
2017-01-23 02:29:09 -08:00
committed by GitHub
parent 5775b57f36 6f5b8af725
commit 36aa4a9ac0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/validation/schema.go
View File

@@ -253,7 +253,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
if !ok && s.delegate != nil { if !ok && s.delegate != nil {
fields, mapOk := obj.(map[string]interface{}) fields, mapOk := obj.(map[string]interface{})
if !mapOk { if !mapOk {
return append(allErrs, fmt.Errorf("field %s: expected object of type map[string]interface{}, but the actual type is %T", fieldName, obj)) return append(allErrs, fmt.Errorf("field %s for %s: expected object of type map[string]interface{}, but the actual type is %T", fieldName, typeName, obj))
} }
if delegated, err := s.delegateIfDifferentApiVersion(&unstructured.Unstructured{Object: fields}); delegated { if delegated, err := s.delegateIfDifferentApiVersion(&unstructured.Unstructured{Object: fields}); delegated {
if err != nil { if err != nil {
@@ -273,7 +273,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
} }
fields, ok := obj.(map[string]interface{}) fields, ok := obj.(map[string]interface{})
if !ok { if !ok {
return append(allErrs, fmt.Errorf("field %s: expected object of type map[string]interface{}, but the actual type is %T", fieldName, obj)) return append(allErrs, fmt.Errorf("field %s for %s: expected object of type map[string]interface{}, but the actual type is %T", fieldName, typeName, obj))
} }
if len(fieldName) > 0 { if len(fieldName) > 0 {
fieldName = fieldName + "." fieldName = fieldName + "."
@@ -281,7 +281,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
// handle required fields // handle required fields
for _, requiredKey := range model.Required { for _, requiredKey := range model.Required {
if _, ok := fields[requiredKey]; !ok { if _, ok := fields[requiredKey]; !ok {
allErrs = append(allErrs, fmt.Errorf("field %s: is required", requiredKey)) allErrs = append(allErrs, fmt.Errorf("field %s for %s: is required", requiredKey, typeName))
} }
} }
for key, value := range fields { for key, value := range fields {