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

move ComposeResult type into common package to allow its reusing

Browse source
This commit is contained in:
Ondřej Budai 2020-01-30 09:14:46 +01:00 • committed by Tom Gundersen
parent 642b90c977
commit a43dd00459
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/weldr/result.go → internal/common/compose_result.go
View file

@ -1,4 +1,4 @@
package weldr
package common
import (
"encoding/json"
@ -34,7 +34,7 @@ type ComposeResult struct {
Success bool `json:"success"`
}
func (cr *ComposeResult) WriteLog(writer io.Writer) {
func (cr *ComposeResult) Write(writer io.Writer) {
if cr.Build == nil && len(cr.Stages) == 0 && cr.Assembler == nil {
fmt.Fprintf(writer, "The compose result is empty.\n")
}

11
internal/weldr/api.go
View file

@ -22,6 +22,7 @@ import (
"github.com/julienschmidt/httprouter"
"github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/store"
@ -1249,7 +1250,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
bp := api.store.GetBlueprintCommitted(cr.BlueprintName)
size := cr.Size
// Microsoft Azure requires vhd images to be rounded up to the nearest MB
if cr.ComposeType == "vhd" && size%MegaByte != 0 {
size = (size/MegaByte + 1) * MegaByte
@ -1603,7 +1604,7 @@ func (api *API) composeLogsHandler(writer http.ResponseWriter, request *http.Req
return
}
var result ComposeResult
var result common.ComposeResult
err = json.NewDecoder(resultReader).Decode(&result)
if err != nil {
errors := responseError{
@ -1623,7 +1624,7 @@ func (api *API) composeLogsHandler(writer http.ResponseWriter, request *http.Req
// tar format needs to contain file size before the actual file content, therefore the intermediate buffer
var fileContents bytes.Buffer
result.WriteLog(&fileContents)
result.Write(&fileContents)
header := &tar.Header{
Name: "logs/osbuild.log",
@ -1688,7 +1689,7 @@ func (api *API) composeLogHandler(writer http.ResponseWriter, request *http.Requ
return
}
var result ComposeResult
var result common.ComposeResult
err = json.NewDecoder(resultReader).Decode(&result)
if err != nil {
errors := responseError{
@ -1701,7 +1702,7 @@ func (api *API) composeLogHandler(writer http.ResponseWriter, request *http.Requ
resultReader.Close()
result.WriteLog(writer)
result.Write(writer)
}
func (api *API) composeFinishedHandler(writer http.ResponseWriter, request *http.Request, params httprouter.Params) {