adjust

Author: ChristopherHX

runnerconfiguration/compat/actions_runner_compat.go

@@ -25,17 +25,18 @@ type DotnetRsaParameters struct {
 }
 
 type DotnetAgent struct {
-	AgentID       string `json:"AgentId"`
-	AgentName     string `json:"AgentName"`
-	DisableUpdate string `json:"DisableUpdate"`
-	Ephemeral     string `json:"Ephemeral"`
-	PoolID        string `json:"PoolId"`
-	PoolName      string `json:"PoolName,omitempty"`
-	ServerURL     string `json:"ServerUrl"`
-	WorkFolder    string `json:"WorkFolder"`
-	GitHubURL     string `json:"GitHubUrl"`
-	UseV2Flow     bool   `json:"UseV2Flow"`
-	ServerURLV2   string `json:"ServerUrlV2"`
+	AgentID            string `json:"AgentId"`
+	AgentName          string `json:"AgentName"`
+	DisableUpdate      string `json:"DisableUpdate"`
+	Ephemeral          string `json:"Ephemeral"`
+	PoolID             string `json:"PoolId"`
+	PoolName           string `json:"PoolName,omitempty"`
+	ServerURL          string `json:"ServerUrl"`
+	WorkFolder         string `json:"WorkFolder"`
+	GitHubURL          string `json:"GitHubUrl"`
+	UseV2Flow          bool   `json:"UseV2Flow"`
+	ServerURLV2        string `json:"ServerUrlV2"`
+	UseRunnerAdminFlow bool   `json:"UseRunnerAdminFlow,omitempty"`
 }
 
 type DotnetCredentials struct {
@@ -157,6 +158,7 @@ func ToRunnerInstance(fileAccess ConfigFileAccess) (*runnerconfiguration.RunnerI
 		PoolID: poolID,
 		Auth: &protocol.GitHubAuthResult{
 			TenantURL: agent.ServerURL,
+			UseV2FLow: agent.UseRunnerAdminFlow,
 		},
 		PKey: FromRsaParameters(rsaParameters),
 		Agent: &protocol.TaskAgent{
@@ -182,16 +184,17 @@ func FromRunnerInstance(instance *runnerconfiguration.RunnerInstance, fileAccess
 	useV2Flow, _ := instance.Agent.Properties.LookupBool("UseV2Flow")
 	serverV2URL, _ := instance.Agent.Properties.LookupString("ServerUrlV2")
 	agent := &DotnetAgent{
-		AgentID:       fmt.Sprint(instance.Agent.ID),
-		AgentName:     instance.Agent.Name,
-		Ephemeral:     fmt.Sprint(instance.Agent.Ephemeral),
-		DisableUpdate: fmt.Sprint(instance.Agent.DisableUpdate),
-		PoolID:        fmt.Sprint(instance.PoolID),
-		ServerURL:     instance.Auth.TenantURL,
-		WorkFolder:    instance.WorkFolder,
-		GitHubURL:     instance.RegistrationURL,
-		UseV2Flow:     useV2Flow,
-		ServerURLV2:   serverV2URL,
+		AgentID:            fmt.Sprint(instance.Agent.ID),
+		AgentName:          instance.Agent.Name,
+		Ephemeral:          fmt.Sprint(instance.Agent.Ephemeral),
+		DisableUpdate:      fmt.Sprint(instance.Agent.DisableUpdate),
+		PoolID:             fmt.Sprint(instance.PoolID),
+		ServerURL:          instance.Auth.TenantURL,
+		WorkFolder:         instance.WorkFolder,
+		GitHubURL:          instance.RegistrationURL,
+		UseV2Flow:          useV2Flow,
+		ServerURLV2:        serverV2URL,
+		UseRunnerAdminFlow: instance.Auth.UseV2FLow,
 	}
 	if agent.WorkFolder == "" {
 		agent.WorkFolder = "_work"