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

weldr: Fix blueprints/depsolve response

Browse source 
The response always returns a 200 with a JSON response. Any errors will
be in the errors list.
This commit is contained in:
Brian C. Lane 2020-03-11 16:53:38 -07:00 • committed by Tom Gundersen
parent e13ebd46ee
commit e3d1a34ab6
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/weldr/api.go
View file

@ -828,6 +828,7 @@ func (api *API) blueprintsDepsolveHandler(writer http.ResponseWriter, request *h
}
blueprints := []entry{}
blueprintsErrors := []responseError{}
for i, name := range names {
// remove leading / from first name
if i == 0 {
@ -835,12 +836,11 @@ func (api *API) blueprintsDepsolveHandler(writer http.ResponseWriter, request *h
}
blueprint, _ := api.store.GetBlueprint(name)
if blueprint == nil {
errors := responseError{
blueprintsErrors = append(blueprintsErrors, responseError{
ID: "UnknownBlueprint",
Msg: fmt.Sprintf("%s: blueprint not found", name),
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
})
continue
}
dependencies, _, _, err := api.depsolveBlueprint(blueprint, "", api.arch, false)
@ -859,7 +859,7 @@ func (api *API) blueprintsDepsolveHandler(writer http.ResponseWriter, request *h
err := json.NewEncoder(writer).Encode(reply{
Blueprints: blueprints,
Errors: []responseError{},
Errors: blueprintsErrors,
})
common.PanicOnError(err)
}