From 66ad8b311a5504bace46421389ee323fff1f06ce Mon Sep 17 00:00:00 2001
From: Pieter <pieter.vanhove@microsoft.com>
Date: Wed, 9 Jun 2021 16:19:51 +0200
Subject: [PATCH] Changed webapp deployment and setup

---
 .../contoso-hr-sql-db/setup/azuredeploy.bicep | 29 +------------------
 .../contoso-hr-sql-db/setup/setup.ps1         | 25 ++++++++++------
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/samples/features/security/contoso-hr-sql-db/setup/azuredeploy.bicep b/samples/features/security/contoso-hr-sql-db/setup/azuredeploy.bicep
index c436c9ce..13ffcb28 100644
--- a/samples/features/security/contoso-hr-sql-db/setup/azuredeploy.bicep
+++ b/samples/features/security/contoso-hr-sql-db/setup/azuredeploy.bicep
@@ -117,7 +117,7 @@ resource AssignAttestationReader_Resource 'Microsoft.Authorization/roleAssignmen
 // Configure the web application //
 ///////////////////////////////////
 
-// Create an App Service plan in Free tier
+// Create an App Service plan 
 resource WebAppServicePlan_Resource 'Microsoft.Web/serverfarms@2020-12-01' = {
   name: '${projectName}plan'
  location: location
@@ -158,33 +158,6 @@ resource WebApp_Resource 'Microsoft.Web/sites@2020-12-01' = {
   } 
 }
 
-// Set the database connection string for the application
-// resource WebAppConnectionString_Resource 'Microsoft.Web/sites/config@2020-09-01' = {
-//   name: '${WebApp_Resource.name}/connectionstrings'
-//   properties: {
-//     ContosoHRDatabase: {
-//       value: 'Server=tcp:${Server_Name_resource.name}.database.windows.net;Database=ContosoHR;Column Encryption Setting=Enabled; Attestation Protocol = AAS; Enclave Attestation Url=${attestationProviderName_resource.properties.attestUri}/attest/SgxEnclave; Authentication=Active Directory Managed Identity'
-//       type: 'SQLAzure'
-//     }
-//   } 
-//   dependsOn: [
-//     WebApp_Resource
-//   ]
-// }
-
-// // Deploy the application
-// resource siteName_web 'Microsoft.Web/sites/sourcecontrols@2015-04-01' = {
-//   name: '${WebApp_Resource.name}/web'
-//   properties: {
-//     RepoUrl: 'https://github.com/Pietervanhove/AEDemo.git'
-//     branch: 'master'
-//     IsManualIntegration: true
-//   }
-//   dependsOn: [
-//     WebApp_Resource
-//   ]
-// }
-
 
 //////////////////////////////////////
 // Create and configure a key vault //
diff --git a/samples/features/security/contoso-hr-sql-db/setup/setup.ps1 b/samples/features/security/contoso-hr-sql-db/setup/setup.ps1
index a846c205..22037985 100644
--- a/samples/features/security/contoso-hr-sql-db/setup/setup.ps1
+++ b/samples/features/security/contoso-hr-sql-db/setup/setup.ps1
@@ -35,16 +35,23 @@ New-AzResourceGroup -Name $resourceGroupName -Location $location
 ######################################################################
 # Deploy the resources for the demo environment
 ######################################################################
+az deployment group create --name DeployAEWithEnclavesDemo --template-file $bicepFile --resource-group $resourceGroupName --parameters `
+projectName=$projectName `
+userObjectId=$userObjectId `
+userName=$userName `
+sqlAdminUserName=$sqlAdminUserName `
+sqlAdminPassword=$sqlAdminPassword `
+clientIP=$clientIP
 
-New-AzResourceGroupDeployment `
-  -ResourceGroupName $resourceGroupName `
-  -TemplateFile $bicepFile `
-  -projectName $projectName `
-  -userObjectId $userObjectId `
-  -userName $userName `
-  -sqlAdminUserName $sqlAdminUserName `
-  -sqlAdminPassword $sqlAdminPassword `
-  -clientIP $clientIP
+#New-AzResourceGroupDeployment `
+#  -ResourceGroupName $resourceGroupName `
+#  -TemplateFile $bicepFile `
+#  -projectName $projectName `
+#  -userObjectId $userObjectId `
+#  -userName $userName `
+#  -sqlAdminUserName $sqlAdminUserName `
+#  -sqlAdminPassword $sqlAdminPassword `
+#  -clientIP $clientIP
 
 ######################################################################
 # Populate the database with data