feat: simplify function creation

OfficeDev · Jul 11, 2024 · 40dbace · 40dbace
1 parent 150dfc0
commit 40dbace
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 300 deletions.
diff --git a/adaptive-card-notification/infra/azure.bicep b/adaptive-card-notification/infra/azure.bicep
@@ -11,15 +11,13 @@ param botAadAppClientId string
 param botAadAppClientSecret string
 
 param functionAppSKU string
-param storageSKU string
 
 @maxLength(42)
 param botDisplayName string
 
 param serverfarmsName string = resourceBaseName
 param functionAppName string = resourceBaseName
 param location string = resourceGroup().location
-param storageName string = resourceBaseName
 
 // Compute resources for your Web App
 resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
@@ -32,15 +30,6 @@ resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
  properties: {}
 }
 
-resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
- name: storageName
- kind: 'StorageV2'
- location: location
- sku: {
- name: storageSKU // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSku property to provisionParameters to override the default value "Standard_LRS".
- }
-}
-
 // Azure Function that host your app
 resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  kind: 'functionapp'
@@ -52,14 +41,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  siteConfig: {
  alwaysOn: true
  appSettings: [
- {
- name: 'AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -68,10 +49,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file

diff --git a/adaptive-card-notification/infra/azure.parameters.json b/adaptive-card-notification/infra/azure.parameters.json
@@ -14,9 +14,6 @@
  "functionAppSKU": {
  "value": "B1"
  },
- "storageSKU": {
- "value": "Standard_LRS"
- },
  "botDisplayName": {
  "value": "adaptive-card-notifi"
  }

diff --git a/developer-assist-dashboard/infra/azure.bicep b/developer-assist-dashboard/infra/azure.bicep
@@ -2,7 +2,6 @@
 @minLength(4)
 param resourceBaseName string
 param storageSku string
-param functionStorageSKU string
 param functionAppSKU string
 
 param aadAppClientId string
@@ -15,7 +14,6 @@ param storageName string = resourceBaseName
 param location string = resourceGroup().location
 param serverfarmsName string = resourceBaseName
 param functionAppName string = resourceBaseName
-param functionStorageName string = '${resourceBaseName}api'
 param teamsAppId string
 
 param devopsOrgName string
@@ -82,14 +80,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  allowedOrigins: [ tabEndpoint ]
  }
  appSettings: [
- {
- name: ' AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -98,10 +88,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file
@@ -199,16 +185,6 @@ resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
  }
 }
 
-// Azure Storage is required when creating Azure Functions instance
-resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
- name: functionStorageName
- kind: 'StorageV2'
- location: location
- sku: {
- name: functionStorageSKU// You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSKUproperty to provisionParameters to override the default value "Standard_LRS".
- }
-}
-
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain

diff --git a/developer-assist-dashboard/infra/azure.parameters.json b/developer-assist-dashboard/infra/azure.parameters.json
@@ -23,9 +23,6 @@
  "functionAppSKU": {
  "value": "B1"
  },
- "functionStorageSKU": {
- "value": "Standard_LRS"
- },
  "teamsAppId": {
  "value": "${{TEAMS_APP_ID}}"
  },

diff --git a/graph-connector-app/infra/azure.bicep b/graph-connector-app/infra/azure.bicep
@@ -1,6 +1,5 @@
 param resourceBaseName string
 param storageSKU string
-param functionStorageSKU string
 param functionAppSKU string
 
 param aadAppClientId string
@@ -13,7 +12,6 @@ param storageName string = resourceBaseName
 param location string = resourceGroup().location
 param serverfarmsName string = resourceBaseName
 param functionAppName string = resourceBaseName
-param functionStorageName string = '${resourceBaseName}api'
 var oauthAuthority = uri(aadAppOauthAuthorityHost, aadAppTenantId)
 
 var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
@@ -66,14 +64,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  allowedOrigins: [ tabEndpoint ]
  }
  appSettings: [
- {
- name: ' AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -82,10 +72,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file
@@ -143,16 +129,6 @@ resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
  }
 }
 
-// Azure Storage is required when creating Azure Functions instance
-resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
- name: functionStorageName
- kind: 'StorageV2'
- location: location
- sku: {
- name: functionStorageSKU
- }
-}
-
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain

diff --git a/graph-connector-app/infra/azure.parameters.json b/graph-connector-app/infra/azure.parameters.json
@@ -22,9 +22,6 @@
  },
  "storageSKU": {
  "value": "Standard_LRS"
- },
- "functionStorageSKU": {
- "value": "Standard_LRS"
  }
  }
 }
diff --git a/hello-world-tab-with-backend/infra/azure.bicep b/hello-world-tab-with-backend/infra/azure.bicep
@@ -1,6 +1,5 @@
 param resourceBaseName string
 param storageSKU string
-param functionStorageSKU string
 param functionAppSKU string
 
 param aadAppClientId string
@@ -13,7 +12,6 @@ param storageName string = resourceBaseName
 param location string = resourceGroup().location
 param serverfarmsName string = resourceBaseName
 param functionAppName string = resourceBaseName
-param functionStorageName string = '${resourceBaseName}api'
 var oauthAuthority = uri(aadAppOauthAuthorityHost, aadAppTenantId)
 
 var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
@@ -67,14 +65,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  allowedOrigins: [ tabEndpoint ]
  }
  appSettings: [
- {
- name: ' AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -83,10 +73,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file
@@ -144,16 +130,6 @@ resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
  }
 }
 
-// Azure Storage is required when creating Azure Functions instance
-resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
- name: functionStorageName
- kind: 'StorageV2'
- location: location
- sku: {
- name: functionStorageSKU// You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSKUproperty to provisionParameters to override the default value "Standard_LRS".
- }
-}
-
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain

diff --git a/hello-world-tab-with-backend/infra/azure.parameters.json b/hello-world-tab-with-backend/infra/azure.parameters.json
@@ -22,9 +22,6 @@
  },
  "storageSKU": {
  "value": "Standard_LRS"
- },
- "functionStorageSKU": {
- "value": "Standard_LRS"
  }
  }
 }
diff --git a/intelligent-data-chart-generator/infra/azure.bicep b/intelligent-data-chart-generator/infra/azure.bicep
@@ -2,7 +2,6 @@
 @minLength(4)
 param resourceBaseName string
 param storageSku string
-param functionStorageSKU string
 param functionAppSKU string
 param aadAppClientId string
 param aadAppTenantId string
@@ -11,7 +10,6 @@ param storageName string = resourceBaseName
 param location string = resourceGroup().location
 param serverfarmsName string = resourceBaseName
 param functionAppName string = resourceBaseName
-param functionStorageName string = '${resourceBaseName}api'
 param teamsAppId string
 param openAIChatCompletionUrl string
 param sqlUser string
@@ -82,14 +80,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  allowedOrigins: [ tabEndpoint ]
  }
  appSettings: [
- {
- name: ' AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${functionStorage.name};AccountKey=${listKeys(functionStorage.id, functionStorage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -98,10 +88,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file
@@ -169,11 +155,11 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  {
  name: 'SQL_SERVER'
  value: sqlServer
- } 
+ }
  {
  name: 'SQL_DATABASE'
  value: sqlDatabase
- } 
+ }
  ]
  ftpsState: 'FtpsOnly'
  }
@@ -195,16 +181,6 @@ resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
  }
 }
 
-// Azure Storage is required when creating Azure Functions instance
-resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
- name: functionStorageName
- kind: 'StorageV2'
- location: location
- sku: {
- name: functionStorageSKU // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSKUproperty to provisionParameters to override the default value "Standard_LRS".
- }
-}
-
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain

diff --git a/intelligent-data-chart-generator/infra/azure.parameters.json b/intelligent-data-chart-generator/infra/azure.parameters.json
@@ -23,9 +23,6 @@
  "functionAppSKU": {
  "value": "B1"
  },
- "functionStorageSKU": {
- "value": "Standard_LRS"
- },
  "teamsAppId": {
  "value": "${{TEAMS_APP_ID}}"
  },

diff --git a/large-scale-notification/infra/azure.bicep b/large-scale-notification/infra/azure.bicep
@@ -102,14 +102,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  siteConfig: {
  alwaysOn: false
  appSettings: [
- {
- name: 'AzureWebJobsDashboard'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'FUNCTIONS_EXTENSION_VERSION'
  value: '~4' // Use Azure Functions runtime v4
@@ -118,10 +110,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
  name: 'FUNCTIONS_WORKER_RUNTIME'
  value: 'node' // Set runtime to NodeJS
  }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
- }
  {
  name: 'WEBSITE_RUN_FROM_PACKAGE'
  value: '1' // Run Azure Functions from a package file