[Az Resources] Fix resource tags casing serialization - tags casing not being preserved when passed as parameters

src/Resources/ResourceManager/Json/CamelCasePropertyNamesWithOverridesContractResolver.cs

@@ -54,17 +54,12 @@ protected override JsonDictionaryContract CreateDictionaryContract(Type objectTy
         {
             var contract = base.CreateDictionaryContract(objectType);
 
-            var attributes = objectType.GetCustomAttributes(attributeType: typeof(JsonPreserveCaseDictionaryAttribute), inherit: true);
-            if (attributes.Any())
-            {
-// TODO: Remove IfDef code
+            // TODO: Remove IfDef code
 #if NETSTANDARD
-                contract.DictionaryKeyResolver = keyName => keyName;
+            contract.DictionaryKeyResolver = keyName => keyName;
 #else
-                contract.PropertyNameResolver = propertyName => propertyName;
+            contract.PropertyNameResolver = propertyName => propertyName;
 #endif
-            }
-
             return contract;
         }
     }

src/Resources/Resources.Test/Json/PSJsonSerializerTests.cs

@@ -93,13 +93,10 @@ public void Serialize_Hashtable_Success()
 
             JToken parsedResult = result.FromJson<JToken>();
 
-            // NOTE(jcotillo): JsonExtensions is now camelCasing all property keys
-            // therefore even though Bar was set as PascalCase, after serializing it
-            // the key became camelCase.
             JToken expected = JToken.FromObject(new
             {
                 foo = "fooValue",
-                bar = true,
+                Bar = true,
                 nested = new
                 {
                     foo = "4d44fe86-f04a-4ba5-9900-abdec8cb11c1",

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

@@ -216,5 +216,19 @@ public void TestNewDeploymentFromTemplateAndParameterFileContainingDatetimeOutpu
         {
             TestRunner.RunTestScript("Test-NewDeploymentFromTemplateAndParameterFileContainingDatetimeOutput");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewDeploymentFromTemplateFileContainingTagsOutput()
+        {
+            TestRunner.RunTestScript("Test-NewDeploymentFromTemplateFileContainingTagsOutput");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewDeploymentFromTemplateAndParameterFileContainingTagsOutput()
+        {
+            TestRunner.RunTestScript("Test-NewDeploymentFromTemplateAndParameterFileContainingTagsOutput");
+        }
     }
 }

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

@@ -1004,6 +1004,116 @@ function Test-NewDeploymentFromTemplateAndParameterFileContainingDatetimeOutput
 		Assert-AreEqual $datetimeFormatted $datetimeOutput
 	}
 
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Tests deployment via template and parameter file containing a tags with different casing.
+#>
+function Test-NewDeploymentFromTemplateFileContainingTagsOutput
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = "West US 2"
+
+	try
+	{
+		# Test
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+		$tagsToCompare = @{
+			"MY_FIRST_TAG" = "tagValue";
+			"MYFIRSTTAG" = "tagvalue2";
+			"mysecondTag" = "tagValue3";
+			"mythirdtag" = "tagvalue4"
+		}
+
+		$parameters = @{ "tags"= $tagsToCompare }
+
+		$deployment = New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplateWithTagsOutput.json -TemplateParameterObject $parameters
+
+		# 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
+
+		$tagsOutput = $getById.Outputs.tags.Value
+
+		$tagsOutputJson = ConvertTo-Json -Compress $tagsOutput
+
+		# Performs a case sensitive comparison
+		# Doing a foreach on the keys and comparing against the JSON string
+		# this needed because the flag -AsHashTable doesn't seem to work 
+		# in ConvertTo-Json cmdlet
+		foreach ($tag in $tagsToCompare.Keys)
+		{
+			Assert-True { $tagsOutputJson -clike "*${tag}*"}
+		}
+	}
+
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Tests deployment via template and parameter file containing a tags with different casing.
+#>
+function Test-NewDeploymentFromTemplateAndParameterFileContainingTagsOutput
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = "West US 2"
+
+	try
+	{
+		# Test
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+		$tagsToCompare = @{
+			"MY_FIRST_TAG" = "tagValue";
+			"MYFIRSTTAG" = "tagvalue2";
+			"mysecondTag" = "tagValue3";
+			"mythirdtag" = "tagvalue4"
+		}
+
+		$deployment = New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile simpleTemplateWithTagsOutput.json -TemplateParameterFile simpleTemplateWithTagsOutputParameters.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
+
+		$tagsOutput = $getById.Outputs.tags.Value
+
+		$tagsOutputJson = ConvertTo-Json -Compress $tagsOutput
+
+		# Performs a case sensitive comparison
+		# Doing a foreach on the keys and comparing against the JSON string
+		# this needed because the flag -AsHashTable doesn't seem to work 
+		# in ConvertTo-Json cmdlet
+		foreach ($tag in $tagsToCompare.Keys)
+		{
+			Assert-True { $tagsOutputJson -clike "*${tag}*"}
+		}
+	}
+
 	finally
     {
         # Cleanup