merged with dev

Author: AjitPadhi-Microsoft

infra/deploy_ai_foundry.bicep

@@ -660,3 +660,4 @@ output aiSearchService string = aiSearch.name
 output aiProjectName string = aiHubProject.name
 
 output applicationInsightsId string = applicationInsights.id
+output storageAccountName string = storageNameCleaned

infra/deploy_app_service.bicep

@@ -156,6 +156,8 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
   properties: {
     serverFarmId: HostingPlanName
     siteConfig: {
+      alwaysOn: true
+      ftpsState: 'Disabled'
       appSettings: [
         {
           name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
@@ -226,6 +228,18 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
       linuxFxVersion: WebAppImageName
     }
   }
+  resource basicPublishingCredentialsPoliciesFtp 'basicPublishingCredentialsPolicies' = {
+    name: 'ftp'
+    properties: {
+      allow: false
+    }
+  }
+  resource basicPublishingCredentialsPoliciesScm 'basicPublishingCredentialsPolicies' = {
+    name: 'scm'
+    properties: {
+      allow: false
+    }
+  }
   dependsOn: [HostingPlan]
 }
 

infra/deploy_azure_function_charts.bicep

@@ -8,8 +8,8 @@ param sqlDbUser string
 param sqlDbPwd string
 // param managedIdentityObjectId string
 param imageTag string
+param storageAccountName string
 var functionAppName = '${solutionName}-charts-fn'
-var storageaccountname = '${solutionName}chartfnacc'
 var dockerImage = 'DOCKER|kmcontainerreg.azurecr.io/km-charts-function:${imageTag}'
 var environmentName = '${solutionName}-charts-fn-env'
 
@@ -18,19 +18,6 @@ var environmentName = '${solutionName}-charts-fn-env'
 // var sqlDbUser = 'sqladmin'
 // var sqlDbPwd = 'TestPassword_1234'
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
-  name: storageaccountname
-  location: resourceGroup().location
-  sku: {
-    name: 'Standard_LRS'
-  }
-  kind: 'StorageV2'
-  properties: {
-    accessTier: 'Hot'
-    allowSharedKeyAccess: false
-  }
-}
-
 resource managedenv 'Microsoft.App/managedEnvironments@2024-03-01' = {
   name: environmentName
   location: solutionLocation
@@ -69,8 +56,8 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
     siteConfig: {
       appSettings: [
         {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount};EndpointSuffix=core.windows.net'
+          name: 'AzureWebJobsStorage__accountname'
+          value: storageAccountName
         }
         {
           name: 'SQLDB_DATABASE'
@@ -104,13 +91,4 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
   }
 }
 
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-  name: guid(subscription().id, resourceGroup().id, azurefn.id, 'StorageBlobDataContributor')
-  scope: storageAccount
-  properties: {
-    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe') // Storage Blob Data Contributor
-    principalId: azurefn.identity.principalId
-  }
-}
-
 

infra/deploy_azure_function_rag.bicep

@@ -20,8 +20,8 @@ param sqlDbUser string
 param sqlDbPwd string
 // param managedIdentityObjectId string
 param imageTag string
+param storageAccountName string
 var functionAppName = '${solutionName}-rag-fn'
-var storageaccountname = '${solutionName}ragfnacc'
 var dockerImage = 'DOCKER|kmcontainerreg.azurecr.io/km-rag-function:${imageTag}'
 var environmentName = '${solutionName}-rag-fn-env'
 
@@ -30,19 +30,6 @@ var environmentName = '${solutionName}-rag-fn-env'
 // var sqlDbUser = 'sqladmin'
 // var sqlDbPwd = 'TestPassword_1234'
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
-  name: storageaccountname
-  location: resourceGroup().location
-  sku: {
-    name: 'Standard_LRS'
-  }
-  kind: 'StorageV2'
-  properties: {
-    accessTier: 'Hot'
-    allowSharedKeyAccess: false
-  }
-}
-
 resource managedenv 'Microsoft.App/managedEnvironments@2024-03-01' = {
   name: environmentName
   location: solutionLocation
@@ -81,8 +68,8 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
     siteConfig: {
       appSettings: [
         {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount};EndpointSuffix=core.windows.net'
+          name: 'AzureWebJobsStorage__accountname'
+          value: storageAccountName
         }
         {
           name: 'PYTHON_ENABLE_INIT_INDEXING'
@@ -155,15 +142,6 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
   }
 }
 
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-  name: guid(subscription().id, resourceGroup().id, azurefn.id, 'StorageBlobDataContributor')
-  scope: storageAccount
-  properties: {
-    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe') // Storage Blob Data Contributor
-    principalId: azurefn.identity.principalId
-  }
-}
-
 resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
   name: aiProjectName
 }

infra/main.bicep

@@ -192,6 +192,7 @@ module azureFunctionsCharts 'deploy_azure_function_charts.bicep' = {
     sqlDbUser: sqlDBModule.outputs.sqlDbUser
     sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
     // managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    storageAccountName:aifoundry.outputs.storageAccountName
   }
   dependsOn:[keyVault]
 }
@@ -217,6 +218,7 @@ module azureragFunctionsRag 'deploy_azure_function_rag.bicep' = {
     sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
     aiProjectName:aifoundry.outputs.aiProjectName
     // managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    storageAccountName:aifoundry.outputs.storageAccountName
   }
   dependsOn:[keyVault]
 }