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

alias local packagename for pkg/util/errors

Browse Source
This commit is contained in:
eulerzgy
2015-10-14 13:18:37 +08:00
parent 0338e0ef53
commit f8f9afb874
29 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ import (
"github.com/emicklei/go-restful/swagger"
"github.com/golang/glog"
apiutil "k8s.io/kubernetes/pkg/api/util"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
errs "k8s.io/kubernetes/pkg/util/fielderrors"
"k8s.io/kubernetes/pkg/util/yaml"
)
@@ -150,14 +150,14 @@ func (s *SwaggerSchema) ValidateBytes(data []byte) error {
return fmt.Errorf("kind isn't string type")
}
if strings.HasSuffix(kind.(string), "List") {
return errors.NewAggregate(s.validateList(fields))
return utilerrors.NewAggregate(s.validateList(fields))
}
version := apiutil.GetVersion(groupVersion.(string))
allErrs := s.ValidateObject(obj, "", version+"."+kind.(string))
if len(allErrs) == 1 {
return allErrs[0]
}
return errors.NewAggregate(allErrs)
return utilerrors.NewAggregate(allErrs)
}
func (s *SwaggerSchema) ValidateObject(obj interface{}, fieldName, typeName string) errs.ValidationErrorList {