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

store: don't query the distro for the filename

Browse source 
The LocalTarget contains the filename, so look it up there instead.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-03-22 18:28:04 +01:00
parent 839b22026e
commit 0656fdcd38
2 changed files with 11 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/compose/compose.go
View file

@ -60,14 +60,15 @@ func (ib *ImageBuild) DeepCopy() ImageBuild {
}
}
func (ib *ImageBuild) HasLocalTarget() bool {
func (ib *ImageBuild) GetLocalTargetOptions() *target.LocalTargetOptions {
for _, t := range ib.Targets {
if _, ok := t.Options.(*target.LocalTargetOptions); ok {
return true
switch options := t.Options.(type) {
case *target.LocalTargetOptions:
return options
}
}
return false
return nil
}
// A Compose represent the task of building a set of images from a single blueprint.

45
internal/store/store.go
View file

@ -531,28 +531,12 @@ func (s *Store) GetImageBuildImage(composeId uuid.UUID, imageBuildId int) (io.Re
return nil, 0, &NotFoundError{"compose does not exist"}
}
imageBuild := c.ImageBuilds[imageBuildId]
if !imageBuild.HasLocalTarget() {
localTargetOptions := c.ImageBuilds[imageBuildId].GetLocalTargetOptions()
if localTargetOptions == nil {
return nil, 0, &NoLocalTargetError{"compose does not have local target"}
}
name, ok := imageBuild.Distro.ToString()
if !ok {
panic("distro name was validated earlier")
}
distro := s.distroRegistry.GetDistro(name)
if distro == nil {
panic("distro was validated earlier")
}
compatString, _ := imageBuild.ImageType.ToCompatString()
filename, _, err := distro.FilenameFromType(compatString)
if err != nil {
panic(err)
}
path := fmt.Sprintf("%s/%s", s.getImageBuildDirectory(composeId, imageBuildId), filename)
path := fmt.Sprintf("%s/%s", s.getImageBuildDirectory(composeId, imageBuildId), localTargetOptions.Filename)
f, err := os.Open(path)
@ -776,29 +760,12 @@ func (s *Store) AddImageToImageUpload(composeID uuid.UUID, imageBuildID int, rea
return &NotFoundError{"compose does not exist"}
}
imageBuild := currentCompose.ImageBuilds[imageBuildID]
if !imageBuild.HasLocalTarget() {
localTargetOptions := currentCompose.ImageBuilds[imageBuildID].GetLocalTargetOptions()
if localTargetOptions == nil {
return &NoLocalTargetError{fmt.Sprintf("image upload requested for compse %s and image build %d but it has no local target", composeID.String(), imageBuildID)}
}
name, ok := imageBuild.Distro.ToString()
if !ok {
panic("distro name was validated earlier")
}
distro := s.distroRegistry.GetDistro(name)
if distro == nil {
panic("distro was validated earlier")
}
imageType, _ := imageBuild.ImageType.ToCompatString()
filename, _, err := distro.FilenameFromType(imageType)
if err != nil {
return &InvalidRequestError{err.Error()}
}
path := fmt.Sprintf("%s/%s", s.getImageBuildDirectory(composeID, imageBuildID), filename)
path := fmt.Sprintf("%s/%s", s.getImageBuildDirectory(composeID, imageBuildID), localTargetOptions.Filename)
f, err := os.Create(path)
if err != nil {