Updated parameter file parsing and added new test

Author: jorgecotillo

src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs

@@ -489,8 +489,9 @@ private Deployment CreateBasicDeployment(PSDeploymentCmdletParameters parameters
                 string parametersContent = parametersDictionary != null
                     ? PSJsonSerializer.Serialize(parametersDictionary)
                     : null;
+                // NOTE(jcotillo): Adding FromJson<> to parameters as well 
                 deployment.Properties.Parameters = !string.IsNullOrEmpty(parametersContent)
-                    ? JObject.Parse(parametersContent)
+                    ? parametersContent.FromJson<JObject>()
                     : null;
             }
 

src/Resources/ResourceManager/Utilities/TemplateUtility.cs

@@ -26,6 +26,7 @@
 using System.Security;
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities
 {
@@ -88,12 +89,18 @@ public static Dictionary<string, TemplateFileParameterV1> ParseTemplateParameter
             {
                 try
                 {
-                    parameters = JsonConvert.DeserializeObject<Dictionary<string, TemplateFileParameterV1>>(FileUtilities.DataStore.ReadFileAsText(templateParameterFilePath));
+                    // NOTE(jcotillo): We must use JsonExtensions to ensure the proper use of serialization settings.
+                    // otherwise we could get invalid date time serializations.
+                    parameters =
+                        FileUtilities.DataStore.ReadFileAsStream(templateParameterFilePath)
+                        .FromJson<Dictionary<string, TemplateFileParameterV1>>();
                 }
                 catch (JsonSerializationException)
                 {
-                    parameters = new Dictionary<string, TemplateFileParameterV1>(
-                        JsonConvert.DeserializeObject<TemplateFileParameterV2>(FileUtilities.DataStore.ReadFileAsText(templateParameterFilePath)).Parameters);
+                    var parametersv2 =
+                        FileUtilities.DataStore.ReadFileAsStream(templateParameterFilePath)
+                        .FromJson<TemplateFileParameterV2>();
+                    parameters = new Dictionary<string, TemplateFileParameterV1>(parametersv2.Parameters);
                 }
             }
 

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs

@@ -209,5 +209,12 @@ public void TestNewDeploymentFromTemplateFileContainingDatetimeOutput()
         {
             TestRunner.RunTestScript("Test-NewDeploymentFromTemplateFileContainingDatetimeOutput");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewDeploymentFromTemplateAndParameterFileContainingDatetimeOutput()
+        {
+            TestRunner.RunTestScript("Test-NewDeploymentFromTemplateAndParameterFileContainingDatetimeOutput");
+        }
     }
 }

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.ps1

@@ -942,6 +942,7 @@ function Test-NewDeploymentFromTemplateFileContainingDatetimeOutput
 		New-AzResourceGroup -Name $rgname -Location $rglocation
 
 		$datetime = "2021-07-08T22:56:00"
+		$datetimeFormatted = $datetime | Get-Date
 		$parameters = @{ "date"= $datetime }
 
 		$deployment = New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplateWithDatetimeOutput.json -TemplateParameterObject $parameters
@@ -954,8 +955,53 @@ function Test-NewDeploymentFromTemplateFileContainingDatetimeOutput
 		$getById = Get-AzResourceGroupDeployment -Id $deploymentId
 		Assert-AreEqual $getById.DeploymentName $deployment.DeploymentName
 
-		$datetimeOutput = $getById.Outputs.date
-		Assert-AreEqual $datetime $datetimeOutput
+		$datetimeOutput = $getById.Outputs.date.Value | Get-Date
+		
+		Assert-AreEqual $datetimeFormatted $datetimeOutput
+	}
+
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Tests deployment via template and parameter file containing a single datetime string output.
+#>
+function Test-NewDeploymentFromTemplateAndParameterFileContainingDatetimeOutput
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = "West US 2"
+
+	try
+	{
+		# Test
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+		# NOTE(jcotillo): This is the same value as the one from: simpleTemplateWithDatetimeOutputParameters.json
+		# if the parameter file gets updated, please ensure to update this value as well otherwise test will fail.
+		$datetime = "2021-07-08T22:56:00"
+		$datetimeFormatted = $datetime | Get-Date
+		$parameters = @{ "date"= $datetime }
+
+		$deployment = New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplateWithDatetimeOutput.json -TemplateParameterFile simpleTemplateWithDatetimeOutputParameters.json
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+		$subId = (Get-AzContext).Subscription.SubscriptionId
+		$deploymentId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deployments/$rname"
+		$getById = Get-AzResourceGroupDeployment -Id $deploymentId
+		Assert-AreEqual $getById.DeploymentName $deployment.DeploymentName
+
+		$datetimeOutput = $getById.Outputs.date.Value | Get-Date
+		
+		Assert-AreEqual $datetimeFormatted $datetimeOutput
 	}
 
 	finally