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

store/json: split newComposesFromV0()

Browse source 
Not a functional change, just for readability.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-05-12 01:43:02 +02:00
parent 594858ab2c
commit e28fca493c
1 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

53
internal/store/json.go
View file

@ -95,30 +95,7 @@ func newComposesFromV0(composesStruct composesV0, arch distro.Arch) map[uuid.UUI
composes := make(map[uuid.UUID]Compose)
for composeID, composeStruct := range composesStruct {
c := Compose{
Blueprint: composeStruct.Blueprint,
}
for _, imgBuild := range composeStruct.ImageBuilds {
imgType := imageTypeFromCompatString(imgBuild.ImageType, arch)
if imgType == nil {
// Invalid type strings in serialization format, this may happen
// on upgrades. Ignore the image build.
continue
}
ib := ImageBuild{
ID: imgBuild.ID,
ImageType: imgType,
Manifest: imgBuild.Manifest,
Targets: imgBuild.Targets,
JobCreated: imgBuild.JobCreated,
JobStarted: imgBuild.JobStarted,
JobFinished: imgBuild.JobFinished,
Size: imgBuild.Size,
JobID: imgBuild.JobID,
QueueStatus: imgBuild.QueueStatus,
}
c.ImageBuilds = append(c.ImageBuilds, ib)
}
c := newComposeFromV0(composeStruct, arch)
if len(c.ImageBuilds) == 0 {
// In case no valid image builds were found, ignore the compose.
continue
@ -129,6 +106,34 @@ func newComposesFromV0(composesStruct composesV0, arch distro.Arch) map[uuid.UUI
return composes
}
func newComposeFromV0(composeStruct composeV0, arch distro.Arch) Compose {
c := Compose{
Blueprint: composeStruct.Blueprint,
}
for _, imgBuild := range composeStruct.ImageBuilds {
imgType := imageTypeFromCompatString(imgBuild.ImageType, arch)
if imgType == nil {
// Invalid type strings in serialization format, this may happen
// on upgrades. Ignore the image build.
continue
}
ib := ImageBuild{
ID: imgBuild.ID,
ImageType: imgType,
Manifest: imgBuild.Manifest,
Targets: imgBuild.Targets,
JobCreated: imgBuild.JobCreated,
JobStarted: imgBuild.JobStarted,
JobFinished: imgBuild.JobFinished,
Size: imgBuild.Size,
JobID: imgBuild.JobID,
QueueStatus: imgBuild.QueueStatus,
}
c.ImageBuilds = append(c.ImageBuilds, ib)
}
return c
}
func newSourceConfigsFromV0(sourcesStruct sourcesV0) map[string]SourceConfig {
sources := make(map[string]SourceConfig)