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

store: make PushCompose() take a manifest

Browse source 
Code that's calling PushCompose() had to depsolve packages and fetch the
right ImageType from a distro, but not create the osbuild manifest. That
was left for PushCompose to do. Move it out of there to the callers, so
that the store is mainly concerned with storing things.

This also simplifies the argument list of PushCompose().
This commit is contained in:
Lars Karlitski 2020-04-17 19:22:09 +02:00 • committed by Tom Gundersen
parent 2b7adb3200
commit 37b42d452b
4 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/weldr/api.go
View file

@ -1480,15 +1480,26 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
return
}
size := imageType.Size(cr.Size)
manifest, err := imageType.Manifest(bp.Customizations, api.allRepositories(), packages, buildPackages, size)
if err != nil {
errors := responseError{
ID: "ManifestCreationFailed",
Msg: fmt.Sprintf("failed to create osbuild manifest: %v", err),
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
testMode := q.Get("test")
if testMode == "1" {
// Create a failed compose
composeID, err = api.store.PushTestCompose(imageType, bp, api.allRepositories(), packages, buildPackages, cr.Size, targets, false)
composeID, err = api.store.PushTestCompose(manifest, imageType, bp, size, targets, false)
} else if testMode == "2" {
// Create a successful compose
composeID, err = api.store.PushTestCompose(imageType, bp, api.allRepositories(), packages, buildPackages, cr.Size, targets, true)
composeID, err = api.store.PushTestCompose(manifest, imageType, bp, size, targets, true)
} else {
composeID, err = api.store.PushCompose(imageType, bp, api.allRepositories(), packages, buildPackages, cr.Size, targets)
composeID, err = api.store.PushCompose(manifest, imageType, bp, size, targets)
}
// TODO: we should probably do some kind of blueprint validation in future