From ddc4702b2ba4be9046fd9e5ac9571e77cb8544f3 Mon Sep 17 00:00:00 2001 From: Laura Yu <60276246+lauraway@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:26:48 -0700 Subject: [PATCH 1/5] Add secret source to start job step WIP --- src/Runner.Worker/JobExtension.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Runner.Worker/JobExtension.cs b/src/Runner.Worker/JobExtension.cs index 613f408bdde..8f974fa793f 100644 --- a/src/Runner.Worker/JobExtension.cs +++ b/src/Runner.Worker/JobExtension.cs @@ -141,6 +141,17 @@ public async Task> InitializeJob(IExecutionContext jobContext, Pipel context.Output($"Fail to parse and display GITHUB_TOKEN permissions list: {ex.Message}"); Trace.Error(ex); } + + try + { + var secretSource = jobContext.Global.Variables.Get("system.secretSource"); + context.Output($"Using secrets from: {secretSource}"); + } + catch (Exception ex) + { + context.Output($"Fail to parse and display secretSource: {ex.Message}"); + Trace.Error(ex); + } var repoFullName = context.GetGitHubContext("repository"); ArgUtil.NotNull(repoFullName, nameof(repoFullName)); From 60ef0793bb158df332482f45a24c7849543d3914 Mon Sep 17 00:00:00 2001 From: Laura Yu <60276246+lauraway@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:11:17 -0800 Subject: [PATCH 2/5] Update to use GetGitHubContext to grab source info --- src/Runner.Worker/JobExtension.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Runner.Worker/JobExtension.cs b/src/Runner.Worker/JobExtension.cs index 8f974fa793f..6cfa1fde144 100644 --- a/src/Runner.Worker/JobExtension.cs +++ b/src/Runner.Worker/JobExtension.cs @@ -142,16 +142,9 @@ public async Task> InitializeJob(IExecutionContext jobContext, Pipel Trace.Error(ex); } - try - { - var secretSource = jobContext.Global.Variables.Get("system.secretSource"); - context.Output($"Using secrets from: {secretSource}"); - } - catch (Exception ex) - { - context.Output($"Fail to parse and display secretSource: {ex.Message}"); - Trace.Error(ex); - } + var secretSource = context.GetGitHubContext("secret_source"); + ArgUtil.NotNull(secretSource, nameof(secretSource)); + context.Output($"Secret source: {secretSource}"); var repoFullName = context.GetGitHubContext("repository"); ArgUtil.NotNull(repoFullName, nameof(repoFullName)); From b91a086f134bf1e30d4aaa5e8fe166e8880c4d38 Mon Sep 17 00:00:00 2001 From: Laura Yu <60276246+lauraway@users.noreply.github.com> Date: Tue, 16 Nov 2021 15:18:33 -0800 Subject: [PATCH 3/5] Update JobExtensionL0.cs --- src/Test/L0/Worker/JobExtensionL0.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Test/L0/Worker/JobExtensionL0.cs b/src/Test/L0/Worker/JobExtensionL0.cs index 8963a943a98..122b3965165 100644 --- a/src/Test/L0/Worker/JobExtensionL0.cs +++ b/src/Test/L0/Worker/JobExtensionL0.cs @@ -102,6 +102,7 @@ private TestHostContext CreateTestContext([CallerMemberName] String testName = " _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary(), new List(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), steps, null, null, null, null); GitHubContext github = new GitHubContext(); github["repository"] = new Pipelines.ContextData.StringContextData("actions/runner"); + github["secret_source"] = new Pipelines.ContextData.StringContextData("Actions"); _message.ContextData.Add("github", github); hc.SetSingleton(_actionManager.Object); From eb964f4eafbfecbc2b2798944edbd43af8b72b23 Mon Sep 17 00:00:00 2001 From: Laura Yu <60276246+lauraway@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:05:43 -0800 Subject: [PATCH 4/5] Update JobExtension.cs --- src/Runner.Worker/JobExtension.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Runner.Worker/JobExtension.cs b/src/Runner.Worker/JobExtension.cs index 6cfa1fde144..fbe5d2116b3 100644 --- a/src/Runner.Worker/JobExtension.cs +++ b/src/Runner.Worker/JobExtension.cs @@ -141,10 +141,11 @@ public async Task> InitializeJob(IExecutionContext jobContext, Pipel context.Output($"Fail to parse and display GITHUB_TOKEN permissions list: {ex.Message}"); Trace.Error(ex); } - - var secretSource = context.GetGitHubContext("secret_source"); - ArgUtil.NotNull(secretSource, nameof(secretSource)); - context.Output($"Secret source: {secretSource}"); + + if (!string.IsNullOrEmpty(context.GetGitHubContext("secret_source"))) + { + context.Output($"Secret source: {context.GetGitHubContext("secret_source")}"); + } var repoFullName = context.GetGitHubContext("repository"); ArgUtil.NotNull(repoFullName, nameof(repoFullName)); From 5dbdf4b11f0ab44e9437edfe6eed89aedc8ee9e4 Mon Sep 17 00:00:00 2001 From: Laura Yu <60276246+lauraway@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:20:56 -0800 Subject: [PATCH 5/5] Update JobExtension.cs --- src/Runner.Worker/JobExtension.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Runner.Worker/JobExtension.cs b/src/Runner.Worker/JobExtension.cs index fbe5d2116b3..c68b626200f 100644 --- a/src/Runner.Worker/JobExtension.cs +++ b/src/Runner.Worker/JobExtension.cs @@ -142,9 +142,10 @@ public async Task> InitializeJob(IExecutionContext jobContext, Pipel Trace.Error(ex); } - if (!string.IsNullOrEmpty(context.GetGitHubContext("secret_source"))) + var secretSource = context.GetGitHubContext("secret_source"); + if (!string.IsNullOrEmpty(secretSource)) { - context.Output($"Secret source: {context.GetGitHubContext("secret_source")}"); + context.Output($"Secret source: {secretSource}"); } var repoFullName = context.GetGitHubContext("repository");