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

Merge pull request #9376 from feihujiang/createValidateCrash

Browse Source 
kubetcl create --validate crashes when no apiVersion or kind is provided
This commit is contained in:
krousey
2015-06-09 09:59:42 -07:00
parent e19e4bcd12 37abe11f8a
commit ff474e5d7e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/util/factory.go
View File

@@ -266,7 +266,7 @@ type clientSwaggerSchema struct {
}
func (c *clientSwaggerSchema) ValidateBytes(data []byte) error {
version, _, err := c.t.DataVersionAndKind(data)
version, _, err := runtime.UnstructuredJSONScheme.DataVersionAndKind(data)
if err != nil {
return err
}

6
pkg/kubectl/resource/visitor.go
View File

@@ -215,7 +215,7 @@ func (v *PathVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read %q: %v", v.Path, err)
}
if err := ValidateSchema(data, v.Schema); err != nil {
return err
return fmt.Errorf("error validating %q: %v", v.Path, err)
}
info, err := v.Mapper.InfoForData(data, v.Path)
if err != nil {
@@ -278,7 +278,7 @@ func (v *DirectoryVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read %q: %v", path, err)
}
if err := ValidateSchema(data, v.Schema); err != nil {
return err
return fmt.Errorf("error validating %q: %v", path, err)
}
info, err := v.Mapper.InfoForData(data, path)
if err != nil {
@@ -314,7 +314,7 @@ func (v *URLVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read URL %q: %v\n", v.URL, err)
}
if err := ValidateSchema(data, v.Schema); err != nil {
return err
return fmt.Errorf("error validating %q: %v", v.URL, err)
}
info, err := v.Mapper.InfoForData(data, v.URL.String())
if err != nil {