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

ostree: use image options for request data

Browse source 
The ostree options for a compose request should be specified using the
ImageOptions struct, not the source spec.  The source spec should be
specifying the source parameters for a single ostree commit internally.
This commit is contained in:
Achilleas Koutsou 2023-06-05 23:07:00 +02:00 • committed by Ondřej Budai
parent 56ea5db9a8
commit 7a23a81228
2 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/weldr/api.go
View file

@ -2372,12 +2372,12 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
// https://weldr.io/lorax/pylorax.api.html#pylorax.api.v0.v0_compose_start
type ComposeRequest struct {
BlueprintName string `json:"blueprint_name"`
ComposeType string `json:"compose_type"`
Size uint64 `json:"size"`
OSTree ostree.SourceSpec `json:"ostree"`
Branch string `json:"branch"`
Upload *uploadRequest `json:"upload"`
BlueprintName string `json:"blueprint_name"`
ComposeType string `json:"compose_type"`
Size uint64 `json:"size"`
OSTree ostree.ImageOptions `json:"ostree"`
Branch string `json:"branch"`
Upload *uploadRequest `json:"upload"`
}
type ComposeReply struct {
BuildID uuid.UUID `json:"build_id"`
@ -2469,12 +2469,6 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
ostreeOptions := &ostree.ImageOptions{
ImageRef: cr.OSTree.Ref,
ParentRef: cr.OSTree.Parent,
URL: cr.OSTree.URL,
RHSM: cr.OSTree.RHSM,
}
var size uint64
@ -2495,7 +2489,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
options := distro.ImageOptions{
Size: size,
OSTree: ostreeOptions,
OSTree: &cr.OSTree,
}
options.Facts = &facts.ImageOptions{
APIType: facts.WELDR_APITYPE,