Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bump vnet version for sub-vending #3561

Merged
merged 2 commits into from
Oct 15, 2024
Merged

fix: bump vnet version for sub-vending #3561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b708e1
feat: Update virtual network module version to 0.4.1
sebassem Oct 15, 2024
9fff4e2
feat: Update virtual network module version to 0.4.1
sebassem Oct 15, 2024
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
2 changes: 1 addition & 1 deletion avm/ptn/lz/sub-vending/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ This section gives you an overview of all local-referenced module files (i.e., o
| `br/public:avm/ptn/authorization/role-assignment:0.1.0` | Remote reference |
| `br/public:avm/res/managed-identity/user-assigned-identity:0.2.2` | Remote reference |
| `br/public:avm/res/network/network-security-group:0.3.0` | Remote reference |
| `br/public:avm/res/network/virtual-network:0.4.0` | Remote reference |
| `br/public:avm/res/network/virtual-network:0.4.1` | Remote reference |
| `br/public:avm/res/resources/deployment-script:0.2.3` | Remote reference |
| `br/public:avm/res/resources/resource-group:0.2.4` | Remote reference |
| `br/public:avm/res/storage/storage-account:0.9.1` | Remote reference |
Expand Down
52 changes: 28 additions & 24 deletions avm/ptn/lz/sub-vending/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "2644636658214532574"
"templateHash": "15297648363887235052"
},
"name": "Sub-vending",
"description": "This module deploys a subscription to accelerate deployment of landing zones. For more information on how to use it, please visit this [Wiki](https://github.com/Azure/bicep-lz-vending/wiki).",
Expand Down Expand Up @@ -663,7 +663,7 @@
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "2549730186599602050"
"templateHash": "16600088245608261230"
},
"name": "`/subResourcesWrapper/deploy.bicep` Parameters",
"description": "This module is used by the [`bicep-lz-vending`](https://aka.ms/sub-vending/bicep) module to help orchestrate the deployment",
Expand Down Expand Up @@ -2339,8 +2339,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "15949466154563447171"
"version": "0.30.23.60470",
"templateHash": "5074972058800471543"
},
"name": "Virtual Networks",
"description": "This module deploys a Virtual Network (vNet).",
Expand Down Expand Up @@ -2954,7 +2954,7 @@
"condition": "[parameters('enableTelemetry')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2024-03-01",
"name": "[format('46d3xbcp.res.network-virtualnetwork.{0}.{1}', replace('0.4.0', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"name": "[format('46d3xbcp.res.network-virtualnetwork.{0}.{1}', replace('0.4.1', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"properties": {
"mode": "Incremental",
"template": {
Expand Down Expand Up @@ -3138,8 +3138,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5699372618313647761"
"version": "0.30.23.60470",
"templateHash": "6677157161292207910"
},
"name": "Virtual Network Subnets",
"description": "This module deploys a Virtual Network Subnet.",
Expand Down Expand Up @@ -3517,8 +3517,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5206620163504251868"
"version": "0.30.23.60470",
"templateHash": "345394220621166229"
},
"name": "Virtual Network Peerings",
"description": "This module deploys a Virtual Network Peering.",
Expand Down Expand Up @@ -3623,7 +3623,8 @@
}
},
"dependsOn": [
"virtualNetwork"
"virtualNetwork",
"virtualNetwork_subnets"
]
},
"virtualNetwork_peering_remote": {
Expand Down Expand Up @@ -3674,8 +3675,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5206620163504251868"
"version": "0.30.23.60470",
"templateHash": "345394220621166229"
},
"name": "Virtual Network Peerings",
"description": "This module deploys a Virtual Network Peering.",
Expand Down Expand Up @@ -3780,7 +3781,8 @@
}
},
"dependsOn": [
"virtualNetwork"
"virtualNetwork",
"virtualNetwork_subnets"
]
}
},
Expand Down Expand Up @@ -13697,8 +13699,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "15949466154563447171"
"version": "0.30.23.60470",
"templateHash": "5074972058800471543"
},
"name": "Virtual Networks",
"description": "This module deploys a Virtual Network (vNet).",
Expand Down Expand Up @@ -14312,7 +14314,7 @@
"condition": "[parameters('enableTelemetry')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2024-03-01",
"name": "[format('46d3xbcp.res.network-virtualnetwork.{0}.{1}', replace('0.4.0', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"name": "[format('46d3xbcp.res.network-virtualnetwork.{0}.{1}', replace('0.4.1', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"properties": {
"mode": "Incremental",
"template": {
Expand Down Expand Up @@ -14496,8 +14498,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5699372618313647761"
"version": "0.30.23.60470",
"templateHash": "6677157161292207910"
},
"name": "Virtual Network Subnets",
"description": "This module deploys a Virtual Network Subnet.",
Expand Down Expand Up @@ -14875,8 +14877,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5206620163504251868"
"version": "0.30.23.60470",
"templateHash": "345394220621166229"
},
"name": "Virtual Network Peerings",
"description": "This module deploys a Virtual Network Peering.",
Expand Down Expand Up @@ -14981,7 +14983,8 @@
}
},
"dependsOn": [
"virtualNetwork"
"virtualNetwork",
"virtualNetwork_subnets"
]
},
"virtualNetwork_peering_remote": {
Expand Down Expand Up @@ -15032,8 +15035,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "5206620163504251868"
"version": "0.30.23.60470",
"templateHash": "345394220621166229"
},
"name": "Virtual Network Peerings",
"description": "This module deploys a Virtual Network Peering.",
Expand Down Expand Up @@ -15138,7 +15141,8 @@
}
},
"dependsOn": [
"virtualNetwork"
"virtualNetwork",
"virtualNetwork_subnets"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions avm/ptn/lz/sub-vending/modules/subResourceWrapper.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ module tagResourceGroup 'tags.bicep' = if (virtualNetworkEnabled && !empty(virtu
}
}

module createLzVnet 'br/public:avm/res/network/virtual-network:0.4.0' = if (virtualNetworkEnabled && !empty(virtualNetworkName) && !empty(virtualNetworkAddressSpace) && !empty(virtualNetworkLocation) && !empty(virtualNetworkResourceGroupName)) {
module createLzVnet 'br/public:avm/res/network/virtual-network:0.4.1' = if (virtualNetworkEnabled && !empty(virtualNetworkName) && !empty(virtualNetworkAddressSpace) && !empty(virtualNetworkLocation) && !empty(virtualNetworkResourceGroupName)) {
dependsOn: [
createResourceGroupForLzNetworking
]
Expand Down Expand Up @@ -579,7 +579,7 @@ module createDsStorageAccount 'br/public:avm/res/storage/storage-account:0.9.1'
}
}

module createDsVnet 'br/public:avm/res/network/virtual-network:0.4.0' = if (!empty(resourceProviders)) {
module createDsVnet 'br/public:avm/res/network/virtual-network:0.4.1' = if (!empty(resourceProviders)) {
scope: resourceGroup(subscriptionId, deploymentScriptResourceGroupName)
name: deploymentNames.createdsVnet
params: {
Expand Down