From 7b56d89e80e3105b9686d1ca44ebc329bebff3f4 Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Tue, 23 Jun 2015 16:49:54 -0700
Subject: [PATCH] Returning api/errors from event

---
 pkg/registry/event/rest.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/registry/event/rest.go b/pkg/registry/event/rest.go
index 67503205e4d..edb514c0a07 100644
--- a/pkg/registry/event/rest.go
+++ b/pkg/registry/event/rest.go
@@ -45,7 +45,7 @@ func NewStorage(registry generic.Registry) *REST {
 func (rs *REST) Create(ctx api.Context, obj runtime.Object) (runtime.Object, error) {
 	event, ok := obj.(*api.Event)
 	if !ok {
-		return nil, fmt.Errorf("invalid object type")
+		return nil, errors.NewInternalError(fmt.Errorf("received object is not of type event: %#v", obj))
 	}
 	if api.NamespaceValue(ctx) != "" {
 		if !api.ValidNamespace(ctx, &event.ObjectMeta) {
@@ -68,7 +68,8 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (runtime.Object, err
 func (rs *REST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool, error) {
 	event, ok := obj.(*api.Event)
 	if !ok {
-		return nil, false, fmt.Errorf("not an event object: %#v", obj)
+		return nil, false, errors.NewInternalError(fmt.Errorf("received object is not of type event: %#v", obj))
+
 	}
 	if api.NamespaceValue(ctx) != "" {
 		if !api.ValidNamespace(ctx, &event.ObjectMeta) {
@@ -95,19 +96,19 @@ func (rs *REST) Delete(ctx api.Context, name string) (runtime.Object, error) {
 	}
 	_, ok := obj.(*api.Event)
 	if !ok {
-		return nil, fmt.Errorf("invalid object type")
+		return nil, errors.NewInternalError(fmt.Errorf("stored object %s is not of type event: %#v", name, obj))
 	}
 	return rs.registry.Delete(ctx, name, nil)
 }
 
-func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
-	obj, err := rs.registry.Get(ctx, id)
+func (rs *REST) Get(ctx api.Context, name string) (runtime.Object, error) {
+	obj, err := rs.registry.Get(ctx, name)
 	if err != nil {
 		return nil, err
 	}
 	event, ok := obj.(*api.Event)
 	if !ok {
-		return nil, fmt.Errorf("invalid object type")
+		return nil, errors.NewInternalError(fmt.Errorf("stored object %s is not of type event: %#v", name, obj))
 	}
 	return event, err
 }
@@ -115,7 +116,7 @@ func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
 func (rs *REST) getAttrs(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, err error) {
 	event, ok := obj.(*api.Event)
 	if !ok {
-		return nil, nil, fmt.Errorf("invalid object type")
+		return nil, nil, errors.NewInternalError(fmt.Errorf("object is not of type event: %#v", obj))
 	}
 	l := event.Labels
 	if l == nil {