From 4725ecac3fd261ddfc941f95f140211cf399208e Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Tue, 17 Mar 2015 16:03:38 -0700
Subject: [PATCH] Set the emptyNameError to be a bad request.  Always return a
 JSON error.

---
 pkg/apiserver/api_installer.go |  3 ++-
 pkg/apiserver/resthandler.go   | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go
index 34b1bb3d826..ab098b03f51 100644
--- a/pkg/apiserver/api_installer.go
+++ b/pkg/apiserver/api_installer.go
@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 
@@ -47,7 +48,7 @@ type action struct {
 }
 
 // errEmptyName is returned when API requests do not fill the name section of the path.
-var errEmptyName = fmt.Errorf("name must be provided")
+var errEmptyName = errors.NewBadRequest("name must be provided")
 
 // Installs handlers for API resources.
 func (a *APIInstaller) Install() (ws *restful.WebService, errors []error) {
diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go
index 990f99e15b0..4ce223680dd 100644
--- a/pkg/apiserver/resthandler.go
+++ b/pkg/apiserver/resthandler.go
@@ -64,7 +64,7 @@ func GetResource(r RESTGetter, ctxFn ContextFunc, namer ScopeNamer, codec runtim
 		w := res.ResponseWriter
 		namespace, name, err := namer.Name(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 		ctx := ctxFn(req)
@@ -108,7 +108,7 @@ func ListResource(r RESTLister, ctxFn ContextFunc, namer ScopeNamer, codec runti
 
 		namespace, err := namer.Namespace(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 		ctx := ctxFn(req)
@@ -143,7 +143,7 @@ func CreateResource(r RESTCreater, ctxFn ContextFunc, namer ScopeNamer, codec ru
 
 		namespace, err := namer.Namespace(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 		ctx := ctxFn(req)
@@ -200,7 +200,7 @@ func PatchResource(r RESTPatcher, ctxFn ContextFunc, namer ScopeNamer, codec run
 
 		namespace, name, err := namer.Name(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 
@@ -275,7 +275,7 @@ func UpdateResource(r RESTUpdater, ctxFn ContextFunc, namer ScopeNamer, codec ru
 
 		namespace, name, err := namer.Name(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 		ctx := ctxFn(req)
@@ -339,7 +339,7 @@ func DeleteResource(r RESTDeleter, ctxFn ContextFunc, namer ScopeNamer, codec ru
 
 		namespace, name, err := namer.Name(req)
 		if err != nil {
-			notFound(w, req.Request)
+			errorJSON(err, codec, w)
 			return
 		}
 		ctx := ctxFn(req)