pass billing owner id between run service calls

Author: ChristopherHX

actionsrunner/runner.go

@@ -401,6 +401,7 @@ type RunnerJobRequestRef struct {
 	Id              string `json:"id"`
 	RunnerRequestId string `json:"runner_request_id"`
 	RunServiceUrl   string `json:"run_service_url"`
+	BillingOwnerId  string `json:"billing_owner_id,omitempty"`
 }
 
 type plainTextFormatter struct {
@@ -454,8 +455,9 @@ func runJob(runnerenv RunnerEnvironment, joblock *sync.Mutex, vssConnection *pro
 						acquirejobUrl.Path = path.Join(acquirejobUrl.Path, "acquirejob")
 						vssConnection.TenantURL = runServiceUrl
 						payload := &runservice.AcquireJobRequest{
-							StreamID:     rjrr.RunnerRequestId,
-							JobMessageID: rjrr.RunnerRequestId,
+							StreamID:       rjrr.RunnerRequestId,
+							JobMessageID:   rjrr.RunnerRequestId,
+							BillingOwnerId: rjrr.BillingOwnerId,
 						}
 						err = vssConnection.RequestWithContext2(jobctx, "POST", acquirejobUrl.String(), "", payload, &src)
 					}

actionsrunner/worker_context.go

@@ -31,10 +31,11 @@ type DefaultWorkerContext struct {
 func (wc *DefaultWorkerContext) FinishJob(result string, outputs *map[string]protocol.VariableValue) {
 	if strings.EqualFold(wc.Message().MessageType, "RunnerJobRequest") {
 		payload := &run.CompleteJobRequest{
-			PlanID:     wc.Message().Plan.PlanID,
-			JobID:      wc.Message().JobID,
-			Conclusion: strings.ToLower(result),
-			Outputs:    nil,
+			PlanID:         wc.Message().Plan.PlanID,
+			JobID:          wc.Message().JobID,
+			Conclusion:     strings.ToLower(result),
+			Outputs:        nil,
+			BillingOwnerId: wc.Message().BillingOwnerId,
 		}
 		if outputs != nil {
 			payload.Outputs = *outputs

protocol/misc.go

@@ -104,6 +104,7 @@ type AgentJobRequestMessage struct {
 	Variables            map[string]VariableValue
 	Steps                []ActionStep
 	FileTable            []string
+	BillingOwnerId       string `json:"billingOwnerId,omitempty"`
 }
 
 func (jobreq *AgentJobRequestMessage) GetConnection(name string) (*VssConnection, map[string]string, error) {

protocol/run/contracts.go

@@ -9,17 +9,19 @@ import (
 )
 
 type AcquireJobRequest struct {
-	StreamID     string `json:"streamId,omitempty"` // Deprecated: https://github.com/actions/runner/pull/2547
-	JobMessageID string `json:"jobMessageId"`
+	StreamID       string `json:"streamId,omitempty"` // Deprecated: https://github.com/actions/runner/pull/2547
+	JobMessageID   string `json:"jobMessageId"`
+	BillingOwnerId string `json:"billingOwnerId,omitempty"`
 }
 
 type CompleteJobRequest struct {
-	PlanID      string                            `json:"planId,omitempty"`
-	JobID       string                            `json:"jobId,omitempty"`
-	Conclusion  string                            `json:"conclusion"`
-	Outputs     map[string]protocol.VariableValue `json:"outputs,omitempty"`
-	StepResults []StepResult                      `json:"stepResults,omitempty"`
-	Annotations []Annotation                      `json:"annotations,omitempty"`
+	PlanID         string                            `json:"planId,omitempty"`
+	JobID          string                            `json:"jobId,omitempty"`
+	Conclusion     string                            `json:"conclusion"`
+	Outputs        map[string]protocol.VariableValue `json:"outputs,omitempty"`
+	StepResults    []StepResult                      `json:"stepResults,omitempty"`
+	Annotations    []Annotation                      `json:"annotations,omitempty"`
+	BillingOwnerId string                            `json:"billingOwnerId,omitempty"`
 }
 
 type RenewJobRequest struct {