npm - @microsoft/teamsfx-core - Versions diffs - 1.2.2-alpha.eb4575da.0 → 1.3.0 - Mend

@@ -0,0 +1,34 @@
+@secure()
+param provisionParameters object
+param botEndpoint string
+var resourceBaseName = provisionParameters.resourceBaseName
+var botAadAppClientId = provisionParameters['botAadAppClientId'] // Read AAD app client id for Azure Bot Service from parameters
+var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}' // Try to read name for Azure Bot Service from parameters
+var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
+var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
+// Register your web service as a bot with the Bot Framework
+resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
+  kind: 'azurebot'
+  location: 'global'
+  name: botServiceName
+  properties: {
+    displayName: botDisplayName
+    endpoint: uri(botEndpoint, '/api/messages')
+    msaAppId: botAadAppClientId
+  }
+  sku: {
+    name: botServiceSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add botServiceSku property to provisionParameters to override the default value "F0".
+  }
+}
+// Connect the bot service to Microsoft Teams
+resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
+  parent: botService
+  location: 'global'
+  name: 'MsTeamsChannel'
+  properties: {
+    channelName: 'MsTeamsChannel'
+  }
+}

@@ -0,0 +1,4 @@
+{
+  "botAadAppClientId": "{{state.fx-resource-bot.botId}}",
+  "botAadAppClientSecret": "{{state.fx-resource-bot.botPassword}}"
+}

@@ -0,0 +1,13 @@
+// Resources for bot
+module botProvision '\{{fx-resource-bot.Provision.botservice.path}}' = {
+  name: 'botProvision'
+  params: {
+    provisionParameters: provisionParameters
+    botEndpoint: \{{fx-resource-frontend-hosting.References.endpointAsParam}}
+  }
+}
+output botOutput object = {
+  teamsFxPluginId: 'fx-resource-bot'
+  validDomain: \{{fx-resource-frontend-hosting.References.domainAsParam}}
+}

@@ -0,0 +1,5 @@
+// output for database with name suffix [{{suffix}}]
+output azureSqlOutput_{{suffix}} object = {
+  teamsFxPluginId: 'fx-resource-azure-sql'
+  databaseName_{{suffix}}: azureSqlProvision.outputs.databaseName_{{suffix}}
+}

@@ -0,0 +1,15 @@
+// database added with name suffix [{{suffix}}]
+var sqlDatabaseName_{{suffix}} = contains(provisionParameters, 'sqlDatabaseName_{{suffix}}') ? provisionParameters['sqlDatabaseName_{{suffix}}'] : '${resourceBaseName}_{{suffix}}'
+var sqlDatabaseSku_{{suffix}} = contains(provisionParameters, 'sqlDatabaseSku_{{suffix}}') ? provisionParameters['sqlDatabaseSku_{{suffix}}'] : 'Basic'
+resource sqlDatabase_{{suffix}} 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
+  // parent should refer to resource symbolic name of SQL server
+  parent: sqlServer
+  location: resourceGroup().location
+  name: sqlDatabaseName_{{suffix}}
+  sku: {
+    name: sqlDatabaseSku_{{suffix}}
+  }
+}
+output databaseName_{{suffix}} string = sqlDatabaseName_{{suffix}}

@@ -8,6 +8,7 @@ var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provis
 var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : '' // Try to read admin password for SQL Server from parameters, empty means do not update admin password
 // SQL Server that hosts the databases
+// The symbolic name of SQL Server will be referenced as parent when adding nmultiple databases
 resource sqlServer 'Microsoft.Sql/servers@2021-05-01-preview' = {
   location: resourceGroup().location
   name: sqlServerName

@@ -0,0 +1,25 @@
+@secure()
+param provisionParameters object
+var resourceBaseName = provisionParameters.resourceBaseName
+var storageName = contains(provisionParameters, 'azureStorageName') ? provisionParameters['azureStorageName'] : '${resourceBaseName}tab' // Try to read name for frontend hosting Storage Account from parameters
+var storageSku = contains(provisionParameters, 'azureStorageSku') ? provisionParameters['azureStorageSku'] : 'Standard_LRS' // Try to read SKU for frontend hosting Storage Account from parameters
+// Azure Storage that hosts your static web site
+resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
+  kind: 'StorageV2'
+  location: resourceGroup().location
+  name: storageName
+  properties: {
+    supportsHttpsTrafficOnly: true
+  }
+  sku: {
+    name: storageSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add frontendHostingStorageSku property to provisionParameters to override the default value "Standard_LRS".
+  }
+}
+var siteDomain = replace(replace(storage.properties.primaryEndpoints.web, 'https://', ''), '/', '')
+output resourceId string = storage.id
+output endpoint string = 'https://${siteDomain}'
+output domain string = siteDomain
+output indexPath string = '/index.html#'

@@ -0,0 +1,15 @@
+// Resources for frontend hosting
+module azureStorageProvision '\{{fx-resource-azure-storage.Provision.azureStorage.path}}' = {
+  name: 'azureStorageProvision'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+output azureStorageOutput object = {
+  teamsFxPluginId: 'fx-resource-frontend-hosting'
+  domain: azureStorageProvision.outputs.domain
+  endpoint: azureStorageProvision.outputs.endpoint
+  indexPath: azureStorageProvision.outputs.indexPath
+  storageResourceId: azureStorageProvision.outputs.resourceId
+}

@microsoft/teamsfx-core 1.2.2-alpha.eb4575da.0 → 1.3.0