pkg/apiserver: split code out of pkg/apiserver

- move rest handler into handlers package
- move errors into handlers/errors package
- move negotation code into handlers/negotation package
- move http response writer helpers into handlers/responsewriter package
- split up pkg/apiserver/apiserver.go

Note: this is only an intermediate step towards a proper genericapiserver
package hierarchy.

cmd/kubernetes-discovery/pkg/apiserver/handler_apis.go

@@ -23,7 +23,7 @@ import (
  "k8s.io/kubernetes/pkg/api"
  apierrors "k8s.io/kubernetes/pkg/api/errors"
  metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
- "k8s.io/kubernetes/pkg/apiserver"
+ "k8s.io/kubernetes/pkg/apiserver/handlers/responsewriters"
  v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1"
  "k8s.io/kubernetes/pkg/labels"
  "k8s.io/kubernetes/pkg/runtime"
@@ -187,7 +187,7 @@ func (r *apiGroupHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
  apiServices, err := r.lister.List(labels.Everything())
  if statusErr, ok := err.(*apierrors.StatusError); ok && err != nil {
- apiserver.WriteRawJSON(int(statusErr.Status().Code), statusErr.Status(), w)
+ responsewriters.WriteRawJSON(int(statusErr.Status().Code), statusErr.Status(), w)
  return
  }
  if err != nil {

cmd/kubernetes-discovery/pkg/apiserver/handler_proxy.go

@@ -22,7 +22,7 @@ import (
  "sync"
 
  "k8s.io/kubernetes/pkg/api"
- "k8s.io/kubernetes/pkg/apiserver"
+ "k8s.io/kubernetes/pkg/apiserver/handlers/responsewriters"
  "k8s.io/kubernetes/pkg/client/restclient"
  "k8s.io/kubernetes/pkg/client/transport"
  genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
@@ -154,7 +154,7 @@ type responder struct {
 // TODO this should properly handle content type negotiation
 // if the caller asked for protobuf and you write JSON bad things happen.
 func (r *responder) Object(statusCode int, obj runtime.Object) {
- apiserver.WriteRawJSON(statusCode, obj, r.w)
+ responsewriters.WriteRawJSON(statusCode, obj, r.w)
 }
 
 func (r *responder) Error(err error) {

cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go

@@ -26,7 +26,7 @@ import (
  "testing"
 
  "k8s.io/kubernetes/pkg/api"
- "k8s.io/kubernetes/pkg/apiserver/request"
+ apiserverrequest "k8s.io/kubernetes/pkg/apiserver/request"
  "k8s.io/kubernetes/pkg/auth/user"
  "k8s.io/kubernetes/pkg/util/sets"
 
@@ -62,13 +62,13 @@ func (m *fakeRequestContextMapper) Get(req *http.Request) (api.Context, bool) {
  ctx = api.WithUser(ctx, m.user)
  }
 
- resolver := &request.RequestInfoFactory{
+ resolver := &apiserverrequest.RequestInfoFactory{
  APIPrefixes: sets.NewString("api", "apis"),
  GrouplessAPIPrefixes: sets.NewString("api"),
  }
  info, err := resolver.NewRequestInfo(req)
  if err == nil {
- ctx = request.WithRequestInfo(ctx, info)
+ ctx = apiserverrequest.WithRequestInfo(ctx, info)
  }
 
  return ctx, true