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

cloudapi/v2: move multi-image compose check to the beginning

Browse source 
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-10-13 15:06:59 +02:00 • committed by Sanne Raymaekers
parent 4e5ce288ab
commit 6b8f758c54
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/cloudapi/v2/v2.go
View file

@ -147,6 +147,10 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
return HTTPError(ErrorUnsupportedDistribution)
}
if len(request.ImageRequests) != 1 {
return HTTPError(ErrorMultiImageCompose)
}
var bp = blueprint.Blueprint{}
err = bp.Initialize()
if err != nil {
@ -414,18 +418,10 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
}
}
var ir imageRequest
if len(imageRequests) == 1 {
// NOTE: the store currently does not support multi-image composes
ir = imageRequests[0]
} else {
return HTTPError(ErrorMultiImageCompose)
}
id, err := h.server.workers.EnqueueOSBuild(ir.arch, &worker.OSBuildJob{
Manifest: ir.manifest,
id, err := h.server.workers.EnqueueOSBuild(imageRequests[0].arch, &worker.OSBuildJob{
Manifest: imageRequests[0].manifest,
Targets: targets,
Exports: ir.exports,
Exports: imageRequests[0].exports,
})
if err != nil {
return HTTPErrorWithInternal(ErrorEnqueueingJob, err)