From f6e980984493b3eebbfdb5e02048285b950bffb1 Mon Sep 17 00:00:00 2001 From: Rob Herley Date: Mon, 31 Jul 2023 22:18:14 -0400 Subject: [PATCH] Expose results service endpoint as environment variable (#2726) * Add results service url endpoint to environment * linter: fix file encoding --- src/Runner.Worker/Handlers/ContainerActionHandler.cs | 6 +++++- src/Runner.Worker/Handlers/NodeScriptActionHandler.cs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Runner.Worker/Handlers/ContainerActionHandler.cs b/src/Runner.Worker/Handlers/ContainerActionHandler.cs index 9d9d20f17..eb75bb59c 100644 --- a/src/Runner.Worker/Handlers/ContainerActionHandler.cs +++ b/src/Runner.Worker/Handlers/ContainerActionHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -228,6 +228,10 @@ namespace GitHub.Runner.Worker.Handlers Environment["ACTIONS_ID_TOKEN_REQUEST_URL"] = generateIdTokenUrl; Environment["ACTIONS_ID_TOKEN_REQUEST_TOKEN"] = systemConnection.Authorization.Parameters[EndpointAuthorizationParameters.AccessToken]; } + if (systemConnection.Data.TryGetValue("ResultsServiceUrl", out var resultsUrl) && !string.IsNullOrEmpty(resultsUrl)) + { + Environment["ACTIONS_RESULTS_URL"] = resultsUrl; + } foreach (var variable in this.Environment) { diff --git a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs index b5de017d6..955300903 100644 --- a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs +++ b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs @@ -63,6 +63,10 @@ namespace GitHub.Runner.Worker.Handlers Environment["ACTIONS_ID_TOKEN_REQUEST_URL"] = generateIdTokenUrl; Environment["ACTIONS_ID_TOKEN_REQUEST_TOKEN"] = systemConnection.Authorization.Parameters[EndpointAuthorizationParameters.AccessToken]; } + if (systemConnection.Data.TryGetValue("ResultsServiceUrl", out var resultsUrl) && !string.IsNullOrEmpty(resultsUrl)) + { + Environment["ACTIONS_RESULTS_URL"] = resultsUrl; + } // Resolve the target script. string target = null;