github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Rename all XStorage types to REST for clarity

Browse Source
This commit is contained in:
Daniel Smith
2014-09-08 14:40:56 -07:00
parent 9954ce6ee7
commit 759c3f9033
13 changed files with 149 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/registry/minion/storage.go → pkg/registry/minion/rest.go
View File

@@ -26,19 +26,19 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
)
// RegistryStorage implements the RESTStorage interface, backed by a MinionRegistry.
type RegistryStorage struct {
// REST implements the RESTStorage interface, backed by a MinionRegistry.
type REST struct {
registry Registry
}
// NewRegistryStorage returns a new RegistryStorage.
func NewRegistryStorage(m Registry) apiserver.RESTStorage {
return &RegistryStorage{
// NewREST returns a new REST.
func NewREST(m Registry) *REST {
return &REST{
registry: m,
}
}
func (rs *RegistryStorage) Create(obj runtime.Object) (<-chan runtime.Object, error) {
func (rs *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {
minion, ok := obj.(*api.Minion)
if !ok {
return nil, fmt.Errorf("not a minion: %#v", obj)
@@ -65,7 +65,7 @@ func (rs *RegistryStorage) Create(obj runtime.Object) (<-chan runtime.Object, er
}), nil
}
func (rs *RegistryStorage) Delete(id string) (<-chan runtime.Object, error) {
func (rs *REST) Delete(id string) (<-chan runtime.Object, error) {
exists, err := rs.registry.Contains(id)
if !exists {
return nil, ErrDoesNotExist
@@ -78,7 +78,7 @@ func (rs *RegistryStorage) Delete(id string) (<-chan runtime.Object, error) {
}), nil
}
func (rs *RegistryStorage) Get(id string) (runtime.Object, error) {
func (rs *REST) Get(id string) (runtime.Object, error) {
exists, err := rs.registry.Contains(id)
if !exists {
return nil, ErrDoesNotExist
@@ -86,7 +86,7 @@ func (rs *RegistryStorage) Get(id string) (runtime.Object, error) {
return rs.toApiMinion(id), err
}
func (rs *RegistryStorage) List(selector labels.Selector) (runtime.Object, error) {
func (rs *REST) List(selector labels.Selector) (runtime.Object, error) {
nameList, err := rs.registry.List()
if err != nil {
return nil, err
@@ -98,14 +98,14 @@ func (rs *RegistryStorage) List(selector labels.Selector) (runtime.Object, error
return &list, nil
}
func (rs RegistryStorage) New() runtime.Object {
func (*REST) New() runtime.Object {
return &api.Minion{}
}
func (rs *RegistryStorage) Update(minion runtime.Object) (<-chan runtime.Object, error) {
func (rs *REST) Update(minion runtime.Object) (<-chan runtime.Object, error) {
return nil, fmt.Errorf("Minions can only be created (inserted) and deleted.")
}
func (rs *RegistryStorage) toApiMinion(name string) *api.Minion {
func (rs *REST) toApiMinion(name string) *api.Minion {
return &api.Minion{JSONBase: api.JSONBase{ID: name}}
}

4
pkg/registry/minion/storage_test.go → pkg/registry/minion/rest_test.go
View File

@@ -24,9 +24,9 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
)
func TestMinionRegistryStorage(t *testing.T) {
func TestMinionREST(t *testing.T) {
m := NewRegistry([]string{"foo", "bar"})
ms := NewRegistryStorage(m)
ms := NewREST(m)
if obj, err := ms.Get("foo"); err != nil || obj.(*api.Minion).ID != "foo" {
t.Errorf("missing expected object")