2fe4450620
This reduces the amount of resolving and error checking we have to do. This exposed a bug in weldr's ComposeEntry type, which will be fixed in a follow-up commit. Signed-off-by: Tom Gundersen <teg@jklm.no>
76 lines
2.7 KiB
Go
76 lines
2.7 KiB
Go
package weldr
|
|
|
|
import (
|
|
"sort"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/osbuild/osbuild-composer/internal/common"
|
|
"github.com/osbuild/osbuild-composer/internal/store"
|
|
)
|
|
|
|
type ComposeEntry struct {
|
|
ID uuid.UUID `json:"id"`
|
|
Blueprint string `json:"blueprint"`
|
|
Version string `json:"version"`
|
|
ComposeType common.ImageType `json:"compose_type"`
|
|
ImageSize uint64 `json:"image_size"` // This is user-provided image size, not actual file size
|
|
QueueStatus common.ImageBuildState `json:"queue_status"`
|
|
JobCreated float64 `json:"job_created"`
|
|
JobStarted float64 `json:"job_started,omitempty"`
|
|
JobFinished float64 `json:"job_finished,omitempty"`
|
|
Uploads []uploadResponse `json:"uploads,omitempty"`
|
|
}
|
|
|
|
func composeToComposeEntry(id uuid.UUID, compose store.Compose, state common.ComposeState, queued, started, finished time.Time, includeUploads bool) *ComposeEntry {
|
|
var composeEntry ComposeEntry
|
|
|
|
composeEntry.ID = id
|
|
composeEntry.Blueprint = compose.Blueprint.Name
|
|
composeEntry.Version = compose.Blueprint.Version
|
|
|
|
var valid bool
|
|
// BUG: this leads to the wrong image type string being returned, we want the compat strings here
|
|
composeEntry.ComposeType, valid = common.ImageTypeFromCompatString(compose.ImageBuilds[0].ImageType.Name())
|
|
if !valid {
|
|
panic("compose contains invalid image type: " + compose.ImageBuilds[0].ImageType.Name())
|
|
}
|
|
|
|
if includeUploads {
|
|
composeEntry.Uploads = targetsToUploadResponses(compose.ImageBuilds[0].Targets)
|
|
}
|
|
|
|
switch state {
|
|
case common.CWaiting:
|
|
composeEntry.QueueStatus = common.IBWaiting
|
|
composeEntry.JobCreated = float64(queued.UnixNano()) / 1000000000
|
|
|
|
case common.CRunning:
|
|
composeEntry.QueueStatus = common.IBRunning
|
|
composeEntry.JobCreated = float64(queued.UnixNano()) / 1000000000
|
|
composeEntry.JobStarted = float64(started.UnixNano()) / 1000000000
|
|
|
|
case common.CFinished:
|
|
composeEntry.QueueStatus = common.IBFinished
|
|
composeEntry.ImageSize = compose.ImageBuilds[0].Size
|
|
composeEntry.JobCreated = float64(queued.UnixNano()) / 1000000000
|
|
composeEntry.JobStarted = float64(started.UnixNano()) / 1000000000
|
|
composeEntry.JobFinished = float64(finished.UnixNano()) / 1000000000
|
|
|
|
case common.CFailed:
|
|
composeEntry.QueueStatus = common.IBFailed
|
|
composeEntry.JobCreated = float64(queued.UnixNano()) / 1000000000
|
|
composeEntry.JobStarted = float64(started.UnixNano()) / 1000000000
|
|
composeEntry.JobFinished = float64(finished.UnixNano()) / 1000000000
|
|
default:
|
|
panic("invalid compose state")
|
|
}
|
|
|
|
return &composeEntry
|
|
}
|
|
|
|
func sortComposeEntries(entries []*ComposeEntry) {
|
|
sort.Slice(entries, func(i, j int) bool {
|
|
return entries[i].ID.String() < entries[j].ID.String()
|
|
})
|
|
}
|