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

Merge pull request #16054 from smarterclayton/revert_extension_syntax

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-27 19:57:15 -07:00
parent d228fd6d9c be868e934c
commit d695177229
3 changed files with 14 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/meta/restmapper.go
View File

@@ -169,25 +169,16 @@ func (m *DefaultRESTMapper) ResourceSingularizer(resource string) (singular stri
// VersionAndKindForResource implements RESTMapper
func (m *DefaultRESTMapper) VersionAndKindForResource(resource string) (defaultVersion, kind string, err error) {
if parts := strings.Split(resource, "/"); len(parts) > 1 {
if len(parts) > 2 {
return "", "", fmt.Errorf("resource %q has an invalid name", resource)
}
resource = parts[1]
if m.group != parts[0] {
return "", "", fmt.Errorf("no resource %q is defined for group %q", resource, m.group)
}
}
meta, ok := m.mapping[strings.ToLower(resource)]
if !ok {
return "", "", fmt.Errorf("no resource %q has been defined", resource)
return "", "", fmt.Errorf("in version and kind for resource, no resource %q has been defined", resource)
}
return meta.APIVersion, meta.Kind, nil
}
func (m *DefaultRESTMapper) GroupForResource(resource string) (string, error) {
if _, ok := m.mapping[strings.ToLower(resource)]; !ok {
return "", fmt.Errorf("no resource %q has been defined", resource)
return "", fmt.Errorf("in group for resource, no resource %q has been defined", resource)
}
return m.group, nil
}