JSONPath not fully supported in CLI

[lukeemery]

Description

Template substitutions use JSONPath, which supports adding filters. Filters may include operators such as the equal sign. The underlying key-value utility will break on every = and ;

Reproduce using dotnet lambda package-ci --output-template test.json --template-substitutions "$.Resources.*.[?(@.Type =~ 'AWS::Serverless::Function')].Properties=test"

Newtonsoft support doc: https://www.newtonsoft.com/json/help/html/QueryJsonSelectTokenJsonPath.htm

Stack Trace

Processing 1 substitutions.
Processing substitution: $.Resources.*.[?(@.Type 
Unknown error executing command: Path ended with open query.
   at Newtonsoft.Json.Linq.JsonPath.JPath.EnsureLength(String message)
   at Newtonsoft.Json.Linq.JsonPath.JPath.ParseSide()
   at Newtonsoft.Json.Linq.JsonPath.JPath.ParseExpression()
   at Newtonsoft.Json.Linq.JsonPath.JPath.ParseQuery(Char indexerCloseChar, Boolean scan)
   at Newtonsoft.Json.Linq.JsonPath.JPath.ParsePath(List`1 filters, Int32 currentPartStartIndex, Boolean query)
   at Newtonsoft.Json.Linq.JsonPath.JPath.ParseMain()
   at Newtonsoft.Json.Linq.JToken.SelectToken(String path, Boolean errorWhenNoMatch)
   at Amazon.Lambda.Tools.LambdaUtilities.ProcessTemplateSubstitions(IToolLogger logger, String templateBody, IDictionary`2 substitutions, String workingDirectory) in C:\codebuild\tmp\output\src181780091\src\src\Amazon.Lambda.Tools\LambdaUtilities.cs:line 139
   at Amazon.Lambda.Tools.Commands.PackageCICommand.PerformActionAsync() in C:\codebuild\tmp\output\src181780091\src\src\Amazon.Lambda.Tools\Commands\PackageCICommand.cs:line 115
   at Amazon.Common.DotNetCli.Tools.Commands.BaseCommand`1.ExecuteAsync() in C:\codebuild\tmp\output\src181780091\src\src\Amazon.Common.DotNetCli.Tools\Commands\BaseCommand.cs:line 46

Location

aws-extensions-for-dotnet-cli/src/Amazon.Lambda.Tools/Commands/PackageCICommand.cs

Line 120 in cdd4904

templateBody = LambdaUtilities.ProcessTemplateSubstitions(this.Logger, templateBody, this.GetKeyValuePairOrDefault(this.TemplateSubstitutions, LambdaDefinedCommandOptions.ARGUMENT_CLOUDFORMATION_TEMPLATE_SUBSTITUTIONS, false), Utilities.DetermineProjectLocation(this.WorkingDirectory, projectLocation));

aws-extensions-for-dotnet-cli/src/Amazon.Common.DotNetCli.Tools/Commands/BaseCommand.cs

Line 435 in cdd4904

public Dictionary<string, string> GetKeyValuePairOrDefault(Dictionary<string, string> propertyValue, CommandOption option, bool required)

aws-extensions-for-dotnet-cli/src/Amazon.Common.DotNetCli.Tools/Utilities.cs

Lines 230 to 248 in cdd4904

	public static Dictionary<string, string> ParseKeyValueOption(string option)
	{
	var parameters = new Dictionary<string, string>();
	if (string.IsNullOrWhiteSpace(option))
	return parameters;
	try
	{
	var currentPos = 0;
	while (currentPos != -1 && currentPos < option.Length)
	{
	string name;
	GetNextToken(option, '=', ref currentPos, out name);
	string value;
	GetNextToken(option, ';', ref currentPos, out value);
	if (string.IsNullOrEmpty(name))
	throw new ToolsException($"Error parsing option ({option}), format should be <key1>=<value1>;<key2>=<value2>", ToolsException.CommonErrorCode.CommandLineParseError);

[ashishdhingra]

Reproducible