Skip to content

Commit b370dd3

Browse files
fix: Dev pipeline issue fix (#2204)
1 parent d4c58c8 commit b370dd3

3 files changed

Lines changed: 21 additions & 28 deletions

File tree

infra/main.json

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.42.1.51946",
9-
"templateHash": "16421140691716802279"
9+
"templateHash": "2865368762062690430"
1010
}
1111
},
1212
"parameters": {
@@ -33297,7 +33297,7 @@
3329733297
"_generator": {
3329833298
"name": "bicep",
3329933299
"version": "0.42.1.51946",
33300-
"templateHash": "8683679294545259497"
33300+
"templateHash": "12023450024382758542"
3330133301
}
3330233302
},
3330333303
"parameters": {
@@ -33555,7 +33555,7 @@
3355533555
"_generator": {
3355633556
"name": "bicep",
3355733557
"version": "0.42.1.51946",
33558-
"templateHash": "18244225806211036789"
33558+
"templateHash": "656002339826408723"
3355933559
}
3356033560
},
3356133561
"definitions": {
@@ -34206,9 +34206,11 @@
3420634206
},
3420734207
"managedIdentities": {
3420834208
"$ref": "#/definitions/managedIdentityAllType",
34209-
"nullable": true,
34209+
"defaultValue": {
34210+
"systemAssigned": true
34211+
},
3421034212
"metadata": {
34211-
"description": "Optional. The managed identity definition for this resource."
34213+
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
3421234214
}
3421334215
},
3421434216
"keyVaultAccessIdentityResourceId": {
@@ -35516,7 +35518,7 @@
3551635518
"_generator": {
3551735519
"name": "bicep",
3551835520
"version": "0.42.1.51946",
35519-
"templateHash": "9592410913633598971"
35521+
"templateHash": "10022781742228828033"
3552035522
}
3552135523
},
3552235524
"parameters": {
@@ -35774,7 +35776,7 @@
3577435776
"_generator": {
3577535777
"name": "bicep",
3577635778
"version": "0.42.1.51946",
35777-
"templateHash": "18244225806211036789"
35779+
"templateHash": "656002339826408723"
3577835780
}
3577935781
},
3578035782
"definitions": {
@@ -36425,9 +36427,11 @@
3642536427
},
3642636428
"managedIdentities": {
3642736429
"$ref": "#/definitions/managedIdentityAllType",
36428-
"nullable": true,
36430+
"defaultValue": {
36431+
"systemAssigned": true
36432+
},
3642936433
"metadata": {
36430-
"description": "Optional. The managed identity definition for this resource."
36434+
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
3643136435
}
3643236436
},
3643336437
"keyVaultAccessIdentityResourceId": {
@@ -37739,7 +37743,7 @@
3773937743
"_generator": {
3774037744
"name": "bicep",
3774137745
"version": "0.42.1.51946",
37742-
"templateHash": "8808083120540867501"
37746+
"templateHash": "6476245838086949816"
3774337747
}
3774437748
},
3774537749
"parameters": {
@@ -37980,7 +37984,7 @@
3798037984
"_generator": {
3798137985
"name": "bicep",
3798237986
"version": "0.42.1.51946",
37983-
"templateHash": "7809134250369709392"
37987+
"templateHash": "11099357621474543190"
3798437988
}
3798537989
},
3798637990
"parameters": {
@@ -38346,7 +38350,7 @@
3834638350
"_generator": {
3834738351
"name": "bicep",
3834838352
"version": "0.42.1.51946",
38349-
"templateHash": "18244225806211036789"
38353+
"templateHash": "656002339826408723"
3835038354
}
3835138355
},
3835238356
"definitions": {
@@ -38997,9 +39001,11 @@
3899739001
},
3899839002
"managedIdentities": {
3899939003
"$ref": "#/definitions/managedIdentityAllType",
39000-
"nullable": true,
39004+
"defaultValue": {
39005+
"systemAssigned": true
39006+
},
3900139007
"metadata": {
39002-
"description": "Optional. The managed identity definition for this resource."
39008+
"description": "Optional. The managed identity definition for this resource. Defaults to system-assigned managed identity."
3900339009
}
3900439010
},
3900539011
"keyVaultAccessIdentityResourceId": {

infra/modules/app/eventgrid.bicep

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ module avmEventGridSystemTopic 'br/public:avm/res/event-grid/system-topic:0.6.4'
5454
{
5555
name: name
5656
deliveryWithResourceIdentity: {
57-
identity: {
58-
type: 'UserAssigned'
59-
userAssignedIdentity: userAssignedResourceId
60-
}
6157
destination: {
6258
endpointType: 'StorageQueue'
6359
properties: {

infra/modules/core/host/web-sites.config.bicep

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,7 @@ var appInsightsValues = !empty(applicationInsightResourceId)
5858
}
5959
: {}
6060

61-
// Ensure FTPS enforcement and other security settings for 'web' config
62-
var webConfigSecurityDefaults = name == 'web'
63-
? {
64-
ftpsState: 'FtpsOnly'
65-
minTlsVersion: '1.3'
66-
httpsOnly: true
67-
}
68-
: {}
69-
70-
var expandedProperties = union(currentAppSettings, properties, azureWebJobsValues, appInsightsValues, webConfigSecurityDefaults)
61+
var expandedProperties = union(currentAppSettings, properties, azureWebJobsValues, appInsightsValues)
7162

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

0 commit comments

Comments
 (0)