WIP

images/Dockerfile

@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build
 
 ARG RUNNER_VERSION
 ARG RUNNER_ARCH="x64"
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.1
 ARG DOCKER_VERSION=20.10.23
 
 RUN apt update -y && apt install curl unzip -y

src/Runner.Common/BrokerServer.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using Sdk.RSWebApi.Contracts;
@@ -18,6 +19,7 @@ namespace GitHub.Runner.Common
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
         Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
+        Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken token);
     }
 
     public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -48,9 +50,20 @@ namespace GitHub.Runner.Common
         {
             CheckConnection();
             var jobMessage = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken);
+                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken
+                );
 
             return jobMessage;
         }
+
+        public Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken cancellationToken)
+        {
+            CheckConnection();
+
+            return RetryRequest(
+                async () => await _brokerHttpClient.DeleteRunnerMessageAsync(messageID, cancellationToken),
+                cancellationToken
+            );
+        }
     }
 }

src/Runner.Listener/BrokerMessageListener.cs

@@ -170,7 +170,17 @@ namespace GitHub.Runner.Listener
 
         public async Task DeleteMessageAsync(TaskAgentMessage message)
         {
-            await Task.CompletedTask;
+            Trace.Entering();
+
+            if (MessageUtil.IsRunServiceJob(message.MessageType))
+            {
+                var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
+
+                using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
+                {
+                    await _brokerServer.DeleteRunnerMessageAsync(messageRef.RunnerRequestId, cs.Token);
+                }
+            }
         }
 
         private bool IsGetNextMessageExceptionRetriable(Exception ex)

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -137,7 +137,7 @@ namespace GitHub.Runner.Listener.Configuration
                     GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
                     runnerSettings.UseV2Flow = authResult.UseV2Flow;
-                    Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
+                    _term.WriteLine($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
                 }

src/Runner.Listener/Runner.cs

@@ -392,6 +392,7 @@ namespace GitHub.Runner.Listener
                     {
                         TaskAgentMessage message = null;
                         bool skipMessageDeletion = false;
+                        bool useBrokerDeletion = false;
                         try
                         {
                             Task<TaskAgentMessage> getNextMessage = _listener.GetNextMessageAsync(messageQueueLoopTokenSource.Token);
@@ -600,7 +601,15 @@ namespace GitHub.Runner.Listener
                             {
                                 try
                                 {
-                                    await _listener.DeleteMessageAsync(message);
+                                    if (useBrokerDeletion)
+                                    {
+                                        // await _listener.DeleteMessageAsync(brokerDeletionParamsMessageID, brokerDeletionParamsToken);
+                                        await _listener.DeleteMessageAsync(message);
+                                    }
+                                    else
+                                    {
+                                        await _listener.DeleteMessageAsync(message);
+                                    }
                                 }
                                 catch (Exception ex)
                                 {

src/Runner.Worker/Container/ContainerHooks/HookInput.cs

@@ -83,7 +83,7 @@ namespace GitHub.Runner.Worker.Container.ContainerHooks
         public HookContainer(ContainerInfo container)
         {
             Image = container.ContainerImage;
-            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()).Where(arg => !string.IsNullOrEmpty(arg)) ?? new List<string>();
+            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()) ?? new List<string>();
             EntryPoint = container.ContainerEntryPoint;
             WorkingDirectory = container.ContainerWorkDirectory;
             CreateOptions = container.ContainerCreateOptions;

src/Runner.Worker/JobRunner.cs

@@ -150,11 +150,6 @@ namespace GitHub.Runner.Worker
                 _runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
                 jobContext.SetRunnerContext("name", _runnerSettings.AgentName);
 
-                if (jobContext.Global.Variables.TryGetValue(WellKnownDistributedTaskVariables.RunnerEnvironment, out var runnerEnvironment))
-                {
-                    jobContext.SetRunnerContext("environment", runnerEnvironment);
-                }
-
                 string toolsDirectory = HostContext.GetDirectory(WellKnownDirectory.Tools);
                 Directory.CreateDirectory(toolsDirectory);
                 jobContext.SetRunnerContext("tool_cache", toolsDirectory);

src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.DistributedTask.WebApi
 {
@@ -6,6 +6,5 @@ namespace GitHub.DistributedTask.WebApi
     {
         public static readonly String JobId = "system.jobId";
         public static readonly String RunnerLowDiskspaceThreshold = "system.runner.lowdiskspacethreshold";
-        public static readonly String RunnerEnvironment = "system.runnerEnvironment";
     }
 }

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -88,5 +88,28 @@ namespace GitHub.Actions.RunService.WebApi
 
             throw new Exception($"Failed to get job message: {result.Error}");
         }
+
+        public async Task<bool> DeleteRunnerMessageAsync(
+            string messageID,
+            CancellationToken cancellationToken = default
+        )
+        {
+            var requestUri = new Uri(Client.BaseAddress, "message");
+
+            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
+
+            if (messageID != null)
+            {
+                queryParams.Add("messageID", messageID);
+            }
+
+            var result = await SendAsync<TaskAgentMessage>(
+                new HttpMethod("DELETE"),
+                requestUri: requestUri,
+                queryParameters: queryParams,
+                cancellationToken: cancellationToken);
+
+            return (result.IsSuccess);
+        }
     }
 }

src/Test/L0/Sdk/DTObjectTemplating/TemplateContextL0.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using Xunit;
-
-namespace GitHub.DistributedTask.ObjectTemplating.Tests
-{
-    public sealed class TemplateContextL0
-    {
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void VerifyError()
-        {
-            TemplateContext context = buildContext();
-            TemplateToken value = new StringToken(1, 1, 1, "some-token");
-            System.Exception ex = new System.Exception();
-
-            List<TemplateValidationError> expectedErrors = new();
-            expectedErrors.Add(new TemplateValidationError("(Line: 1, Col: 1): Exception of type 'System.Exception' was thrown."));
-
-            context.Error(value, ex);
-
- 
-            Assert.True(expectedErrors.SequenceEqual(toList(context.Errors.GetEnumerator())));
-
-
-            Assert.True(true);
-        }
-
-        private TemplateContext buildContext()
-        {
-            return new TemplateContext
-            {
-                // CancellationToken = CancellationToken.None,
-                Errors = new TemplateValidationErrors(10, int.MaxValue), // Don't truncate error messages otherwise we might not scrub secrets correctly
-                Memory = new TemplateMemory(
-                maxDepth: 100,
-                maxEvents: 1000000,
-                maxBytes: 10 * 1024 * 1024),
-                Schema = null,
-                TraceWriter = new EmptyTraceWriter(),
-            };
-        }
-
-        private List<TemplateValidationError> toList(IEnumerator<TemplateValidationError> enumerator)
-        {
-            List<TemplateValidationError> result = new();
-            while (enumerator.MoveNext())
-            {
-                TemplateValidationError err = enumerator.Current;
-                result.Add(err);
-            }
-            return result;
-        }
-    }
-}