Pack metadata booleanified and added to the statuses endpoint

hashicorp · Jul 19, 2024 · 4dfdf2f · 4dfdf2f
1 parent cf6ce22
commit 4dfdf2f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/nomad/job_endpoint_statuses.go b/nomad/job_endpoint_statuses.go
@@ -6,6 +6,7 @@ package nomad
 import (
 	"errors"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/armon/go-metrics"
@@ -198,6 +199,16 @@ func (j *Job) Statuses(
 func jobStatusesJobFromJob(ws memdb.WatchSet, store *state.StateStore, job *structs.Job) (structs.JobStatusesJob, uint64, error) {
 	highestIdx := job.ModifyIndex
 
+	isPack := false
+	if job.Meta != nil {
+		for key, value := range job.Meta {
+			if strings.HasPrefix(key, "pack") && value != "" {
+				isPack = true
+				break
+			}
+		}
+	}
+
 	jsj := structs.JobStatusesJob{
 		NamespacedID: structs.NamespacedID{
 			ID:        job.ID,
@@ -219,6 +230,7 @@ func jobStatusesJobFromJob(ws memdb.WatchSet, store *state.StateStore, job *stru
 		LatestDeployment: nil,
 		Stop:             job.Stop,
 		Status:           job.Status,
+		IsPack:           isPack,
 	}
 
 	// the GroupCountSum will map to how many allocations we expect to run

diff --git a/nomad/structs/job.go b/nomad/structs/job.go
@@ -98,6 +98,7 @@ type JobStatusesJob struct {
 	ParentID         string
 	LatestDeployment *JobStatusesLatestDeployment
 	Stop             bool // has the job been manually stopped?
+	IsPack           bool // is pack metadata present?
 	Status           string
 }
 

diff --git a/ui/app/components/child-job-row.hbs b/ui/app/components/child-job-row.hbs
@@ -17,7 +17,7 @@
     >
       {{@job.name}}
 
-      {{#if @job.meta.structured.pack}}
+      {{#if @job.isPack}}
         <span data-test-pack-tag class="tag is-pack">
           {{x-icon "box" class= "test"}}
           <span>Pack</span>

diff --git a/ui/app/models/job.js b/ui/app/models/job.js
@@ -302,9 +302,7 @@ export default class Job extends Model {
   }
   @fragment('structured-attributes') meta;
 
-  get isPack() {
-    return !!this.meta?.structured?.pack;
-  }
+  @attr('boolean') isPack;
 
   /**
    * A task with a schedule block can have execution paused at specific cron-based times.

diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
@@ -157,8 +157,7 @@
               class="is-primary"
             >
               {{B.data.name}}
-              {{!-- TODO: going to lose .meta with statuses endpoint! --}}
-              {{#if B.data.meta.structured.pack}}
+              {{#if B.data.isPack}}
                 <span data-test-pack-tag class="tag is-pack">
                   {{x-icon "box" class= "test"}}
                   <span>Pack</span>