diff --git a/internal/weldr/result.go b/internal/common/compose_result.go similarity index 96% rename from internal/weldr/result.go rename to internal/common/compose_result.go index 18490ff79..f49ff111a 100644 --- a/internal/weldr/result.go +++ b/internal/common/compose_result.go @@ -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") } diff --git a/internal/weldr/api.go b/internal/weldr/api.go index 18d169cc8..e59e4f8eb 100644 --- a/internal/weldr/api.go +++ b/internal/weldr/api.go @@ -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) {