chore: show job level verifications

Author: adityachoudhari26

apps/web/app/routes/ws/deployments/_components/release-targets/EnvironmentReleaseTargetsGroup.tsx

@@ -290,13 +290,13 @@ const VerificationStatusConfig: Record<
 
 function VerificationStatusBadge({
   summaries,
-  verification,
+  verifications,
 }: {
   summaries: MetricSummary[];
-  verification?: ReleaseVerification;
+  verifications: ReleaseVerification[];
 }) {
   const status = getOverallVerificationStatus(summaries);
-  if (status === "none" || verification == null) return null;
+  if (status === "none" || verifications.length === 0) return null;
 
   const config = VerificationStatusConfig[status];
   return (
@@ -312,9 +312,13 @@ function VerificationStatusBadge({
         <DialogHeader>
           <DialogTitle>Verifications</DialogTitle>
         </DialogHeader>
-
-        {verification.metrics.map((metric) => (
-          <MetricDisplay key={metric.name} metric={metric} />
+        {verifications.map((verification) => (
+          <Fragment key={verification.id}>
+            <div className="text-sm font-medium">{verification.message}</div>
+            {verification.metrics.map((metric) => (
+              <MetricDisplay key={metric.name} metric={metric} />
+            ))}
+          </Fragment>
         ))}
       </DialogContent>
     </Dialog>
@@ -326,9 +330,8 @@ function ReleaseTargetRow({
   state,
   resource,
 }: ReleaseTargetRowProps) {
-  const desiredState = state.desiredRelease;
-  const verification = desiredState?.verification;
-  const summaries = verification ? verificationSummary(verification) : [];
+  const verifications = state.latestJob?.verifications ?? [];
+  const summaries = verifications.map(verificationSummary).flat();
 
   return (
     <TableRow key={releaseTarget.resourceId}>
@@ -349,7 +352,7 @@ function ReleaseTargetRow({
           />
           <VerificationStatusBadge
             summaries={summaries}
-            verification={verification}
+            verifications={verifications}
           />
         </div>
       </TableCell>

apps/workspace-engine/oapi/openapi.json

@@ -1067,6 +1067,27 @@
             ],
             "type": "object"
          },
+         "JobWithVerifications": {
+            "additionalProperties": false,
+            "allOf": [
+               {
+                  "$ref": "#/components/schemas/Job"
+               },
+               {
+                  "properties": {
+                     "verifications": {
+                        "items": {
+                           "$ref": "#/components/schemas/ReleaseVerification"
+                        },
+                        "type": "array"
+                     }
+                  },
+                  "required": [
+                     "verifications"
+                  ]
+               }
+            ]
+         },
          "JsonSelector": {
             "properties": {
                "json": {
@@ -1565,7 +1586,7 @@
                   "$ref": "#/components/schemas/Release"
                },
                "latestJob": {
-                  "$ref": "#/components/schemas/Job"
+                  "$ref": "#/components/schemas/JobWithVerifications"
                }
             },
             "type": "object"

apps/workspace-engine/oapi/spec/schemas/entities.jsonnet

@@ -206,7 +206,7 @@ local openapi = import '../lib/openapi.libsonnet';
     properties: {
       desiredRelease: openapi.schemaRef('Release'),
       currentRelease: openapi.schemaRef('Release'),
-      latestJob: openapi.schemaRef('Job'),
+      latestJob: openapi.schemaRef('JobWithVerifications'),
     },
   },
 

apps/workspace-engine/oapi/spec/schemas/jobs.jsonnet

@@ -53,6 +53,22 @@ local JobPropertyKeys = std.objectFields(Job.properties);
     ],
   },
 
+  JobWithVerifications: {
+    allOf: [
+      openapi.schemaRef('Job'),
+      {
+        required: ['verifications'],
+        properties: {
+          verifications: {
+            type: 'array',
+            items: openapi.schemaRef('ReleaseVerification'),
+          },
+        },
+      },
+    ],
+    additionalProperties: false,
+  },
+
   JobWithRelease: {
     type: 'object',
     required: ['job', 'release'],

apps/workspace-engine/pkg/oapi/oapi.gen.go

@@ -324,7 +324,7 @@ func (d *ArgoCDDispatcher) startArgoApplicationVerification(
 		},
 	}
 
-	if err := d.verification.StartVerification(ctx, &jobWithRelease.Release, metrics); err != nil {
+	if err := d.verification.StartVerification(ctx, &jobWithRelease.Release, &jobWithRelease.Job, metrics); err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, "failed to start verification")
 		return err

apps/workspace-engine/pkg/workspace/jobdispatch/argocd.go

@@ -272,7 +272,7 @@ func (d *TerraformCloudDispatcher) syncVariables(ctx context.Context, client *tf
 	return nil
 }
 
-func (d *TerraformCloudDispatcher) createRunVerification(ctx context.Context, release *oapi.Release, config oapi.FullTerraformCloudJobAgentConfig, runId string) error {
+func (d *TerraformCloudDispatcher) createRunVerification(ctx context.Context, release *oapi.Release, job *oapi.Job, config oapi.FullTerraformCloudJobAgentConfig, runId string) error {
 	provider := oapi.MetricProvider{}
 	err := provider.FromTerraformCloudRunMetricProvider(oapi.TerraformCloudRunMetricProvider{
 		Address: config.Address,
@@ -295,7 +295,7 @@ func (d *TerraformCloudDispatcher) createRunVerification(ctx context.Context, re
 		},
 	}
 
-	return d.verification.StartVerification(ctx, release, metrics)
+	return d.verification.StartVerification(ctx, release, job, metrics)
 }
 
 func (d *TerraformCloudDispatcher) getKafkaProducer() (messaging.Producer, error) {
@@ -481,7 +481,7 @@ func (d *TerraformCloudDispatcher) DispatchJob(ctx context.Context, job *oapi.Jo
 		return err
 	}
 
-	if err := d.createRunVerification(ctx, &templatableJob.Release.Release, cfg, run.ID); err != nil {
+	if err := d.createRunVerification(ctx, &templatableJob.Release.Release, job, cfg, run.ID); err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, "failed to create run verification")
 		return err

apps/workspace-engine/pkg/workspace/jobdispatch/terraformcloud.go

@@ -57,7 +57,7 @@ func (v *VerificationAction) Execute(
 	span.SetAttributes(attribute.Int("metric_count", len(metrics)))
 
 	// Create verification synchronously
-	if err := v.verificationManager.StartVerification(ctx, actx.Release, metrics); err != nil {
+	if err := v.verificationManager.StartVerification(ctx, actx.Release, actx.Job, metrics); err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, "failed to create verification")
 		log.Error("Failed to create verification",

apps/workspace-engine/pkg/workspace/releasemanager/action/verification/verification.go

@@ -80,6 +80,35 @@ func (sc *StateCache) Invalidate(releaseTarget *oapi.ReleaseTarget) {
 	sc.cache.Del(releaseTarget.Key())
 }
 
+func (sc *StateCache) getJobWithVerifications(job *oapi.Job) *oapi.JobWithVerifications {
+	if job == nil {
+		return nil
+	}
+	verifications := sc.store.ReleaseVerifications.GetByJobId(job.Id)
+	verificationsSlice := make([]oapi.ReleaseVerification, 0, len(verifications))
+	for _, verification := range verifications {
+		if verification == nil {
+			continue
+		}
+		verificationsSlice = append(verificationsSlice, *verification)
+	}
+	return &oapi.JobWithVerifications{
+		CreatedAt:      job.CreatedAt,
+		ExternalId:     job.ExternalId,
+		Id:             job.Id,
+		JobAgentConfig: job.JobAgentConfig,
+		JobAgentId:     job.JobAgentId,
+		Message:        job.Message,
+		Metadata:       job.Metadata,
+		ReleaseId:      job.ReleaseId,
+		StartedAt:      job.StartedAt,
+		Status:         job.Status,
+		TraceToken:     job.TraceToken,
+		UpdatedAt:      job.UpdatedAt,
+		Verifications:  verificationsSlice,
+	}
+}
+
 // compute computes the release target state from scratch and caches it.
 // This involves gathering current release and job information.
 // Callers can provide already-known information via options to avoid redundant queries.
@@ -143,10 +172,11 @@ func (sc *StateCache) compute(ctx context.Context, releaseTarget *oapi.ReleaseTa
 		latestJob, _ = sc.store.ReleaseTargets.GetLatestJob(ctx, releaseTarget)
 	}
 
+	latestJobWithVerifications := sc.getJobWithVerifications(latestJob)
 	rts = &oapi.ReleaseTargetState{
 		DesiredRelease: desiredRelease,
 		CurrentRelease: currentRelease,
-		LatestJob:      latestJob,
+		LatestJob:      latestJobWithVerifications,
 	}
 
 	sc.Set(releaseTarget, rts)

apps/workspace-engine/pkg/workspace/releasemanager/state_cache.go

@@ -92,6 +92,7 @@ func (m *Manager) Restore(ctx context.Context) error {
 func (m *Manager) StartVerification(
 	ctx context.Context,
 	release *oapi.Release,
+	job *oapi.Job,
 	metrics []oapi.VerificationMetricSpec,
 ) error {
 	ctx, span := tracer.Start(ctx, "StartVerification",
@@ -131,6 +132,10 @@ func (m *Manager) StartVerification(
 		CreatedAt: time.Now(),
 	}
 
+	if job != nil {
+		verificationRecord.JobId = &job.Id
+	}
+
 	// Store the verification
 	m.store.ReleaseVerifications.Upsert(ctx, verificationRecord)