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
34 changes: 20 additions & 14 deletions infra/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "16421140691716802279"
"templateHash": "2865368762062690430"
}
},
"parameters": {
Expand Down Expand Up @@ -33297,7 +33297,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "8683679294545259497"
"templateHash": "12023450024382758542"
}
},
"parameters": {
Expand Down Expand Up @@ -33555,7 +33555,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "18244225806211036789"
"templateHash": "656002339826408723"
}
},
"definitions": {
Expand Down Expand Up @@ -34206,9 +34206,11 @@
},
"managedIdentities": {
"$ref": "#/definitions/managedIdentityAllType",
"nullable": true,
"defaultValue": {
"systemAssigned": true
},
"metadata": {
"description": "Optional. The managed identity definition for this resource."
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
}
},
"keyVaultAccessIdentityResourceId": {
Expand Down Expand Up @@ -35516,7 +35518,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "9592410913633598971"
"templateHash": "10022781742228828033"
}
},
"parameters": {
Expand Down Expand Up @@ -35774,7 +35776,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "18244225806211036789"
"templateHash": "656002339826408723"
}
},
"definitions": {
Expand Down Expand Up @@ -36425,9 +36427,11 @@
},
"managedIdentities": {
"$ref": "#/definitions/managedIdentityAllType",
"nullable": true,
"defaultValue": {
"systemAssigned": true
},
"metadata": {
"description": "Optional. The managed identity definition for this resource."
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
}
},
"keyVaultAccessIdentityResourceId": {
Expand Down Expand Up @@ -37739,7 +37743,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "8808083120540867501"
"templateHash": "6476245838086949816"
}
},
"parameters": {
Expand Down Expand Up @@ -37980,7 +37984,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "7809134250369709392"
"templateHash": "11099357621474543190"
}
},
"parameters": {
Expand Down Expand Up @@ -38346,7 +38350,7 @@
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "18244225806211036789"
"templateHash": "656002339826408723"
}
},
"definitions": {
Expand Down Expand Up @@ -38997,9 +39001,11 @@
},
"managedIdentities": {
"$ref": "#/definitions/managedIdentityAllType",
"nullable": true,
"defaultValue": {
"systemAssigned": true
},
"metadata": {
"description": "Optional. The managed identity definition for this resource."
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
}
},
"keyVaultAccessIdentityResourceId": {
Expand Down
4 changes: 0 additions & 4 deletions infra/modules/app/eventgrid.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ module avmEventGridSystemTopic 'br/public:avm/res/event-grid/system-topic:0.6.4'
{
name: name
deliveryWithResourceIdentity: {
identity: {
type: 'UserAssigned'
userAssignedIdentity: userAssignedResourceId
}
destination: {
endpointType: 'StorageQueue'
properties: {
Expand Down
11 changes: 1 addition & 10 deletions infra/modules/core/host/web-sites.config.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,7 @@ var appInsightsValues = !empty(applicationInsightResourceId)
}
: {}

// 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)
var expandedProperties = union(currentAppSettings, properties, azureWebJobsValues, appInsightsValues)

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