Skip to content

Fix ThrowOnUsageError false positive on parameter values containing d… #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LiYueqian-James wants to merge 1 commit into
base: v1.16
Choose a base branch
from
+6 −2
Open

Fix ThrowOnUsageError false positive on parameter values containing d… #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/VirtualClient/VirtualClient.Main/CommandLineExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,14 @@ public static void ThrowOnUsageError(this ParseResult parseResults)
}

// Scenario 3:
// There are no options on the command line that are not valid for the command.
// There are options on the command line that are not valid for the command.
// Use a full-string match (anchored regex) to avoid false positives from
// values bound to recognized options that contain double-dash prefixed
// substrings (e.g. --parameters="...DriverInstallationCommandArguments=--silent...").
IEnumerable<Token> arguments = parseResults.Tokens.Where(t => t.Type == TokenType.Argument);
if (arguments?.Any() == true)
{
Regex optionMatchExpression = new Regex("--[a-z]+", RegexOptions.IgnoreCase);
Regex optionMatchExpression = new Regex(@"^--[a-z][-a-z]*$", RegexOptions.IgnoreCase);
foreach (Token argument in arguments)
{
if (optionMatchExpression.IsMatch(argument.Value?.Trim()))
Expand Down
1 change: 1 addition & 0 deletions src/VirtualClient/VirtualClient.UnitTests/CommandLineOptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ public void VirtualClientThrowsWhenAnUnrecognizedOptionIsSuppliedOnTheCommandLin
[TestCase("--ps", "https://anystorageaccount.blob.core.windows.net/?sv=2020-08-04&ss=b")]
[TestCase("--parameters", "Param1=Value1,,,Param2=Value2")]
[TestCase("--pm", "Param1=Value1,,,Param2=Value2")]
[TestCase("--parameters", "DriverInstallationCommandArguments=--silent,,,UserName=HpcUser,,,DriverBlobName=nvidiagriddriver-v20.0.zip")]
[TestCase("--seed", "1234")]
[TestCase("--sd", "1234")]
[TestCase("--scenarios", "Scenario1")]
Expand Down