updated the bicep

Author: Harmanpreet Kaur

infra/deploy_app_service.bicep

@@ -10,10 +10,10 @@ param solutionName string
 // param solutionLocation string
 
 // param identity string
-var abbrs = loadJsonContent('./abbreviations.json')
+
 
 @description('Name of App Service plan')
-var HostingPlanName  = '${abbrs.compute.appServicePlan}${solutionName}'
+param HostingPlanName string 
 
 @description('The pricing tier for the App Service plan')
 @allowed(
@@ -24,7 +24,7 @@ var HostingPlanName  = '${abbrs.compute.appServicePlan}${solutionName}'
 param HostingPlanSku string = 'B1'
 
 @description('Name of Web App')
-var WebsiteName = '${abbrs.compute.webApp}${solutionName}'
+param WebsiteName string
 
 // @description('Name of Application Insights')
 // param ApplicationInsightsName string = '${ solutionName }-app-insights'

infra/deploy_cosmos_db.bicep

@@ -5,8 +5,8 @@ param solutionName string
 param solutionLocation string
 param keyVaultName string
 var abbrs = loadJsonContent('./abbreviations.json')
+param accountName string 
 
-var accountName = '${abbrs.databases.cosmosDBDatabase}${solutionName}'
 var databaseName = 'db_conversation_history'
 var collectionName = 'conversations'
 

infra/deploy_keyvault.bicep

@@ -6,7 +6,7 @@ param solutionLocation string
 param managedIdentityObjectId string
 var abbrs = loadJsonContent('./abbreviations.json')
 
-var keyvaultName = '${abbrs.security.keyVault}${solutionName}'
+param keyvaultName string
 
 resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
   name: keyvaultName

infra/deploy_managed_identity.bicep

@@ -11,7 +11,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-var miName  = '${abbrs.security.managedIdentity}${solutionName}'
+param miName  string
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: miName

infra/deploy_storage_account.bicep

@@ -1,6 +1,6 @@
 // ========== Storage Account ========== //
 targetScope = 'resourceGroup'
-var abbrs = loadJsonContent('./abbreviations.json')
+
 @minLength(3)
 @maxLength(15)
 @description('Solution Name')
@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-var saName  = '${abbrs.storage.storageAccount}${ solutionName }'
+param saName string
 
 param keyVaultName string
 param managedIdentityObjectId string

infra/main.bicep

@@ -71,6 +71,7 @@ module managedIdentityModule 'deploy_managed_identity.bicep' = {
   params: {
     solutionName: solutionPrefix
     solutionLocation: solutionLocation
+    miName: '${abbrs.security.managedIdentity}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -82,6 +83,7 @@ module kvault 'deploy_keyvault.bicep' = {
     solutionName: solutionPrefix
     solutionLocation: resourceGroupLocation
     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    keyvaultName:'${abbrs.security.keyVault}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -112,6 +114,7 @@ module storageAccount 'deploy_storage_account.bicep' = {
     solutionLocation: solutionLocation
     keyVaultName: kvault.outputs.keyvaultName
     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    saName:'${abbrs.storage.storageAccount}${ solutionPrefix}' 
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -383,6 +386,8 @@ module appserviceModule 'deploy_app_service.bicep' = {
     AZURE_COSMOSDB_CONVERSATIONS_CONTAINER: cosmosDBModule.outputs.cosmosContainerName
     AZURE_COSMOSDB_DATABASE: cosmosDBModule.outputs.cosmosDatabaseName
     AZURE_COSMOSDB_ENABLE_FEEDBACK:'True'
+    HostingPlanName:'${abbrs.compute.appServicePlan}${solutionPrefix}'
+    WebsiteName:'${abbrs.compute.webApp}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
   // dependsOn:[sqlDBModule]
@@ -421,6 +426,7 @@ module cosmosDBModule 'deploy_cosmos_db.bicep' = {
     solutionName: solutionPrefix
     solutionLocation: secondaryLocation
     keyVaultName: kvault.outputs.keyvaultName
+    accountName: '${abbrs.databases.cosmosDBDatabase}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
 }