github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

kubetcl create --validate crashes when no apiVersion or kind is provided

Browse Source
This commit is contained in:
feihujiang 2015-06-07 21:02:27 +08:00
parent 0f1c4c25c3
commit 37abe11f8a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,9 +77,15 @@ func (s *SwaggerSchema) ValidateBytes(data []byte) error {
if !ok { if !ok {
return fmt.Errorf("error in unmarshaling data %s", string(data)) return fmt.Errorf("error in unmarshaling data %s", string(data))
} }
apiVersion := fields["apiVersion"].(string) apiVersion := fields["apiVersion"]
kind := fields["kind"].(string) if apiVersion == nil {
return s.ValidateObject(obj, apiVersion, "", apiVersion+"."+kind) fmt.Errorf("apiVersion not set")
}
kind := fields["kind"]
if kind == nil {
fmt.Errorf("kind not set")
}
return s.ValidateObject(obj, apiVersion.(string), "", apiVersion.(string)+"."+kind.(string))
} }
func (s *SwaggerSchema) ValidateObject(obj interface{}, apiVersion, fieldName, typeName string) error { func (s *SwaggerSchema) ValidateObject(obj interface{}, apiVersion, fieldName, typeName string) error {

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

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

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

@ -213,7 +213,7 @@ func (v *PathVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read %q: %v", v.Path, err) return fmt.Errorf("unable to read %q: %v", v.Path, err)
} }
if err := ValidateSchema(data, v.Schema); err != nil { 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) info, err := v.Mapper.InfoForData(data, v.Path)
if err != nil { if err != nil {
@ -276,7 +276,7 @@ func (v *DirectoryVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read %q: %v", path, err) return fmt.Errorf("unable to read %q: %v", path, err)
} }
if err := ValidateSchema(data, v.Schema); err != nil { 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) info, err := v.Mapper.InfoForData(data, path)
if err != nil { if err != nil {
@ -312,7 +312,7 @@ func (v *URLVisitor) Visit(fn VisitorFunc) error {
return fmt.Errorf("unable to read URL %q: %v\n", v.URL, err) return fmt.Errorf("unable to read URL %q: %v\n", v.URL, err)
} }
if err := ValidateSchema(data, v.Schema); err != nil { 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()) info, err := v.Mapper.InfoForData(data, v.URL.String())
if err != nil { if err != nil {