From df7e711c0a27d3770a4f88fa70a89b9aeb273182 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 15 Dec 2016 19:39:40 +0100 Subject: [PATCH] genericapiserver: turn APIContainer.SecretRoutes into a real ServeMux --- pkg/genericapiserver/mux/container.go | 6 +++++- pkg/genericapiserver/mux/container_test.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/genericapiserver/mux/container.go b/pkg/genericapiserver/mux/container.go index 7b25415a1a8..801d74afa30 100644 --- a/pkg/genericapiserver/mux/container.go +++ b/pkg/genericapiserver/mux/container.go @@ -29,8 +29,12 @@ import ( // handlers that do not show up in swagger or in / type APIContainer struct { *restful.Container + + // NonSwaggerRoutes are recorded and are visible at /, but do not show up in Swagger. NonSwaggerRoutes PathRecorderMux - SecretRoutes Mux + + // SecretRoutes are not recorded, are not visible at / and do not show up in Swagger. + SecretRoutes *http.ServeMux } // NewAPIContainer constructs a new container for APIs diff --git a/pkg/genericapiserver/mux/container_test.go b/pkg/genericapiserver/mux/container_test.go index c098cf0bb78..43e6a927d70 100644 --- a/pkg/genericapiserver/mux/container_test.go +++ b/pkg/genericapiserver/mux/container_test.go @@ -26,7 +26,7 @@ import ( func TestNewAPIContainer(t *testing.T) { mux := http.NewServeMux() c := NewAPIContainer(mux, nil) - assert.Equal(t, mux, c.SecretRoutes.(*http.ServeMux), "SecretRoutes ServeMux's do not match") + assert.Equal(t, mux, c.SecretRoutes, "SecretRoutes ServeMux's do not match") assert.Equal(t, mux, c.Container.ServeMux, "Container ServeMux's do not match") }