New-AzureResourceGroupDeployment with KeyVault reference parameter

Author: linweigao

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -245,6 +245,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="keyVaultTemplateParams.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SamplePolicyDefinition.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -29,5 +29,11 @@ public void TestNewDeploymentFromTemplateFile()
         {
             ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentFromTemplateFile");
         }
+
+        [Fact]
+        public void TestNewDeploymentWithKeyVaultReference()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentWithKeyVaultReference");
+        }
     }
 }

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

@@ -67,3 +67,48 @@ function Test-NewDeploymentFromTemplateFile
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Tests deployment via template file and parameter object.
+#>
+function Test-NewDeploymentWithKeyVaultReference
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$keyVaultResourceName = Get-ResourceName
+	$secretName = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$location = Get-ProviderLocation "Microsoft.Web/sites"
+	$hostplanName = "xDeploymentTestHost26668"
+
+	try
+	{
+		# Test
+		New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+
+		$keyVault = $keyVault = new-azurermkeyvault -VaultName $keyVaultResourceName -ResourceGroupName $rgname -Location $location -EnabledForTemplateDeployment
+		Set-AzureKeyVaultSecret -VaultName $keyVaultResourceName -SecretName $secretName -SecretValue $hostplanName
+		$content = (Get-Content keyVaultTemplateParams.json) -join '' | ConvertFrom-Json
+		$content.hostingPlanName.reference.KeyVault.id = $keyVault.resourceid
+		$content.hostingPlanName.reference.SecretName = $secretName
+		$content | ConvertTo-Json -depth 999 | Out-File keyVaultTemplateParams.json
+
+		$deployment = New-AzureRmResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile sampleTemplate.json -TemplateParameterFile keyVaultTemplateParams.json
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+		$subId = (Get-AzureRmContext).Subscription.SubscriptionId
+		$deploymentId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deployments/$rname"
+		$getById = Get-AzureRmResourceGroupDeployment -Id $deploymentId
+		Assert-AreEqual $getById.DeploymentName $deployment.DeploymentName
+	}
+	
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}

src/ResourceManager/Resources/Commands.Resources.Test/keyVaultTemplateParams.json

@@ -107,7 +107,7 @@ private string GetDeploymentParameters(Hashtable templateParameterObject)
         {
             if (templateParameterObject != null)
             {
-                return SerializeHashtable(templateParameterObject, addValueLayer: true);
+                return SerializeHashtable(templateParameterObject, addValueLayer: false);
             }
             else
             {

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs

@@ -39,7 +39,7 @@ public abstract class ResourceWithParameterBaseCmdlet : ResourcesBaseCmdlet
         protected const string ParameterlessTemplateFileParameterSetName = "Deployment via template file without parameters";
         protected const string ParameterlessGalleryTemplateParameterSetName = "Deployment via Gallery without parameters";
         protected const string ParameterlessTemplateUriParameterSetName = "Deployment via template uri without parameters";
-        
+
         protected RuntimeDefinedParameterDictionary dynamicParameters;
 
         private string templateFile;
@@ -144,20 +144,24 @@ public object GetDynamicParameters()
         protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject)
         {
             templateParameterObject = templateParameterObject ?? new Hashtable();
+            foreach (var parameterKey in templateParameterObject.Keys)
+            {
+                templateParameterObject[parameterKey] = new Hashtable { { "value", templateParameterObject[parameterKey] } };
+            }
 
             // Load parameters from the file
             string templateParameterFilePath = this.TryResolvePath(TemplateParameterFile);
             if (templateParameterFilePath != null && FileUtilities.DataStore.FileExists(templateParameterFilePath))
             {
                 var parametersFromFile = GalleryTemplatesClient.ParseTemplateParameterFileContents(templateParameterFilePath);
-                parametersFromFile.ForEach(dp => templateParameterObject[dp.Key] = dp.Value.Value);
+                parametersFromFile.ForEach(dp => templateParameterObject[dp.Key] = new Hashtable { { "value", dp.Value.Value }, { "reference", dp.Value.Reference } });
             }
 
             // Load dynamic parameters
             IEnumerable<RuntimeDefinedParameter> parameters = PowerShellUtilities.GetUsedDynamicParameters(dynamicParameters, MyInvocation);
             if (parameters.Any())
             {
-                parameters.ForEach(dp => templateParameterObject[((ParameterAttribute)dp.Attributes[0]).HelpMessage] = dp.Value);
+                parameters.ForEach(dp => templateParameterObject[((ParameterAttribute)dp.Attributes[0]).HelpMessage] = new Hashtable { { "value", dp.Value } });
             }
 
             return templateParameterObject;

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs

@@ -25,6 +25,9 @@ public class TemplateFileParameterV1
         [JsonProperty("value")]
         public object Value { get; set; }
 
+        [JsonProperty("reference")]
+        public object Reference { get; set; }
+
         [JsonProperty("defaultValue")]
         public object DefaultValue { get; set; }