Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions extensions/teams/infra/azure.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ resource webApp 'Microsoft.Web/sites@2024-04-01' = {
kind: 'app'
location: location
name: webAppName
identity: {
type: 'SystemAssigned'
}
properties: {
serverFarmId: serverfarm.id
httpsOnly: true
Expand Down
16 changes: 11 additions & 5 deletions infra/modules/app/eventgrid.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ module avmEventGridSystemTopic 'br/public:avm/res/event-grid/system-topic:0.6.4'
eventSubscriptions: [
{
name: name
destination: {
endpointType: 'StorageQueue'
properties: {
queueName: queueName
resourceId: storageAccountId
deliveryWithResourceIdentity: {
identity: {
type: 'UserAssigned'
userAssignedIdentity: userAssignedResourceId
}
destination: {
endpointType: 'StorageQueue'
properties: {
queueName: queueName
resourceId: storageAccountId
}
}
}
eventDeliverySchema: 'EventGridSchema'
Expand Down
6 changes: 4 additions & 2 deletions infra/modules/core/host/appservice.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ param clientAffinityEnabled bool = true
param appServiceEnvironmentResourceId string?

import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types:0.7.0'
@description('Optional. The managed identity definition for this resource.')
param managedIdentities managedIdentityAllType?
@description('Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity.')
param managedIdentities managedIdentityAllType = {
systemAssigned: true
}

@description('Optional. The resource ID of the assigned identity to be used to access a key vault with.')
param keyVaultAccessIdentityResourceId string?
Expand Down
11 changes: 10 additions & 1 deletion infra/modules/core/host/web-sites.config.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,16 @@ var appInsightsValues = !empty(applicationInsightResourceId)
}
: {}

var expandedProperties = union(currentAppSettings, properties, azureWebJobsValues, appInsightsValues)
// Ensure FTPS enforcement and other security settings for 'web' config
var webConfigSecurityDefaults = name == 'web'
? {
ftpsState: 'FtpsOnly'
minTlsVersion: '1.3'
httpsOnly: true
}
: {}

var expandedProperties = union(currentAppSettings, properties, azureWebJobsValues, appInsightsValues, webConfigSecurityDefaults)

resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing = if (!empty(applicationInsightResourceId)) {
name: last(split(applicationInsightResourceId!, '/'))
Expand Down
Loading