Merge pull request #55 from Roopan-Microsoft/revert-53-PSL-US-8618

Revert "feat: Conversion of function app deployment using .sh file to bicep"

Author: Roopan-Microsoft

ClientAdvisor/Deployment/bicep/deploy_azure_function.bicep

@@ -0,0 +1,42 @@
+@description('Specifies the location for resources.')
+param solutionName string 
+param solutionLocation string
+param resourceGroupName string
+param identity string
+param baseUrl string
+@secure()
+param azureOpenAIApiKey string
+param azureOpenAIApiVersion string
+param azureOpenAIEndpoint string
+@secure()
+param azureSearchAdminKey string
+param azureSearchServiceEndpoint string
+param azureSearchIndex string
+param sqlServerName string
+param sqlDbName string
+param sqlDbUser string
+@secure()
+param sqlDbPwd string
+param functionAppVersion string
+
+resource deploy_azure_function 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+  kind:'AzureCLI'
+  name: 'deploy_azure_function'
+  location: solutionLocation // Replace with your desired location
+  identity:{
+    type:'UserAssigned'
+    userAssignedIdentities: {
+      '${identity}' : {}
+    }
+  }
+  properties: {
+    azCliVersion: '2.50.0'
+    primaryScriptUri: '${baseUrl}Deployment/scripts/create_azure_functions.sh' // deploy-azure-synapse-pipelines.sh
+    arguments: '${solutionName} ${solutionLocation} ${resourceGroupName} ${baseUrl} ${azureOpenAIApiKey} ${azureOpenAIApiVersion} ${azureOpenAIEndpoint} ${azureSearchAdminKey} ${azureSearchServiceEndpoint} ${azureSearchIndex} ${sqlServerName} ${sqlDbName} ${sqlDbUser} ${sqlDbPwd} ${functionAppVersion}' // Specify any arguments for the script
+    timeout: 'PT1H' // Specify the desired timeout duration
+    retentionInterval: 'PT1H' // Specify the desired retention interval
+    cleanupPreference:'OnSuccess'
+  }
+}
+
+

ClientAdvisor/Deployment/bicep/deploy_azure_function_script.bicep

@@ -13,7 +13,7 @@ param cosmosLocation string
 // param fabricWorkspaceId string
 
 var resourceGroupLocation = resourceGroup().location
-// var resourceGroupName = resourceGroup().name
+var resourceGroupName = resourceGroup().name
 // var subscriptionId  = subscription().subscriptionId
 
 var solutionLocation = resourceGroupLocation
@@ -101,11 +101,12 @@ module uploadFiles 'deploy_upload_files_script.bicep' = {
   dependsOn:[storageAccountModule]
 }
 
-module azureFunctions 'deploy_azure_function.bicep' = {
-  name : 'deploy_azure_function'
+module azureFunctions 'deploy_azure_function_script.bicep' = {
+  name : 'deploy_azure_function_script'
   params:{
     solutionName: solutionPrefix
     solutionLocation: solutionLocation
+    resourceGroupName:resourceGroupName
     azureOpenAIApiKey:azOpenAI.outputs.openAIOutput.openAPIKey
     azureOpenAIApiVersion:'2024-02-15-preview'
     azureOpenAIEndpoint:azOpenAI.outputs.openAIOutput.openAPIEndpoint
@@ -116,6 +117,8 @@ module azureFunctions 'deploy_azure_function.bicep' = {
     sqlDbName:sqlDBModule.outputs.sqlDbOutput.sqlDbName
     sqlDbUser:sqlDBModule.outputs.sqlDbOutput.sqlDbUser
     sqlDbPwd:sqlDBModule.outputs.sqlDbOutput.sqlDbPwd
+    identity:managedIdentityModule.outputs.managedIdentityOutput.id
+    baseUrl:baseUrl
     functionAppVersion: appversion
   }
   dependsOn:[storageAccountModule]