direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

factorize filter clauses

Browse Source
This commit is contained in:
Mikaël Cluseau 2019-04-15 18:56:31 +01:00
parent 456722a616
commit 9b62d598bb
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/dkl-local-server/main.go
View File

@ -37,7 +37,7 @@ func main() {
go casCleaner() go casCleaner()
apiutils.Setup(func() { apiutils.Setup(func() {
restful.Add(buildWS()) registerWS(restful.DefaultContainer)
}) })
swaggerui.HandleAt("/swagger-ui/") swaggerui.HandleAt("/swagger-ui/")

58
cmd/dkl-local-server/ws.go
View File

@ -11,35 +11,53 @@ import (
"novit.nc/direktil/pkg/localconfig" "novit.nc/direktil/pkg/localconfig"
) )
func buildWS() *restful.WebService { func registerWS(rest *restful.Container) {
ws := &restful.WebService{} // Admin API
adminWS := &restful.WebService{}
ws := adminWS
ws.Filter(adminAuth).
HeaderParameter("Authorization", "Admin bearer token")
// configs API // - configs API
ws.Route(ws.POST("/configs").Filter(adminAuth).To(wsUploadConfig). ws.Route(ws.POST("/configs").To(wsUploadConfig).
Doc("Upload a new current configuration, archiving the previous one")) Doc("Upload a new current configuration, archiving the previous one"))
// clusters API // - clusters API
ws.Route(ws.GET("/clusters").Filter(adminAuth).To(wsListClusters). ws.Route(ws.GET("/clusters").To(wsListClusters).
Doc("List clusters")) Doc("List clusters"))
ws.Route(ws.GET("/clusters/{cluster-name}").Filter(adminAuth).To(wsCluster). ws.Route(ws.GET("/clusters/{cluster-name}").To(wsCluster).
Doc("Get cluster details")) Doc("Get cluster details"))
ws.Route(ws.GET("/clusters/{cluster-name}/addons").Filter(adminAuth).To(wsClusterAddons). ws.Route(ws.GET("/clusters/{cluster-name}/addons").To(wsClusterAddons).
Produces(mime.YAML). Produces(mime.YAML).
Doc("Get cluster addons"). Doc("Get cluster addons").
Returns(http.StatusOK, "OK", nil). Returns(http.StatusOK, "OK", nil).
Returns(http.StatusNotFound, "The cluster does not exists or does not have addons defined", nil)) Returns(http.StatusNotFound, "The cluster does not exists or does not have addons defined", nil))
ws.Route(ws.GET("/clusters/{cluster-name}/passwords").Filter(adminAuth).To(wsClusterPasswords). ws.Route(ws.GET("/clusters/{cluster-name}/passwords").To(wsClusterPasswords).
Doc("List cluster's passwords")) Doc("List cluster's passwords"))
ws.Route(ws.GET("/clusters/{cluster-name}/passwords/{password-name}").Filter(adminAuth).To(wsClusterPassword). ws.Route(ws.GET("/clusters/{cluster-name}/passwords/{password-name}").To(wsClusterPassword).
Doc("Get cluster's password")) Doc("Get cluster's password"))
ws.Route(ws.PUT("/clusters/{cluster-name}/passwords/{password-name}").Filter(adminAuth).To(wsClusterSetPassword). ws.Route(ws.PUT("/clusters/{cluster-name}/passwords/{password-name}").To(wsClusterSetPassword).
Doc("Set cluster's password")) Doc("Set cluster's password"))
// hosts API (&wsHost{
ws.Route(ws.GET("/hosts").Filter(hostsAuth).To(wsListHosts). prefix: "/hosts/{host-name}",
hostDoc: "given host",
getHost: func(req *restful.Request) string {
return req.PathParameter("host-name")
},
}).register(adminWS, func(rb *restful.RouteBuilder) {
})
// Hosts API
hostsWS := &restful.WebService{}
ws = adminWS
ws.Filter(hostsAuth).
HeaderParameter("Authorization", "Host or admin bearer token")
ws.Route(ws.GET("/hosts").To(wsListHosts).
Doc("List hosts")) Doc("List hosts"))
(&wsHost{ (&wsHost{
@ -50,17 +68,9 @@ func buildWS() *restful.WebService {
rb.Notes("In this case, the host is detected from the remote IP") rb.Notes("In this case, the host is detected from the remote IP")
}) })
(&wsHost{ // register the web services
prefix: "/hosts/{host-name}", rest.Add(adminWS)
hostDoc: "given host", rest.Add(hostsWS)
getHost: func(req *restful.Request) string {
return req.PathParameter("host-name")
},
}).register(ws, func(rb *restful.RouteBuilder) {
rb.Filter(adminAuth)
})
return ws
} }
func detectHost(req *restful.Request) string { func detectHost(req *restful.Request) string {