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

Rename methods in api/meta to be cleaner

Browse Source
This commit is contained in:
Clayton Coleman
2014-10-22 22:54:34 -04:00
parent 64d98cba73
commit 1ccb86c760
12 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/ref.go
View File

@@ -36,7 +36,7 @@ func GetReference(obj runtime.Object) (*ObjectReference, error) {
if obj == nil {
return nil, ErrNilObject
}
jsonBase, err := meta.FindTypeMeta(obj)
accessor, err := meta.FindAccessor(obj)
if err != nil {
return nil, err
}
@@ -44,16 +44,16 @@ func GetReference(obj runtime.Object) (*ObjectReference, error) {
if err != nil {
return nil, err
}
version := versionFromSelfLink.FindStringSubmatch(jsonBase.SelfLink())
version := versionFromSelfLink.FindStringSubmatch(accessor.SelfLink())
if len(version) < 2 {
return nil, fmt.Errorf("unexpected self link format: %v", jsonBase.SelfLink())
return nil, fmt.Errorf("unexpected self link format: %v", accessor.SelfLink())
}
return &ObjectReference{
Kind: kind,
APIVersion: version[1],
// TODO: correct Name and UID when TypeMeta makes a distinction
Name: jsonBase.ID(),
UID: jsonBase.ID(),
ResourceVersion: jsonBase.ResourceVersion(),
Name: accessor.Name(),
UID: accessor.Name(),
ResourceVersion: accessor.ResourceVersion(),
}, nil
}