Composite Actions: Support Env Flow

src/Runner.Worker/ExecutionContext.cs

@@ -105,7 +105,7 @@ public interface IExecutionContext : IRunnerService
  // others
  void ForceTaskComplete();
  void RegisterPostJobStep(IStep step);
- void RegisterNestedStep(IStep step, DictionaryContextData inputsData, int location);
+ void RegisterNestedStep(IStep step, DictionaryContextData inputsData, int location, Dictionary<string, string> envData);
  }
 
  public sealed class ExecutionContext : RunnerService, IExecutionContext
@@ -270,13 +270,28 @@ public void RegisterPostJobStep(IStep step)
  /// Helper function used in CompositeActionHandler::RunAsync to
  /// add a child node, aka a step, to the current job to the Root.JobSteps based on the location. 
  /// </summary>
- public void RegisterNestedStep(IStep step, DictionaryContextData inputsData, int location)
+ public void RegisterNestedStep(IStep step, DictionaryContextData inputsData, int location, Dictionary<string, string> envData)
  {
  // TODO: For UI purposes, look at figuring out how to condense steps in one node => maybe use the same previous GUID
  var newGuid = Guid.NewGuid();
  step.ExecutionContext = Root.CreateChild(newGuid, step.DisplayName, newGuid.ToString("N"), null, null);
  step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
- // TODO: confirm whether not copying message contexts is safe
+
+ // Add the composite action environment variables to each step.
+ // If the key already exists, we override it since the composite action env variables will have higher precedence
+ // Note that for each composite action step, it's environment variables will be set in the StepRunner automatically
+ // step.ExecutionContext.SetEnvironmentVariables(envData);
+#if OS_WINDOWS
+ var envContext = new DictionaryContextData();
+#else
+ var envContext = new CaseSensitiveDictionaryContextData();
+#endif
+ foreach (var pair in envData)
+ {
+ envContext[pair.Key] = new StringContextData(pair.Value ?? string.Empty);
+ }
+ step.ExecutionContext.ExpressionValues["env"] = envContext;
+
  Root.JobSteps.Insert(location, step);
  }
 

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -84,10 +84,8 @@ public Task RunAsync(ActionRunStage stage)
  actionRunner.Stage = stage;
  actionRunner.Condition = aStep.Condition;
  actionRunner.DisplayName = aStep.DisplayName;
- // TODO: Do we need to add any context data from the job message?
- // (See JobExtension.cs ~line 236)
 
- ExecutionContext.RegisterNestedStep(actionRunner, inputsData, location);
+ ExecutionContext.RegisterNestedStep(actionRunner, inputsData, location, Environment);
  location++;
  }
 

src/Runner.Worker/StepsRunner.cs

@@ -93,12 +93,28 @@ public async Task RunAsync(IExecutionContext jobContext)
 #else
  var envContext = new CaseSensitiveDictionaryContextData();
 #endif
- step.ExecutionContext.ExpressionValues["env"] = envContext;
+ // Global env
  foreach (var pair in step.ExecutionContext.EnvironmentVariables)
  {
  envContext[pair.Key] = new StringContextData(pair.Value ?? string.Empty);
  }
 
+ // Stomps over with outside step env
+ if (step.ExecutionContext.ExpressionValues.TryGetValue("env", out var envContextData))
+ {
+#if OS_WINDOWS
+ var dict = envContextData as DictionaryContextData;
+#else
+ var dict = envContextData as CaseSensitiveDictionaryContextData;
+#endif
+ foreach (var pair in dict)
+ {
+ envContext[pair.Key] = pair.Value;
+ }
+ }
+
+ step.ExecutionContext.ExpressionValues["env"] = envContext;
+
  bool evaluateStepEnvFailed = false;
  if (step is IActionRunner actionStep)
  {

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs

@@ -160,8 +160,7 @@ public String EvaluateStepDisplayName(
  }
 
  public List<ActionStep> LoadCompositeSteps(
- TemplateToken token
- )
+ TemplateToken token)
  {
  var result = default(List<ActionStep>);
  if (token != null && token.Type != TokenType.Null)

src/Test/L0/Worker/StepsRunnerL0.cs

@@ -426,11 +426,11 @@ public async Task StepEnvOverrideJobEnvContext()
  Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
 
 #if OS_WINDOWS
- Assert.Equal("100", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("100"));
- Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("github_actions"));
+ Assert.Equal("100", step1.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("100"));
+ Assert.Equal("github_actions", step1.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("github_actions"));
 #else
- Assert.Equal("100", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("100"));
- Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("github_actions"));
+ Assert.Equal("100", step1.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("100"));
+ Assert.Equal("github_actions", step1.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("github_actions"));
 #endif
  }
  }
@@ -463,13 +463,13 @@ public async Task PopulateEnvContextForEachStep()
  // Assert.
  Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
 #if OS_WINDOWS
- Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
- Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env3"].AssertString("github_actions"));
- Assert.False(_ec.Object.ExpressionValues["env"].AssertDictionary("env").ContainsKey("env2"));
+ Assert.Equal("1000", step2.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
+ Assert.Equal("github_actions", step2.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env3"].AssertString("github_actions"));
+ Assert.False(step2.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env").ContainsKey("env2"));
 #else
- Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
- Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env3"].AssertString("github_actions"));
- Assert.False(_ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env").ContainsKey("env2"));
+ Assert.Equal("1000", step2.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
+ Assert.Equal("github_actions", step2.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env3"].AssertString("github_actions"));
+ Assert.False(step2.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env").ContainsKey("env2"));
 #endif
  }
  }
@@ -501,11 +501,11 @@ public async Task PopulateEnvContextAfterSetupStepsContext()
  // Assert.
  Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
 #if OS_WINDOWS
- Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
- Assert.Equal("something", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("something"));
+ Assert.Equal("1000", step2.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
+ Assert.Equal("something", step2.Object.ExecutionContext.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("something"));
 #else
- Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
- Assert.Equal("something", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("something"));
+ Assert.Equal("1000", step2.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
+ Assert.Equal("something", step2.Object.ExecutionContext.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("something"));
 #endif
  }
  }
@@ -602,7 +602,7 @@ private Mock<IActionRunner> CreateStep(TestHostContext hc, TaskResult result, st
  stepContext.Setup(x => x.WriteDebug).Returns(true);
  stepContext.Setup(x => x.Variables).Returns(_variables);
  stepContext.Setup(x => x.EnvironmentVariables).Returns(_env);
- stepContext.Setup(x => x.ExpressionValues).Returns(_contexts);
+ stepContext.Setup(x => x.ExpressionValues).Returns(new DictionaryContextData());
  stepContext.Setup(x => x.ExpressionFunctions).Returns(new List<IFunctionInfo>());
  stepContext.Setup(x => x.JobContext).Returns(_jobContext);
  stepContext.Setup(x => x.StepsContext).Returns(_stepContext);