Skip to content

Commit 7f770ae

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #628 from microsoft/Ash17-Bicep17-Changes17
fix: Deployment Failure and pipeline failure for CPAsh
2 parents 1963df3 + 6fdac2e commit 7f770ae

3 files changed

Lines changed: 41 additions & 28 deletions

File tree

‎infra/main.bicep‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ param solutionName string = 'cps'
2020
'japaneast'
2121
'northeurope'
2222
'southeastasia'
23+
'swedencentral'
2324
'uksouth'
2425
])
2526
param location string
@@ -170,6 +171,7 @@ var replicaRegionPairs = {
170171
japaneast: 'eastasia'
171172
northeurope: 'westeurope'
172173
southeastasia: 'eastasia'
174+
swedencentral: 'northeurope'
173175
uksouth: 'westeurope'
174176
westeurope: 'northeurope'
175177
}
@@ -786,6 +788,11 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
786788

787789
module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (enablePrivateNetworking && empty(existingProjectResourceId)) {
788790
name: take('avm.res.network.private-endpoint.${solutionSuffix}', 64)
791+
dependsOn: [
792+
avmAiServices
793+
virtualNetwork
794+
avmPrivateDnsZones
795+
]
789796
params: {
790797
name: 'pep-aiservices-${solutionSuffix}'
791798
location: location

‎infra/main.json‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.43.8.12551",
9-
"templateHash": "12545195410241248179"
8+
"version": "0.44.1.10279",
9+
"templateHash": "3841741921827855283"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -31,6 +31,7 @@
3131
"japaneast",
3232
"northeurope",
3333
"southeastasia",
34+
"swedencentral",
3435
"uksouth"
3536
],
3637
"metadata": {
@@ -236,6 +237,7 @@
236237
"japaneast": "eastasia",
237238
"northeurope": "westeurope",
238239
"southeastasia": "eastasia",
240+
"swedencentral": "northeurope",
239241
"uksouth": "westeurope",
240242
"westeurope": "northeurope"
241243
},
@@ -337,8 +339,8 @@
337339
"metadata": {
338340
"_generator": {
339341
"name": "bicep",
340-
"version": "0.43.8.12551",
341-
"templateHash": "13206959925771644022"
342+
"version": "0.44.1.10279",
343+
"templateHash": "4148028483891244972"
342344
}
343345
},
344346
"definitions": {
@@ -19306,8 +19308,8 @@
1930619308
"metadata": {
1930719309
"_generator": {
1930819310
"name": "bicep",
19309-
"version": "0.43.8.12551",
19310-
"templateHash": "13200482898648544945"
19311+
"version": "0.44.1.10279",
19312+
"templateHash": "14763088429533772999"
1931119313
}
1931219314
},
1931319315
"parameters": {
@@ -23332,8 +23334,8 @@
2333223334
"metadata": {
2333323335
"_generator": {
2333423336
"name": "bicep",
23335-
"version": "0.43.8.12551",
23336-
"templateHash": "15729887991536611208"
23337+
"version": "0.44.1.10279",
23338+
"templateHash": "14944034125601240095"
2333723339
}
2333823340
},
2333923341
"parameters": {
@@ -23936,8 +23938,8 @@
2393623938
"metadata": {
2393723939
"_generator": {
2393823940
"name": "bicep",
23939-
"version": "0.43.8.12551",
23940-
"templateHash": "8672669912945312056"
23941+
"version": "0.44.1.10279",
23942+
"templateHash": "3008626070117491750"
2394123943
},
2394223944
"name": "Container Registry Module"
2394323945
},
@@ -36314,8 +36316,8 @@
3631436316
"metadata": {
3631536317
"_generator": {
3631636318
"name": "bicep",
36317-
"version": "0.43.8.12551",
36318-
"templateHash": "9621562991003135575"
36319+
"version": "0.44.1.10279",
36320+
"templateHash": "9717412251971567270"
3631936321
},
3632036322
"name": "Cognitive Services",
3632136323
"description": "This module deploys a Cognitive Service."
@@ -37574,8 +37576,8 @@
3757437576
"metadata": {
3757537577
"_generator": {
3757637578
"name": "bicep",
37577-
"version": "0.43.8.12551",
37578-
"templateHash": "8864856500234357706"
37579+
"version": "0.44.1.10279",
37580+
"templateHash": "7181684108515692296"
3757937581
}
3758037582
},
3758137583
"definitions": {
@@ -39307,8 +39309,8 @@
3930739309
"metadata": {
3930839310
"_generator": {
3930939311
"name": "bicep",
39310-
"version": "0.43.8.12551",
39311-
"templateHash": "312284397710022090"
39312+
"version": "0.44.1.10279",
39313+
"templateHash": "4868310155755856428"
3931239314
}
3931339315
},
3931439316
"definitions": {
@@ -39461,8 +39463,8 @@
3946139463
"metadata": {
3946239464
"_generator": {
3946339465
"name": "bicep",
39464-
"version": "0.43.8.12551",
39465-
"templateHash": "276675105610077046"
39466+
"version": "0.44.1.10279",
39467+
"templateHash": "4168378797065634217"
3946639468
}
3946739469
},
3946839470
"definitions": {
@@ -39679,8 +39681,8 @@
3967939681
"metadata": {
3968039682
"_generator": {
3968139683
"name": "bicep",
39682-
"version": "0.43.8.12551",
39683-
"templateHash": "8864856500234357706"
39684+
"version": "0.44.1.10279",
39685+
"templateHash": "7181684108515692296"
3968439686
}
3968539687
},
3968639688
"definitions": {
@@ -41412,8 +41414,8 @@
4141241414
"metadata": {
4141341415
"_generator": {
4141441416
"name": "bicep",
41415-
"version": "0.43.8.12551",
41416-
"templateHash": "312284397710022090"
41417+
"version": "0.44.1.10279",
41418+
"templateHash": "4868310155755856428"
4141741419
}
4141841420
},
4141941421
"definitions": {
@@ -41566,8 +41568,8 @@
4156641568
"metadata": {
4156741569
"_generator": {
4156841570
"name": "bicep",
41569-
"version": "0.43.8.12551",
41570-
"templateHash": "276675105610077046"
41571+
"version": "0.44.1.10279",
41572+
"templateHash": "4168378797065634217"
4157141573
}
4157241574
},
4157341575
"definitions": {
@@ -42487,10 +42489,7 @@
4248742489
},
4248842490
"dependsOn": [
4248942491
"avmAiServices",
42490-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
42491-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
42492-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
42493-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
42492+
"avmPrivateDnsZones",
4249442493
"virtualNetwork"
4249542494
]
4249642495
},

‎infra/main_custom.bicep‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ param solutionName string = 'cps'
2323
'japaneast'
2424
'northeurope'
2525
'southeastasia'
26+
'swedencentral'
2627
'uksouth'
2728
])
2829
param location string
@@ -173,6 +174,7 @@ var replicaRegionPairs = {
173174
japaneast: 'eastasia'
174175
northeurope: 'westeurope'
175176
southeastasia: 'eastasia'
177+
swedencentral: 'northeurope'
176178
uksouth: 'westeurope'
177179
westeurope: 'northeurope'
178180
}
@@ -789,6 +791,11 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
789791

790792
module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (enablePrivateNetworking && empty(existingProjectResourceId)) {
791793
name: take('avm.res.network.private-endpoint.${solutionSuffix}', 64)
794+
dependsOn: [
795+
avmAiServices
796+
virtualNetwork
797+
avmPrivateDnsZones
798+
]
792799
params: {
793800
name: 'pep-aiservices-${solutionSuffix}'
794801
location: location

0 commit comments

Comments
 (0)