Azure
/
missionlz
зеркало из https://github.com/Azure/missionlz.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

AVD Add-On: Fixed resource ID in VNET peering (#1027) 

* Fixed resource ID in VNET peering

* GitHub Action: Build Bicep to JSON

---------

Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Jason Masten 2024-05-15 10:57:30 -04:00 коммит произвёл GitHub
Родитель 1c954ac38a
Коммит 78c925cf38
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 151 добавлений и 124 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/bicep/add-ons/azureVirtualDesktop/modules/network/networking.bicep
Просмотреть файл

@ -104,6 +104,7 @@ module virtualNetworkPeeringToHub 'virtualNetworkPeering.bicep' = {
existingLocalVirtualNetworkName: spokeVirtualNetwork.outputs.virtualNetworkName
existingRemoteVirtualNetworkName: hubVirtualNetwork.name
existingRemoteVirtualNetworkResourceGroupName: hubVirtualNetworkResourceGroupName
existingRemoteVirtualNetworkSubscriptionId: hubSubscriptionId
}
}
@ -114,6 +115,7 @@ module virtualNetworkPeeringToSpoke 'virtualNetworkPeering.bicep' = {
existingLocalVirtualNetworkName: hubVirtualNetwork.name
existingRemoteVirtualNetworkName: spokeVirtualNetwork.outputs.virtualNetworkName
existingRemoteVirtualNetworkResourceGroupName: spokeResourceGroup
existingRemoteVirtualNetworkSubscriptionId: spokeSubscriptionId
}
dependsOn: [
virtualNetworkPeeringToHub

3
src/bicep/add-ons/azureVirtualDesktop/modules/network/virtualNetworkPeering.bicep
Просмотреть файл

@ -1,6 +1,7 @@
param existingLocalVirtualNetworkName string
param existingRemoteVirtualNetworkName string
param existingRemoteVirtualNetworkResourceGroupName string
param existingRemoteVirtualNetworkSubscriptionId string
resource existingLocalVirtualNetworkName_peering_to_remote_vnet 'Microsoft.Network/virtualNetworks/virtualNetworkPeerings@2021-02-01' = {
name: '${existingLocalVirtualNetworkName}/${existingRemoteVirtualNetworkName}'
@ -10,7 +11,7 @@ resource existingLocalVirtualNetworkName_peering_to_remote_vnet 'Microsoft.Netwo
allowGatewayTransit: false
useRemoteGateways: false
remoteVirtualNetwork: {
id: resourceId(existingRemoteVirtualNetworkResourceGroupName, 'Microsoft.Network/virtualNetworks', existingRemoteVirtualNetworkName)
id: resourceId(existingRemoteVirtualNetworkSubscriptionId, existingRemoteVirtualNetworkResourceGroupName, 'Microsoft.Network/virtualNetworks', existingRemoteVirtualNetworkName)
}
}
}

46
src/bicep/add-ons/azureVirtualDesktop/solution.json
Просмотреть файл

@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "6626078179178896702"
"templateHash": "4666217236747957979"
}
},
"parameters": {
@ -1580,7 +1580,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "10150267183626429624"
"templateHash": "4060801276974414995"
}
},
"parameters": {
@ -1943,6 +1943,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"value": "[variables('hubVirtualNetworkResourceGroupName')]"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"value": "[variables('hubSubscriptionId')]"
}
},
"template": {
@ -1952,7 +1955,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "14589647370482199926"
"templateHash": "17142674102798401634"
}
},
"parameters": {
@ -1964,6 +1967,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"type": "string"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"type": "string"
}
},
"resources": [
@ -1977,7 +1983,7 @@
"allowGatewayTransit": false,
"useRemoteGateways": false,
"remoteVirtualNetwork": {
"id": "[resourceId(parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
"id": "[resourceId(parameters('existingRemoteVirtualNetworkSubscriptionId'), parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
}
}
}
@ -2008,6 +2014,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"value": "[variables('spokeResourceGroup')]"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"value": "[variables('spokeSubscriptionId')]"
}
},
"template": {
@ -2017,7 +2026,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "14589647370482199926"
"templateHash": "17142674102798401634"
}
},
"parameters": {
@ -2029,6 +2038,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"type": "string"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"type": "string"
}
},
"resources": [
@ -2042,7 +2054,7 @@
"allowGatewayTransit": false,
"useRemoteGateways": false,
"remoteVirtualNetwork": {
"id": "[resourceId(parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
"id": "[resourceId(parameters('existingRemoteVirtualNetworkSubscriptionId'), parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
}
}
}
@ -2123,7 +2135,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "10150267183626429624"
"templateHash": "4060801276974414995"
}
},
"parameters": {
@ -2486,6 +2498,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"value": "[variables('hubVirtualNetworkResourceGroupName')]"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"value": "[variables('hubSubscriptionId')]"
}
},
"template": {
@ -2495,7 +2510,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "14589647370482199926"
"templateHash": "17142674102798401634"
}
},
"parameters": {
@ -2507,6 +2522,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"type": "string"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"type": "string"
}
},
"resources": [
@ -2520,7 +2538,7 @@
"allowGatewayTransit": false,
"useRemoteGateways": false,
"remoteVirtualNetwork": {
"id": "[resourceId(parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
"id": "[resourceId(parameters('existingRemoteVirtualNetworkSubscriptionId'), parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
}
}
}
@ -2551,6 +2569,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"value": "[variables('spokeResourceGroup')]"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"value": "[variables('spokeSubscriptionId')]"
}
},
"template": {
@ -2560,7 +2581,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "14589647370482199926"
"templateHash": "17142674102798401634"
}
},
"parameters": {
@ -2572,6 +2593,9 @@
},
"existingRemoteVirtualNetworkResourceGroupName": {
"type": "string"
},
"existingRemoteVirtualNetworkSubscriptionId": {
"type": "string"
}
},
"resources": [
@ -2585,7 +2609,7 @@
"allowGatewayTransit": false,
"useRemoteGateways": false,
"remoteVirtualNetwork": {
"id": "[resourceId(parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
"id": "[resourceId(parameters('existingRemoteVirtualNetworkSubscriptionId'), parameters('existingRemoteVirtualNetworkResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('existingRemoteVirtualNetworkName'))]"
}
}
}

224
src/bicep/mlz.json
Просмотреть файл

@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9535675698560301816"
"version": "0.27.1.19265",
"templateHash": "15944616530523193260"
}
},
"parameters": {
@ -872,8 +872,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "11837208542925912913"
"version": "0.27.1.19265",
"templateHash": "14479460846238471606"
}
},
"parameters": {
@ -1493,8 +1493,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "12151158107871005313"
"version": "0.27.1.19265",
"templateHash": "10047600494962654201"
}
},
"parameters": {
@ -1735,8 +1735,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "4318537958986151520"
"version": "0.27.1.19265",
"templateHash": "11746229783964712736"
}
},
"parameters": {
@ -1792,8 +1792,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "15837787188813527331"
"version": "0.27.1.19265",
"templateHash": "11578255285976861685"
}
},
"parameters": {
@ -1923,8 +1923,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "4805463129448243330"
"version": "0.27.1.19265",
"templateHash": "14208639280327700913"
}
},
"parameters": {
@ -2115,8 +2115,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "4715776456009889995"
"version": "0.27.1.19265",
"templateHash": "9022853375598957389"
}
},
"parameters": {
@ -2293,8 +2293,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "13414814252968710669"
"version": "0.27.1.19265",
"templateHash": "12935581119437417634"
}
},
"parameters": {
@ -2383,8 +2383,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "8969815603564770173"
"version": "0.27.1.19265",
"templateHash": "6291545918575918146"
}
},
"parameters": {
@ -2481,8 +2481,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "6425343849060009850"
"version": "0.27.1.19265",
"templateHash": "13830033528097307473"
}
},
"parameters": {
@ -2553,8 +2553,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "6916781723220735567"
"version": "0.27.1.19265",
"templateHash": "4325479931624604061"
}
},
"parameters": {
@ -2665,8 +2665,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "1694345274784179495"
"version": "0.27.1.19265",
"templateHash": "9716386408341493301"
}
},
"parameters": {
@ -2755,8 +2755,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "1694345274784179495"
"version": "0.27.1.19265",
"templateHash": "9716386408341493301"
}
},
"parameters": {
@ -2875,8 +2875,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "16246426724005105233"
"version": "0.27.1.19265",
"templateHash": "2726667677428202923"
}
},
"parameters": {
@ -3284,8 +3284,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9443806356306142434"
"version": "0.27.1.19265",
"templateHash": "16908845839525692286"
}
},
"parameters": {
@ -3386,8 +3386,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "13414814252968710669"
"version": "0.27.1.19265",
"templateHash": "12935581119437417634"
}
},
"parameters": {
@ -3476,8 +3476,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "8969815603564770173"
"version": "0.27.1.19265",
"templateHash": "6291545918575918146"
}
},
"parameters": {
@ -3574,8 +3574,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "6425343849060009850"
"version": "0.27.1.19265",
"templateHash": "13830033528097307473"
}
},
"parameters": {
@ -3661,8 +3661,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "6916781723220735567"
"version": "0.27.1.19265",
"templateHash": "4325479931624604061"
}
},
"parameters": {
@ -3807,8 +3807,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "14482672325640396998"
"version": "0.27.1.19265",
"templateHash": "8359168485351251723"
}
},
"parameters": {
@ -3847,8 +3847,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2973725866451109424"
"version": "0.27.1.19265",
"templateHash": "4217213734063758013"
}
},
"parameters": {
@ -3921,8 +3921,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "3360096389164919794"
"version": "0.27.1.19265",
"templateHash": "2072756264947187478"
}
},
"parameters": {
@ -3967,8 +3967,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2973725866451109424"
"version": "0.27.1.19265",
"templateHash": "4217213734063758013"
}
},
"parameters": {
@ -4046,8 +4046,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "5079624633005101695"
"version": "0.27.1.19265",
"templateHash": "11743442230338523701"
}
},
"parameters": {
@ -4550,8 +4550,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "13247383024189102062"
"version": "0.27.1.19265",
"templateHash": "8477788916212896721"
}
},
"parameters": {
@ -4752,8 +4752,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "8607068382992509094"
"version": "0.27.1.19265",
"templateHash": "5396474088400855299"
}
},
"parameters": {
@ -4823,8 +4823,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2708305007283639705"
"version": "0.27.1.19265",
"templateHash": "12300580845424356573"
}
},
"parameters": {
@ -5071,8 +5071,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2253498434473273498"
"version": "0.27.1.19265",
"templateHash": "15986878026863280024"
}
},
"parameters": {
@ -5148,8 +5148,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9453050836674512129"
"version": "0.27.1.19265",
"templateHash": "6383470207031311407"
}
},
"parameters": {
@ -5240,8 +5240,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "17180318248198488154"
"version": "0.27.1.19265",
"templateHash": "18444034659283031294"
}
},
"parameters": {
@ -5295,8 +5295,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9453050836674512129"
"version": "0.27.1.19265",
"templateHash": "6383470207031311407"
}
},
"parameters": {
@ -5438,8 +5438,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "1481554165360864041"
"version": "0.27.1.19265",
"templateHash": "11989229705083422603"
}
},
"parameters": {
@ -5521,8 +5521,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "15769317990359675373"
"version": "0.27.1.19265",
"templateHash": "1331736335999349604"
}
},
"parameters": {
@ -5689,8 +5689,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "17575542206835194444"
"version": "0.27.1.19265",
"templateHash": "14160890386365930561"
}
},
"parameters": {
@ -5817,8 +5817,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "16110801897441128773"
"version": "0.27.1.19265",
"templateHash": "13414067387913558241"
}
},
"parameters": {
@ -6034,8 +6034,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "6459826304920905779"
"version": "0.27.1.19265",
"templateHash": "5291592145845995956"
}
},
"parameters": {
@ -6208,8 +6208,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "14427344299772412774"
"version": "0.27.1.19265",
"templateHash": "6020015951408111241"
}
},
"parameters": {
@ -6332,8 +6332,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "14507938296486050160"
"version": "0.27.1.19265",
"templateHash": "438947595009177848"
}
},
"parameters": {
@ -6474,8 +6474,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "16715575277488861170"
"version": "0.27.1.19265",
"templateHash": "1204003513623198452"
}
},
"parameters": {
@ -6775,8 +6775,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "14507938296486050160"
"version": "0.27.1.19265",
"templateHash": "438947595009177848"
}
},
"parameters": {
@ -6917,8 +6917,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "17748886264899328444"
"version": "0.27.1.19265",
"templateHash": "11144440230827394471"
}
},
"parameters": {
@ -7220,8 +7220,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "13618446380256505462"
"version": "0.27.1.19265",
"templateHash": "13265980970397591955"
}
},
"parameters": {
@ -7331,8 +7331,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2945887437755946902"
"version": "0.27.1.19265",
"templateHash": "6116693144339389145"
}
},
"parameters": {
@ -7593,8 +7593,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "17420394250885012283"
"version": "0.27.1.19265",
"templateHash": "13564100680991707434"
}
},
"parameters": {
@ -7682,8 +7682,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "16067990757204095170"
"version": "0.27.1.19265",
"templateHash": "11148640012050316356"
}
},
"parameters": {
@ -7766,8 +7766,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "2356463188747066339"
"version": "0.27.1.19265",
"templateHash": "11712410170328172005"
}
},
"parameters": {
@ -7847,8 +7847,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9767149346014876086"
"version": "0.27.1.19265",
"templateHash": "17574917306879377899"
}
},
"parameters": {
@ -7923,8 +7923,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "5378372176274077006"
"version": "0.27.1.19265",
"templateHash": "17022277323540309911"
}
},
"parameters": {
@ -7999,8 +7999,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "3979346140095143396"
"version": "0.27.1.19265",
"templateHash": "17517788364018363580"
}
},
"parameters": {
@ -8071,8 +8071,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "256343499700961129"
"version": "0.27.1.19265",
"templateHash": "9910322564976160147"
}
},
"parameters": {
@ -8146,8 +8146,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "10945175419454889996"
"version": "0.27.1.19265",
"templateHash": "7484969174915829356"
}
},
"parameters": {
@ -8225,8 +8225,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "8879377706684986478"
"version": "0.27.1.19265",
"templateHash": "18352303562183670014"
}
},
"parameters": {
@ -8279,8 +8279,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "16955897946206328779"
"version": "0.27.1.19265",
"templateHash": "2830289860770048399"
}
},
"parameters": {
@ -8455,8 +8455,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "9453050836674512129"
"version": "0.27.1.19265",
"templateHash": "6383470207031311407"
}
},
"parameters": {
@ -8552,8 +8552,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "4780199096686289726"
"version": "0.27.1.19265",
"templateHash": "8123008071018852221"
}
},
"parameters": {
@ -8616,8 +8616,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.170.59819",
"templateHash": "17296430727130356523"
"version": "0.27.1.19265",
"templateHash": "4615387508967890473"
}
},
"parameters": {