Change RunnerId/AgentId from int32 to uint64 (actions#2661)

* RunnerId int -> ulong

Author: TingluoHuang

src/Runner.Common/ConfigurationStore.cs

@@ -20,7 +20,7 @@ public sealed class RunnerSettings
         private bool? _isHostedServer;
 
         [DataMember(EmitDefaultValue = false)]
-        public int AgentId { get; set; }
+        public ulong AgentId { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public string AgentName { get; set; }

src/Runner.Common/RunnerServer.cs

@@ -27,7 +27,8 @@ public interface IRunnerServer : IRunnerService
 
         // Configuration
         Task<TaskAgent> AddAgentAsync(Int32 agentPoolId, TaskAgent agent);
-        Task DeleteAgentAsync(int agentPoolId, int agentId);
+        Task DeleteAgentAsync(int agentPoolId, ulong agentId);
+        Task DeleteAgentAsync(ulong agentId);
         Task<List<TaskAgentPool>> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation);
         Task<List<TaskAgent>> GetAgentsAsync(int agentPoolId, string agentName = null);
         Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent);
@@ -48,7 +49,7 @@ public interface IRunnerServer : IRunnerService
         Task<PackageMetadata> GetPackageAsync(string packageType, string platform, string version, CancellationToken cancellationToken);
 
         // agent update
-        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState);
+        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState);
     }
 
     public sealed class RunnerServer : RunnerService, IRunnerServer
@@ -232,12 +233,17 @@ public Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent)
             return _genericTaskAgentClient.ReplaceAgentAsync(agentPoolId, agent);
         }
 
-        public Task DeleteAgentAsync(int agentPoolId, int agentId)
+        public Task DeleteAgentAsync(int agentPoolId, ulong agentId)
         {
             CheckConnection(RunnerConnectionType.Generic);
             return _genericTaskAgentClient.DeleteAgentAsync(agentPoolId, agentId);
         }
 
+        public Task DeleteAgentAsync(ulong agentId)
+        {
+            return DeleteAgentAsync(0, agentId); // agentPool is ignored server side
+        }
+
         //-----------------------------------------------------------------
         // MessageQueue
         //-----------------------------------------------------------------
@@ -303,7 +309,7 @@ public Task<PackageMetadata> GetPackageAsync(string packageType, string platform
             return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, cancellationToken: cancellationToken);
         }
 
-        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState)
+        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState)
         {
             CheckConnection(RunnerConnectionType.Generic);
             return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState);

src/Runner.Listener/SelfUpdater.cs

@@ -30,7 +30,7 @@ public class SelfUpdater : RunnerService, ISelfUpdater
         private ITerminal _terminal;
         private IRunnerServer _runnerServer;
         private int _poolId;
-        private int _agentId;
+        private ulong _agentId;
 
         public bool Busy { get; private set; }
 

src/Runner.Worker/DiagnosticLogManager.cs

@@ -56,7 +56,7 @@ public void UploadDiagnosticLogs(IExecutionContext executionContext,
             // \_layout\_work\_temp\[jobname-support]\files\environment.txt
             var configurationStore = HostContext.GetService<IConfigurationStore>();
             RunnerSettings settings = configurationStore.GetSettings();
-            int runnerId = settings.AgentId;
+            ulong runnerId = settings.AgentId;
             string runnerName = settings.AgentName;
             int poolId = settings.PoolId;
 

src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs

@@ -97,7 +97,7 @@ public virtual Task<TaskAgent> AddAgentAsync(
         /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
         public virtual async Task DeleteAgentAsync(
             int poolId,
-            int agentId,
+            ulong agentId,
             object userState = null,
             CancellationToken cancellationToken = default)
         {
@@ -243,7 +243,7 @@ public virtual Task<List<TaskAgent>> GetAgentsAsync(
         /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
         public virtual Task<TaskAgent> ReplaceAgentAsync(
             int poolId,
-            int agentId,
+            ulong agentId,
             TaskAgent agent,
             object userState = null,
             CancellationToken cancellationToken = default)
@@ -788,7 +788,7 @@ public virtual async Task DeleteAgentSessionAsync(
         [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual Task<TaskAgent> UpdateAgentUpdateStateAsync(
             int poolId,
-            int agentId,
+            ulong agentId,
             string currentState,
             object userState = null,
             CancellationToken cancellationToken = default)

src/Sdk/DTWebApi/WebApi/AgentRefreshMessage.cs

@@ -16,7 +16,7 @@ internal AgentRefreshMessage()
         }
 
         public AgentRefreshMessage(
-            Int32 agentId,
+            ulong agentId,
             String targetVersion,
             TimeSpan? timeout = null)
         {
@@ -26,7 +26,7 @@ public AgentRefreshMessage(
         }
 
         [DataMember]
-        public Int32 AgentId
+        public ulong AgentId
         {
             get;
             private set;

src/Sdk/DTWebApi/WebApi/DiagnosticLogMetadata.cs

@@ -5,7 +5,7 @@ namespace GitHub.DistributedTask.WebApi
     [DataContract]
     public sealed class DiagnosticLogMetadata
     {
-        public DiagnosticLogMetadata(string agentName, int agentId, int poolId, string phaseName, string fileName, string phaseResult)
+        public DiagnosticLogMetadata(string agentName, ulong agentId, int poolId, string phaseName, string fileName, string phaseResult)
         {
             AgentName = agentName;
             AgentId = agentId;
@@ -19,7 +19,7 @@ public DiagnosticLogMetadata(string agentName, int agentId, int poolId, string p
         public string AgentName { get; set; }
 
         [DataMember]
-        public int AgentId { get; set; }
+        public ulong AgentId { get; set; }
 
         [DataMember]
         public int PoolId { get; set; }

src/Sdk/DTWebApi/WebApi/Runner.cs

@@ -47,7 +47,7 @@ public string Name
         }
 
         [JsonProperty("id")]
-        public Int32 Id
+        public ulong Id
         {
             get;
             internal set;

src/Sdk/DTWebApi/WebApi/RunnerRefreshMessage.cs

@@ -16,7 +16,7 @@ internal RunnerRefreshMessage()
         }
 
         public RunnerRefreshMessage(
-            Int32 runnerId,
+            ulong runnerId,
             String targetVersion,
             int? timeoutInSeconds = null)
         {
@@ -26,7 +26,7 @@ public RunnerRefreshMessage(
         }
 
         [DataMember]
-        public Int32 RunnerId
+        public ulong RunnerId
         {
             get;
             private set;

src/Sdk/DTWebApi/WebApi/TaskAgentReference.cs

@@ -36,7 +36,7 @@ protected TaskAgentReference(TaskAgentReference referenceToBeCloned)
         /// Identifier of the agent.
         /// </summary>
         [DataMember]
-        public Int32 Id
+        public ulong Id
         {
             get;
             set;

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -110,6 +110,11 @@ public async Task<TaskAgentMessage> GetRunnerMessageAsync(
                 return result.Value;
             }
 
+            if (result.StatusCode == HttpStatusCode.Forbidden)
+            {
+                throw new AccessDeniedException(result.Error);
+            }
+
             throw new Exception($"Failed to get job message: {result.Error}");
         }