Add /v1/counts

This commit is contained in:
Darren Shepherd
2019-08-12 15:15:19 -07:00
parent 68d1d582c3
commit 4016d67f8b
3 changed files with 132 additions and 10 deletions

View File

@@ -3,6 +3,8 @@ package server
import (
"net/http"
"github.com/rancher/naok/pkg/counts"
"github.com/gorilla/mux"
"github.com/rancher/naok/pkg/accesscontrol"
"github.com/rancher/naok/pkg/attributes"
@@ -23,13 +25,17 @@ func newAPIServer(cfg *rest.Config, cf proxy.ClientGetter, as *accesscontrol.Acc
)
a := &apiServer{
Router: mux.NewRouter(),
cf: cf,
as: as,
sf: sf,
server: api.NewAPIServer(),
Router: mux.NewRouter(),
cf: cf,
as: as,
sf: sf,
server: api.NewAPIServer(),
baseSchemas: types.EmptySchemas(),
}
counts.Register(a.baseSchemas)
subscribe.Register(a.baseSchemas)
a.Router.NotFoundHandler, err = k8sproxy.Handler("/", cfg)
if err != nil {
return nil, err
@@ -42,10 +48,11 @@ func newAPIServer(cfg *rest.Config, cf proxy.ClientGetter, as *accesscontrol.Acc
type apiServer struct {
*mux.Router
cf proxy.ClientGetter
as *accesscontrol.AccessStore
sf schemas.SchemaFactory
server *api.Server
cf proxy.ClientGetter
as *accesscontrol.AccessStore
sf schemas.SchemaFactory
server *api.Server
baseSchemas *types.Schemas
}
func (a *apiServer) newSchemas() (*types.Schemas, error) {
@@ -55,7 +62,7 @@ func (a *apiServer) newSchemas() (*types.Schemas, error) {
}
schemas.DefaultMapper = newDefaultMapper
subscribe.Register(schemas)
schemas.AddSchemas(a.baseSchemas)
return schemas, nil
}

View File

@@ -15,6 +15,7 @@ func (a *apiServer) routes() error {
a.Path("/v1/{type:schemas}").Handler(a.handle(nil))
a.Path("/v1/{type:schemas}/{name}").Handler(a.handle(nil))
a.Path("/v1/{type:subscribe}").Handler(a.handle(nil))
a.Path("/v1/{type:counts}").Handler(a.handle(nil))
a.Path("/{version:v1}/{resource}").Handler(a.handle(a.k8sAPI))
a.Path("/{version:v1}/{resource}/{nameorns}").Handler(a.handle(a.k8sAPI))