github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 21:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Centralize path magic in apiserver into the New method

Browse Source 
Make OperationHandler and WatchHandler properly encapsulate their
concerns and make them not depend on the global path
This commit is contained in:
Clayton Coleman
2014-08-06 13:06:42 -04:00
parent 2297bf8cea
commit a74fac7d70
3 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/apiserver/operation.go
View File

@@ -18,10 +18,8 @@ package apiserver
import (
"net/http"
"path"
"sort"
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
@@ -30,37 +28,25 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
)
func (s *APIServer) operationPrefix() string {
return path.Join(s.prefix, "operations")
type OperationHandler struct {
ops *Operations
codec Codec
}
func (s *APIServer) handleOperation(w http.ResponseWriter, req *http.Request) {
opPrefix := s.operationPrefix()
if !strings.HasPrefix(req.URL.Path, opPrefix) {
notFound(w, req)
return
}
trimmed := strings.TrimLeft(req.URL.Path[len(opPrefix):], "/")
parts := strings.Split(trimmed, "/")
if trimmed == "" {
parts = []string{}
}
if len(parts) > 1 {
notFound(w, req)
return
}
if req.Method != "GET" {
func (h *OperationHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
parts := splitPath(req.URL.Path)
if len(parts) > 1 || req.Method != "GET" {
notFound(w, req)
return
}
if len(parts) == 0 {
// List outstanding operations.
list := s.ops.List()
writeJSON(http.StatusOK, s.codec, list, w)
list := h.ops.List()
writeJSON(http.StatusOK, h.codec, list, w)
return
}
op := s.ops.Get(parts[0])
op := h.ops.Get(parts[0])
if op == nil {
notFound(w, req)
return
@@ -68,9 +54,9 @@ func (s *APIServer) handleOperation(w http.ResponseWriter, req *http.Request) {
obj, complete := op.StatusOrResult()
if complete {
writeJSON(http.StatusOK, s.codec, obj, w)
writeJSON(http.StatusOK, h.codec, obj, w)
} else {
writeJSON(http.StatusAccepted, s.codec, obj, w)
writeJSON(http.StatusAccepted, h.codec, obj, w)
}
}