From 2f576e09642cd285c1346e477bdb5914a97b769e Mon Sep 17 00:00:00 2001 From: Martin Sehnoutka Date: Thu, 26 Mar 2020 09:58:19 +0100 Subject: [PATCH] weldr: stop using Distro.FilenameFromType The method is available in the Distro interface, but the distro does not have the information needed to provide this kind of information any more. The logic is now split into Arch and ImageType interfaces. This patch will allow us to get rid of some old code and move forward. --- internal/weldr/api.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/weldr/api.go b/internal/weldr/api.go index 335dae581..68cdf9e54 100644 --- a/internal/weldr/api.go +++ b/internal/weldr/api.go @@ -1754,16 +1754,18 @@ func (api *API) composeImageHandler(writer http.ResponseWriter, request *http.Re imageBuild := compose.ImageBuilds[0] imageType, _ := imageBuild.ImageType.ToCompatString() - imageName, imageMime, err := api.distro.FilenameFromType(imageType) - + imageTypeStruct, err := api.arch.GetImageType(imageType) if err != nil { errors := responseError{ - ID: "BadCompose", - Msg: fmt.Sprintf("Compose %s is ill-formed: output type %v is invalid for distro %s", uuidString, imageBuild.ImageType, api.distro.Name()), + ID: "BadCompose", + Msg: fmt.Sprintf("Compose %s is ill-formed: output type %v is invalid for distro %s on %s", + uuidString, imageBuild.ImageType, api.distro.Name(), api.arch.Name()), } statusResponseError(writer, http.StatusInternalServerError, errors) return } + imageName := imageTypeStruct.Filename() + imageMime := imageTypeStruct.MIMEType() reader, fileSize, err := api.store.GetImageBuildImage(uuid, 0)