Add safety check to prevent from checking defaults in ScriptHandler for composite action

ethanchewy · ethanchewy · commit aeae15de7b62 · 2020-07-21T14:33:58.000-04:00
diff --git a/src/Runner.Worker/ExecutionContext.cs b/src/Runner.Worker/ExecutionContext.cs
@@ -60,10 +60,12 @@ public interface IExecutionContext : IRunnerService
 
         bool EchoOnActionCommand { get; set; }
 
+        bool IsComposite { get; }
+
         // Initialize
         void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
         void CancelToken();
-        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null);
+        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isComposite = false);
 
         // logging
         long Write(string tag, string message);
@@ -126,6 +128,7 @@ public sealed class ExecutionContext : RunnerService, IExecutionContext
         // only job level ExecutionContext will track throttling delay.
         private long _totalThrottlingDelayInMilliseconds = 0;
 
+
         public Guid Id => _record.Id;
         public string ScopeName { get; private set; }
         public string ContextName { get; private set; }
@@ -148,6 +151,8 @@ public sealed class ExecutionContext : RunnerService, IExecutionContext
         // Only job level ExecutionContext has StepsWithPostRegistered
         public HashSet<Guid> StepsWithPostRegistered { get; private set; }
 
+        public bool IsComposite { get; private set; }
+
         public bool EchoOnActionCommand { get; set; }
 
         public TaskResult? Result
@@ -254,7 +259,7 @@ public IStep CreateCompositeStep(
             DictionaryContextData inputsData,
             Dictionary<string, string> envData)
         {
-            step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger);
+            step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, isComposite: true);
             step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
             step.ExecutionContext.ExpressionValues["steps"] = Global.StepsContext.GetScope(step.ExecutionContext.GetFullyQualifiedContextName());
 
@@ -273,7 +278,7 @@ public IStep CreateCompositeStep(
             return step;
         }
 
-        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null)
+        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isComposite = false)
         {
             Trace.Entering();
 
@@ -320,6 +325,8 @@ public IExecutionContext CreateChild(Guid recordId, string displayName, string r
                 child._logger.Setup(_mainTimelineId, recordId);
             }
 
+            child.IsComposite = isComposite;
+
             return child;
         }
 
diff --git a/src/Runner.Worker/Handlers/ScriptHandler.cs b/src/Runner.Worker/Handlers/ScriptHandler.cs
@@ -153,7 +153,7 @@ public async Task RunAsync(ActionRunStage stage)
             {
                 // TODO: figure out how defaults interact with template later
                 // for now, we won't check job.defaults if we are inside a template.
-                if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
+                if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
                 {
                     if (runDefaults.TryGetValue("working-directory", out workingDirectory))
                     {
@@ -169,7 +169,7 @@ public async Task RunAsync(ActionRunStage stage)
             {
                 // TODO: figure out how defaults interact with template later
                 // for now, we won't check job.defaults if we are inside a template.
-                if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
+                if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
                 {
                     if (runDefaults.TryGetValue("shell", out shell))
                     {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public async Task RunAsync(ActionRunStage stage)`
`153`	`153`	`{`
`154`	`154`	`// TODO: figure out how defaults interact with template later`
`155`	`155`	`// for now, we won't check job.defaults if we are inside a template.`
`156`		`- if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))`
	`156`	`+ if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))`
`157`	`157`	`{`
`158`	`158`	`if (runDefaults.TryGetValue("working-directory", out workingDirectory))`
`159`	`159`	`{`
`@@ -169,7 +169,7 @@ public async Task RunAsync(ActionRunStage stage)`
`169`	`169`	`{`
`170`	`170`	`// TODO: figure out how defaults interact with template later`
`171`	`171`	`// for now, we won't check job.defaults if we are inside a template.`
`172`		`- if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))`
	`172`	`+ if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))`
`173`	`173`	`{`
`174`	`174`	`if (runDefaults.TryGetValue("shell", out shell))`
`175`	`175`	`{`