actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-10 12:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce input validation warnings (#506)

Browse Source 
* Only raise a single warning for unexpected inputs

* Update invalid input test to raise single warning
This commit is contained in:
Nick Fields
2020-06-05 23:09:14 -04:00
committed by GitHub
parent 3c5aef791c
commit f994ae0542
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Runner.Worker/ActionRunner.cs
View File

@@ -187,13 +187,19 @@ namespace GitHub.Runner.Worker
// Validate inputs only for actions with action.yml // Validate inputs only for actions with action.yml
if (Action.Reference.Type == Pipelines.ActionSourceType.Repository) if (Action.Reference.Type == Pipelines.ActionSourceType.Repository)
{ {
var unexpectedInputs = new List<string>();
foreach (var input in userInputs) foreach (var input in userInputs)
{ {
if (!validInputs.Contains(input)) if (!validInputs.Contains(input))
{ {
ExecutionContext.Warning($"Unexpected input '{input}', valid inputs are ['{string.Join("', '", validInputs)}']"); unexpectedInputs.Add(input);
} }
} }
if (unexpectedInputs.Count > 0)
{
ExecutionContext.Warning($"Unexpected input(s) '{string.Join("', '", unexpectedInputs)}', valid inputs are ['{string.Join("', '", validInputs)}']");
}
} }
// Load the action environment. // Load the action environment.

3
src/Test/L0/Worker/ActionRunnerL0.cs
View File

@@ -328,8 +328,7 @@ namespace GitHub.Runner.Common.Tests.Worker
Assert.Equal("invalid1", finialInputs["invalid1"]); Assert.Equal("invalid1", finialInputs["invalid1"]);
Assert.Equal("invalid2", finialInputs["invalid2"]); Assert.Equal("invalid2", finialInputs["invalid2"]);
_ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Unexpected input 'invalid1'")), It.IsAny<string>()), Times.Once); _ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Unexpected input(s) 'invalid1', 'invalid2'")), It.IsAny<string>()), Times.Once);
_ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Unexpected input 'invalid2'")), It.IsAny<string>()), Times.Once);
} }
private void Setup([CallerMemberName] string name = "") private void Setup([CallerMemberName] string name = "")