Merge pull request #39135 from xingzhou/kube-39110

Automatic merge from submit-queue Improve error messages for ValidateObject method. Improved error messages for #ValidateObject method in pkg/api/validation/schema.go. Fixed #39110

Merge pull request #39135 from xingzhou/kube-39110
a3f8ee65 · Kubernetes Submit Queue · GitHub · 4bba6105 · 0177cbae · a3f8ee65
Commit a3f8ee65 authored Jan 29, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

schema.go pkg/api/validation/schema.go +3 -3

No files found.
--- a/pkg/api/validation/schema.go
+++ b/pkg/api/validation/schema.go
@@ -281,7 +281,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
 	// handle required fields
 	for _, requiredKey := range model.Required {
 		if _, ok := fields[requiredKey]; !ok {
-			allErrs = append(allErrs, fmt.Errorf("field %s for %s: is required", requiredKey, typeName))
+			allErrs = append(allErrs, fmt.Errorf("field %s%s for %s is required", fieldName, requiredKey, typeName))
 		}
 	}
 	for key, value := range fields {
@@ -302,7 +302,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
 			continue
 		}
 		if details.Type == nil && details.Ref == nil {
-			allErrs = append(allErrs, fmt.Errorf("could not find the type of %s from object: %v", key, details))
+			allErrs = append(allErrs, fmt.Errorf("could not find the type of %s%s from object %v", fieldName, key, details))
 		}
 		var fieldType string
 		if details.Type != nil {
@@ -311,7 +311,7 @@ func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName stri
 			fieldType = *details.Ref
 		}
 		if value == nil {
-			glog.V(2).Infof("Skipping nil field: %s", key)
+			glog.V(2).Infof("Skipping nil field: %s%s", fieldName, key)
 			continue
 		}
 		errs := s.validateField(value, fieldName+key, fieldType, &details)