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

genericapiserver: rename SecretRoutes -> UnlistedRoutes

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2016-12-16 09:18:03 +01:00
parent df7e711c0a
commit e49fb2f1f4
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubernetes-discovery/pkg/apiserver/apiserver.go
View File

@ -227,8 +227,8 @@ func (s *APIDiscoveryServer) AddAPIService(apiService *apiregistration.APIServic
lister: s.lister, lister: s.lister,
} }
// discovery is protected // discovery is protected
s.GenericAPIServer.HandlerContainer.SecretRoutes.Handle(groupPath, groupDiscoveryHandler) s.GenericAPIServer.HandlerContainer.UnlistedRoutes.Handle(groupPath, groupDiscoveryHandler)
s.GenericAPIServer.HandlerContainer.SecretRoutes.Handle(groupPath+"/", groupDiscoveryHandler) s.GenericAPIServer.HandlerContainer.UnlistedRoutes.Handle(groupPath+"/", groupDiscoveryHandler)
} }

2
pkg/genericapiserver/genericapiserver_test.go
View File

@ -323,7 +323,7 @@ func TestCustomHandlerChain(t *testing.T) {
} }
s.HandlerContainer.NonSwaggerRoutes.Handle("/nonswagger", handler) s.HandlerContainer.NonSwaggerRoutes.Handle("/nonswagger", handler)
s.HandlerContainer.SecretRoutes.Handle("/secret", handler) s.HandlerContainer.UnlistedRoutes.Handle("/secret", handler)
type Test struct { type Test struct {
handler http.Handler handler http.Handler

6
pkg/genericapiserver/mux/container.go
View File

@ -33,8 +33,8 @@ type APIContainer struct {
// NonSwaggerRoutes are recorded and are visible at /, but do not show up in Swagger. // NonSwaggerRoutes are recorded and are visible at /, but do not show up in Swagger.
NonSwaggerRoutes PathRecorderMux NonSwaggerRoutes PathRecorderMux
// SecretRoutes are not recorded, are not visible at / and do not show up in Swagger. // UnlistedRoutes are not recorded, therefore not visible at / and do not show up in Swagger.
SecretRoutes *http.ServeMux UnlistedRoutes *http.ServeMux
} }
// NewAPIContainer constructs a new container for APIs // NewAPIContainer constructs a new container for APIs
@ -44,7 +44,7 @@ func NewAPIContainer(mux *http.ServeMux, s runtime.NegotiatedSerializer) *APICon
NonSwaggerRoutes: PathRecorderMux{ NonSwaggerRoutes: PathRecorderMux{
mux: mux, mux: mux,
}, },
SecretRoutes: mux, UnlistedRoutes: mux,
} }
c.Container.ServeMux = mux c.Container.ServeMux = mux
c.Container.Router(restful.CurlyRouter{}) // e.g. for proxy/{kind}/{name}/{*} c.Container.Router(restful.CurlyRouter{}) // e.g. for proxy/{kind}/{name}/{*}

4
pkg/genericapiserver/mux/container_test.go
View File

@ -26,14 +26,14 @@ import (
func TestNewAPIContainer(t *testing.T) { func TestNewAPIContainer(t *testing.T) {
mux := http.NewServeMux() mux := http.NewServeMux()
c := NewAPIContainer(mux, nil) c := NewAPIContainer(mux, nil)
assert.Equal(t, mux, c.SecretRoutes, "SecretRoutes ServeMux's do not match") assert.Equal(t, mux, c.UnlistedRoutes, "UnlistedRoutes ServeMux's do not match")
assert.Equal(t, mux, c.Container.ServeMux, "Container ServeMux's do not match") assert.Equal(t, mux, c.Container.ServeMux, "Container ServeMux's do not match")
} }
func TestSecretHandlers(t *testing.T) { func TestSecretHandlers(t *testing.T) {
mux := http.NewServeMux() mux := http.NewServeMux()
c := NewAPIContainer(mux, nil) c := NewAPIContainer(mux, nil)
c.SecretRoutes.HandleFunc("/secret", func(http.ResponseWriter, *http.Request) {}) c.UnlistedRoutes.HandleFunc("/secret", func(http.ResponseWriter, *http.Request) {})
c.NonSwaggerRoutes.HandleFunc("/nonswagger", func(http.ResponseWriter, *http.Request) {}) c.NonSwaggerRoutes.HandleFunc("/nonswagger", func(http.ResponseWriter, *http.Request) {})
assert.NotContains(t, c.NonSwaggerRoutes.HandledPaths(), "/secret") assert.NotContains(t, c.NonSwaggerRoutes.HandledPaths(), "/secret")
assert.Contains(t, c.NonSwaggerRoutes.HandledPaths(), "/nonswagger") assert.Contains(t, c.NonSwaggerRoutes.HandledPaths(), "/nonswagger")

2
pkg/genericapiserver/openapi/openapi.go
View File

@ -62,7 +62,7 @@ func RegisterOpenAPIService(servePath string, webServices []*restful.WebService,
return err return err
} }
container.SecretRoutes.HandleFunc(servePath, func(w http.ResponseWriter, r *http.Request) { container.UnlistedRoutes.HandleFunc(servePath, func(w http.ResponseWriter, r *http.Request) {
resp := restful.NewResponse(w) resp := restful.NewResponse(w)
if r.URL.Path != servePath { if r.URL.Path != servePath {
resp.WriteErrorString(http.StatusNotFound, "Path not found!") resp.WriteErrorString(http.StatusNotFound, "Path not found!")

2
pkg/genericapiserver/routes/index.go
View File

@ -30,7 +30,7 @@ type Index struct{}
// Install adds the Index webservice to the given mux. // Install adds the Index webservice to the given mux.
func (i Index) Install(c *mux.APIContainer) { func (i Index) Install(c *mux.APIContainer) {
c.SecretRoutes.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { c.UnlistedRoutes.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
status := http.StatusOK status := http.StatusOK
if r.URL.Path != "/" && r.URL.Path != "/index.html" { if r.URL.Path != "/" && r.URL.Path != "/index.html" {
// Since "/" matches all paths, handleIndex is called for all paths for which there is no handler registered. // Since "/" matches all paths, handleIndex is called for all paths for which there is no handler registered.

6
pkg/genericapiserver/routes/profiling.go
View File

@ -27,7 +27,7 @@ type Profiling struct{}
// Install adds the Profiling webservice to the given mux. // Install adds the Profiling webservice to the given mux.
func (d Profiling) Install(c *mux.APIContainer) { func (d Profiling) Install(c *mux.APIContainer) {
c.SecretRoutes.HandleFunc("/debug/pprof/", pprof.Index) c.UnlistedRoutes.HandleFunc("/debug/pprof/", pprof.Index)
c.SecretRoutes.HandleFunc("/debug/pprof/profile", pprof.Profile) c.UnlistedRoutes.HandleFunc("/debug/pprof/profile", pprof.Profile)
c.SecretRoutes.HandleFunc("/debug/pprof/symbol", pprof.Symbol) c.UnlistedRoutes.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
} }