feat(builds): expose builder VM instance ID in build response

.github/workflows/test.yml

@@ -37,6 +37,9 @@ jobs:
       - name: Clean cached binaries
         run: make clean
 
+      - name: Generate OpenAPI code
+        run: make oapi-generate
+
       - name: Build
         run: make build
 

cmd/api/api/builds.go

@@ -284,16 +284,17 @@ func (r buildEventsStreamResponse) VisitGetBuildEventsResponse(w http.ResponseWr
 // buildToOAPI converts a domain Build to OAPI Build
 func buildToOAPI(b *builds.Build) oapi.Build {
 	oapiBuild := oapi.Build{
-		Id:            b.ID,
-		Status:        oapi.BuildStatus(b.Status),
-		QueuePosition: b.QueuePosition,
-		ImageDigest:   b.ImageDigest,
-		ImageRef:      b.ImageRef,
-		Error:         b.Error,
-		CreatedAt:     b.CreatedAt,
-		StartedAt:     b.StartedAt,
-		CompletedAt:   b.CompletedAt,
-		DurationMs:    b.DurationMS,
+		Id:                b.ID,
+		Status:            oapi.BuildStatus(b.Status),
+		QueuePosition:     b.QueuePosition,
+		ImageDigest:       b.ImageDigest,
+		ImageRef:          b.ImageRef,
+		Error:             b.Error,
+		CreatedAt:         b.CreatedAt,
+		StartedAt:         b.StartedAt,
+		CompletedAt:       b.CompletedAt,
+		DurationMs:        b.DurationMS,
+		BuilderInstanceId: b.BuilderInstanceID,
 	}
 
 	if b.Provenance != nil {
@@ -310,4 +311,3 @@ func buildToOAPI(b *builds.Build) oapi.Build {
 
 	return oapiBuild
 }
-

lib/builds/storage.go

@@ -29,16 +29,17 @@ type buildMetadata struct {
 // toBuild converts internal metadata to the public Build type
 func (m *buildMetadata) toBuild() *Build {
 	return &Build{
-		ID:          m.ID,
-		Status:      m.Status,
-		ImageDigest: m.ImageDigest,
-		ImageRef:    m.ImageRef,
-		Error:       m.Error,
-		Provenance:  m.Provenance,
-		CreatedAt:   m.CreatedAt,
-		StartedAt:   m.StartedAt,
-		CompletedAt: m.CompletedAt,
-		DurationMS:  m.DurationMS,
+		ID:                m.ID,
+		Status:            m.Status,
+		ImageDigest:       m.ImageDigest,
+		ImageRef:          m.ImageRef,
+		Error:             m.Error,
+		Provenance:        m.Provenance,
+		CreatedAt:         m.CreatedAt,
+		StartedAt:         m.StartedAt,
+		CompletedAt:       m.CompletedAt,
+		DurationMS:        m.DurationMS,
+		BuilderInstanceID: m.BuilderInstance,
 	}
 }
 

lib/builds/types.go

@@ -16,17 +16,18 @@ const (
 
 // Build represents a source-to-image build job
 type Build struct {
-	ID            string           `json:"id"`
-	Status        string           `json:"status"`
-	QueuePosition *int             `json:"queue_position,omitempty"`
-	ImageDigest   *string          `json:"image_digest,omitempty"`
-	ImageRef      *string          `json:"image_ref,omitempty"`
-	Error         *string          `json:"error,omitempty"`
-	Provenance    *BuildProvenance `json:"provenance,omitempty"`
-	CreatedAt     time.Time        `json:"created_at"`
-	StartedAt     *time.Time       `json:"started_at,omitempty"`
-	CompletedAt   *time.Time       `json:"completed_at,omitempty"`
-	DurationMS    *int64           `json:"duration_ms,omitempty"`
+	ID                string           `json:"id"`
+	Status            string           `json:"status"`
+	QueuePosition     *int             `json:"queue_position,omitempty"`
+	ImageDigest       *string          `json:"image_digest,omitempty"`
+	ImageRef          *string          `json:"image_ref,omitempty"`
+	Error             *string          `json:"error,omitempty"`
+	Provenance        *BuildProvenance `json:"provenance,omitempty"`
+	CreatedAt         time.Time        `json:"created_at"`
+	StartedAt         *time.Time       `json:"started_at,omitempty"`
+	CompletedAt       *time.Time       `json:"completed_at,omitempty"`
+	DurationMS        *int64           `json:"duration_ms,omitempty"`
+	BuilderInstanceID *string          `json:"builder_instance_id,omitempty"`
 }
 
 // CreateBuildRequest represents a request to create a new build