Merge pull request #287 from microsoft/biceptemplate

fix: update deployment

Author: malrose07

infra/deploy_keyvault.bicep

@@ -35,7 +35,6 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
     enabledForDeployment: true
     enabledForDiskEncryption: true
     enabledForTemplateDeployment: true
-    enableSoftDelete: false
     enableRbacAuthorization: true
     enablePurgeProtection: true
     publicNetworkAccess: 'enabled'

infra/main.bicep

@@ -428,48 +428,48 @@ module cosmosDBModule 'deploy_cosmos_db.bicep' = {
 }
 
 
+// //========== Deployment script to upload sample data ========== //
+// module uploadFiles 'deploy_upload_files_script.bicep' = {
+//   name : 'deploy_upload_files_script'
+//   params:{
+//     solutionLocation: secondaryLocation
+//     baseUrl: baseUrl
+//     storageAccountName: storageAccount.outputs.storageName
+//     containerName: storageAccount.outputs.storageContainer
+//     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.id
+//   }
+
+//   // dependsOn:[storageAccount,keyVault]
+// }
+
+// //========== Deployment script to process and index data ========== //
+// module createIndex 'deploy_index_scripts.bicep' = {
+//   name : 'deploy_index_scripts'
+//   params:{
+//     solutionLocation: secondaryLocation
+//     identity:managedIdentityModule.outputs.managedIdentityOutput.id
+//     baseUrl:baseUrl
+//     keyVaultName:aifoundry.outputs.keyvaultName
+//   }
+//   dependsOn:[keyVault,uploadFiles]
+// }
+
 //========== Deployment script to upload sample data ========== //
-module uploadFiles 'deploy_upload_files_script.bicep' = {
-  name : 'deploy_upload_files_script'
+module uploadFiles 'deploy_post_deployment_scripts.bicep' = {
+  name : 'deploy_post_deployment_scripts'
   params:{
+    solutionName: solutionPrefix
     solutionLocation: secondaryLocation
     baseUrl: baseUrl
     storageAccountName: storageAccount.outputs.storageName
     containerName: storageAccount.outputs.storageContainer
     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.id
-  }
-
-  // dependsOn:[storageAccount,keyVault]
-}
-
-//========== Deployment script to process and index data ========== //
-module createIndex 'deploy_index_scripts.bicep' = {
-  name : 'deploy_index_scripts'
-  params:{
-    solutionLocation: secondaryLocation
-    identity:managedIdentityModule.outputs.managedIdentityOutput.id
-    baseUrl:baseUrl
+    managedIdentityClientId:managedIdentityModule.outputs.managedIdentityOutput.clientId
     keyVaultName:aifoundry.outputs.keyvaultName
+    logAnalyticsWorkspaceResourceName: aifoundry.outputs.logAnalyticsWorkspaceResourceName
   }
-  dependsOn:[keyVault,uploadFiles]
 }
 
-//========== Deployment script to upload sample data ========== //
-// module uploadFiles 'deploy_post_deployment_scripts.bicep' = {
-//   name : 'deploy_post_deployment_scripts'
-//   params:{
-//     solutionName: solutionPrefix
-//     solutionLocation: secondaryLocation
-//     baseUrl: baseUrl
-//     storageAccountName: storageAccount.outputs.storageName
-//     containerName: storageAccount.outputs.storageContainer
-//     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.id
-//     managedIdentityClientId:managedIdentityModule.outputs.managedIdentityOutput.clientId
-//     keyVaultName:aifoundry.outputs.keyvaultName
-//     logAnalyticsWorkspaceResourceName: aifoundry.outputs.logAnalyticsWorkspaceResourceName
-//   }
-// }
-
 
 // resource CosmosDB 'Microsoft.DocumentDB/databaseAccounts@2023-04-15' = {
 //   name: CosmosDBName