particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

weldr: clean up source/info route

Browse source 
Split the error case (no sources specified) into its own function, so
that we can use `source/info/:sources` (note the colon) to get the list
of sources without the leading `/`. This gets rid of two special cases
which made the previous implementation hard to parse.
This commit is contained in:
Lars Karlitski 2019-11-17 10:28:23 +00:00 • committed by Tom Gundersen
parent d06a39bd51
commit d1a6e2efb7
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
internal/weldr/api.go
View file

@ -49,7 +49,8 @@ func New(rpmmd rpmmd.RPMMD, repo rpmmd.RepoConfig, logger *log.Logger, store *st
api.router.GET("/api/status", api.statusHandler)
api.router.GET("/api/v0/projects/source/list", api.sourceListHandler)
api.router.GET("/api/v0/projects/source/info/*sources", api.sourceInfoHandler)
api.router.GET("/api/v0/projects/source/info/", api.sourceEmptyInfoHandler)
api.router.GET("/api/v0/projects/source/info/:sources", api.sourceInfoHandler)
api.router.POST("/api/v0/projects/source/new", api.sourceNewHandler)
api.router.DELETE("/api/v0/projects/source/delete/*source", api.sourceDeleteHandler)
@ -177,6 +178,15 @@ func (api *API) sourceListHandler(writer http.ResponseWriter, request *http.Requ
})
}
func (api *API) sourceEmptyInfoHandler(writer http.ResponseWriter, request *http.Request, params httprouter.Params) {
errors := responseError{
Code: http.StatusNotFound,
ID: "HTTPError",
Msg: "Not Found",
}
statusResponseError(writer, http.StatusNotFound, errors)
}
func (api *API) sourceInfoHandler(writer http.ResponseWriter, request *http.Request, params httprouter.Params) {
// weldr uses a slightly different format than dnf to store repository
// configuration
@ -187,23 +197,9 @@ func (api *API) sourceInfoHandler(writer http.ResponseWriter, request *http.Requ
names := strings.Split(params.ByName("sources"), ",")
if names[0] == "/" {
errors := responseError{
Code: http.StatusNotFound,
ID: "HTTPError",
Msg: "Not Found",
}
statusResponseError(writer, http.StatusNotFound, errors)
return
}
sources := map[string]store.SourceConfig{}
errors := []responseError{}
for i, name := range names {
// remove leading / from first name
if i == 0 {
name = name[1:]
}
for _, name := range names {
// if name is "*" we want all sources from the store and the base repo
if name == "*" {
sources = api.store.GetAllSources()