From 320eaf4b0c4f4eaacd33f232a0f24feb6d2c9064 Mon Sep 17 00:00:00 2001 From: Jacob Kozol Date: Fri, 25 Oct 2019 17:10:42 +0200 Subject: [PATCH] store: update ComposeEntry to include version and type Each compose now includes the blueprint version and compose type it is based off of. --- internal/store/store.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/internal/store/store.go b/internal/store/store.go index 603fb9764..ac210b224 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -198,6 +198,8 @@ func (s *Store) ListBlueprints() []string { type ComposeEntry struct { ID uuid.UUID `json:"id"` Blueprint string `json:"blueprint"` + Version string `json:"version"` + ComposeType string `json:"compose_type"` QueueStatus string `json:"queue_status"` JobCreated float64 `json:"job_created"` JobStarted float64 `json:"job_started,omitempty"` @@ -214,6 +216,8 @@ func (s *Store) ListQueue(uuids []uuid.UUID) []*ComposeEntry { return &ComposeEntry{ ID: id, Blueprint: compose.Blueprint.Name, + Version: compose.Blueprint.Version, + ComposeType: compose.OutputType, QueueStatus: compose.QueueStatus, JobCreated: float64(compose.JobCreated.UnixNano()) / 1000000000, } @@ -221,6 +225,8 @@ func (s *Store) ListQueue(uuids []uuid.UUID) []*ComposeEntry { return &ComposeEntry{ ID: id, Blueprint: compose.Blueprint.Name, + Version: compose.Blueprint.Version, + ComposeType: compose.OutputType, QueueStatus: compose.QueueStatus, JobCreated: float64(compose.JobCreated.UnixNano()) / 1000000000, JobStarted: float64(compose.JobStarted.UnixNano()) / 1000000000, @@ -229,6 +235,8 @@ func (s *Store) ListQueue(uuids []uuid.UUID) []*ComposeEntry { return &ComposeEntry{ ID: id, Blueprint: compose.Blueprint.Name, + Version: compose.Blueprint.Version, + ComposeType: compose.OutputType, QueueStatus: compose.QueueStatus, JobCreated: float64(compose.JobCreated.UnixNano()) / 1000000000, JobStarted: float64(compose.JobStarted.UnixNano()) / 1000000000,