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

api: support wildcard /compose/status

Browse source
This commit is contained in:
Ondřej Budai 2019-11-28 08:28:19 +01:00 • committed by Tom Gundersen
parent df7e14d5eb
commit 7fbe8453ef
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/weldr/api.go
View file

@ -1228,6 +1228,7 @@ func (api *API) composeQueueHandler(writer http.ResponseWriter, request *http.Re
}
func (api *API) composeStatusHandler(writer http.ResponseWriter, request *http.Request, params httprouter.Params) {
// TODO: lorax has some params: /api/v0/compose/status/<uuids>[?blueprint=<blueprint_name>&status=<compose_status>&type=<compose_type>]
if !verifyRequestVersion(writer, params, 0) { // TODO: version 1 API
return
}
@ -1236,19 +1237,25 @@ func (api *API) composeStatusHandler(writer http.ResponseWriter, request *http.R
UUIDs []*store.ComposeEntry `json:"uuids"`
}
uuidStrings := strings.Split(params.ByName("uuids"), ",")
uuids := make([]uuid.UUID, len(uuidStrings))
for _, uuidString := range uuidStrings {
id, err := uuid.Parse(uuidString)
if err != nil {
errors := responseError{
ID: "UnknownUUID",
Msg: fmt.Sprintf("%s is not a valid build uuid", uuidString),
uuidsParam := params.ByName("uuids")
var uuids []uuid.UUID
if uuidsParam != "*" {
uuidStrings := strings.Split(uuidsParam, ",")
uuids = make([]uuid.UUID, len(uuidStrings))
for _, uuidString := range uuidStrings {
id, err := uuid.Parse(uuidString)
if err != nil {
errors := responseError{
ID: "UnknownUUID",
Msg: fmt.Sprintf("%s is not a valid build uuid", uuidString),
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
uuids = append(uuids, id)
}
uuids = append(uuids, id)
}
reply.UUIDs = api.store.ListQueue(uuids)