From 7f73925af97dc9457efb05aaad7df83b2b658a33 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 30 Aug 2022 21:48:55 +0200 Subject: [PATCH 01/15] [Modules] Updated Network/Connections to new dependency approach --- .github/workflows/ms.network.connections.yml | 3 +- .../.test/vnet2vnet.parameters.json | 39 ------ .../.test/vnet2vnet/dependencies.bicep | 132 ++++++++++++++++++ .../.test/vnet2vnet/deploy.test.bicep | 64 +++++++++ .../Microsoft.Network/connections/readme.md | 34 ++--- utilities/tools/Set-ModuleReadMe.ps1 | 6 +- 6 files changed, 210 insertions(+), 68 deletions(-) delete mode 100644 modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json create mode 100644 modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep create mode 100644 modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml index 6c79aa5700..487dad0043 100644 --- a/.github/workflows/ms.network.connections.yml +++ b/.github/workflows/ms.network.connections.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json b/modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json deleted file mode 100644 index c58d1a4593..0000000000 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet.parameters.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-vnetgwc-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "virtualNetworkGateway1": { - "value": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-001" - } - }, - "virtualNetworkGateway2": { - "value": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-002" - } - }, - "vpnSharedKey": { - "reference": { - "keyVault": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001" - }, - "secretName": "vpnSharedKey" - } - }, - "virtualNetworkGatewayConnectionType": { - "value": "Vnet2Vnet" - }, - "enableBgp": { - "value": false - }, - "location": { - "value": "eastus" - } - } -} diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep new file mode 100644 index 0000000000..6aaccc70af --- /dev/null +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -0,0 +1,132 @@ +@description('Optional. The location to deploy resources to.') +param location string = resourceGroup().location + +@description('Required. The name of the primary Public IP to create.') +param primaryPublicIPName string + +@description('Required. The name of the primary VNET to create.') +param primaryVirtualNetworkName string + +@description('Required. The name of the primary VNET Gateways to create.') +param primaryVirtualNetworkGateway string + +@description('Required. The name of the secondary Public IP to create.') +param secondaryPublicIPName string + +@description('Required. The name of the secondary VNET to create.') +param secondaryVirtualNetworkName string + +@description('Required. The name of the secondary VNET Gateways to create.') +param secondaryVirtualNetworkGateway string + +resource primaryVirtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { + name: primaryVirtualNetworkName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/24' + ] + } + subnets: [ + { + name: 'GatewaySubnet' + properties: { + addressPrefix: '10.0.0.0/24' + } + } + ] + } +} + +resource primaryPublicIP 'Microsoft.Network/publicIPAddresses@2022-01-01' = { + name: primaryPublicIPName + location: location +} + +resource primaryVNETGateway 'Microsoft.Network/virtualNetworkGateways@2021-08-01' = { + name: primaryVirtualNetworkGateway + location: location + properties: { + gatewayType: 'Vpn' + ipConfigurations: [ + { + name: 'default' + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: primaryVirtualNetwork.properties.subnets[0].id + } + publicIPAddress: { + id: primaryPublicIP.id + } + } + } + ] + vpnType: 'RouteBased' + vpnGatewayGeneration: 'Generation2' + sku: { + name: 'VpnGw2' + tier: 'VpnGw2' + } + } +} + +resource secondaryVirtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { + name: secondaryVirtualNetworkName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.1.0/24' + ] + } + subnets: [ + { + name: 'GatewaySubnet' + properties: { + addressPrefix: '10.0.1.0/24' + } + } + ] + } +} + +resource secondaryPublicIP 'Microsoft.Network/publicIPAddresses@2022-01-01' = { + name: secondaryPublicIPName + location: location +} + +resource secondaryVNETGateway 'Microsoft.Network/virtualNetworkGateways@2021-08-01' = { + name: secondaryVirtualNetworkGateway + location: location + properties: { + gatewayType: 'Vpn' + ipConfigurations: [ + { + name: 'default' + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: secondaryVirtualNetwork.properties.subnets[0].id + } + publicIPAddress: { + id: secondaryPublicIP.id + } + } + } + ] + vpnType: 'RouteBased' + vpnGatewayGeneration: 'Generation2' + sku: { + name: 'VpnGw2' + tier: 'VpnGw2' + } + } +} + +@description('The resource ID of the first created Virtual Network Gateways.') +output primaryVNETGatewayResourceID string = primaryVNETGateway.id + +@description('The resource ID of the second created Virtual Network Gateways.') +output secondaryVNETGatewayResourceID string = secondaryVNETGateway.id diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep new file mode 100644 index 0000000000..8350f19126 --- /dev/null +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -0,0 +1,64 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(80) +param resourceGroupName string = 'ms.network.connections-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'ncvtv' + +@description('Optional. The password to leverage for the login.') +@secure() +param password string = newGuid() + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + primaryPublicIPName: 'dep-<>-pip-${serviceShort}-1' + primaryVirtualNetworkName: 'dep-<>-vnet-${serviceShort}-1' + primaryVirtualNetworkGateway: 'dep-<>-vpn-gw-${serviceShort}-1' + secondaryPublicIPName: 'dep-<>-pip-${serviceShort}-2' + secondaryVirtualNetworkName: 'dep-<>-vnet-${serviceShort}-2' + secondaryVirtualNetworkGateway: 'dep-<>-vpn-gw-${serviceShort}-2' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + virtualNetworkGateway1: { + id: resourceGroupResources.outputs.primaryVNETGatewayResourceID + } + enableBgp: false + lock: 'CanNotDelete' + virtualNetworkGateway2: { + id: resourceGroupResources.outputs.secondaryVNETGatewayResourceID + } + virtualNetworkGatewayConnectionType: 'Vnet2Vnet' + vpnSharedKey: password + } +} diff --git a/modules/Microsoft.Network/connections/readme.md b/modules/Microsoft.Network/connections/readme.md index 046f849b4b..a33d639fb6 100644 --- a/modules/Microsoft.Network/connections/readme.md +++ b/modules/Microsoft.Network/connections/readme.md @@ -320,28 +320,22 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -resource kv1 'Microsoft.KeyVault/vaults@2019-09-01' existing = { - name: 'adp-<>-az-kv-x-001' - scope: resourceGroup('<>','validation-rg') -} - -module connections './Microsoft.Network/connections/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-connections' +module Connections './Microsoft.Network/Connections/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-ncvtv' params: { // Required parameters - name: '<>-az-vnetgwc-x-001' + name: '<>ncvtv001' virtualNetworkGateway1: { - id: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-001' + id: '' } // Non-required parameters enableBgp: false - location: 'eastus' lock: 'CanNotDelete' virtualNetworkGateway2: { - id: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-002' + id: '' } virtualNetworkGatewayConnectionType: 'Vnet2Vnet' - vpnSharedKey: kv1.getSecret('vpnSharedKey') + vpnSharedKey: '' } } ``` @@ -360,38 +354,30 @@ module connections './Microsoft.Network/connections/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>-az-vnetgwc-x-001" + "value": "<>ncvtv001" }, "virtualNetworkGateway1": { "value": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-001" + "id": "" } }, // Non-required parameters "enableBgp": { "value": false }, - "location": { - "value": "eastus" - }, "lock": { "value": "CanNotDelete" }, "virtualNetworkGateway2": { "value": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworkGateways/<>-az-vnet-vpn-gw-p-002" + "id": "" } }, "virtualNetworkGatewayConnectionType": { "value": "Vnet2Vnet" }, "vpnSharedKey": { - "reference": { - "keyVault": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001" - }, - "secretName": "vpnSharedKey" - } + "value": "" } } } diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index a1074fed21..6b922d65e8 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -883,9 +883,10 @@ function Set-DeploymentExamplesSection { '' ) + $TextInfo = (Get-Culture -Name 'en-US').TextInfo $moduleRoot = Split-Path $TemplateFilePath -Parent - $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/') - $resourceType = $resourceTypeIdentifier.Split('/')[1] + $resourceTypeIdentifier = $TextInfo.ToTitleCase($moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')) + $resourceType = $TextInfo.ToTitleCase($resourceTypeIdentifier.Split('/')[1]) $testFilePaths = Get-ModuleTestFileList -ModulePath $moduleRoot | ForEach-Object { Join-Path $moduleRoot $_ } $RequiredParametersList = $TemplateFileContent.parameters.Keys | Where-Object { $TemplateFileContent.parameters[$_].Keys -notcontains 'defaultValue' } | Sort-Object @@ -906,7 +907,6 @@ function Set-DeploymentExamplesSection { } else { $exampleTitle = ((Split-Path $testFilePath -LeafBase) -replace '\.', ' ') -replace ' parameters', '' } - $TextInfo = (Get-Culture -Name 'en-US').TextInfo $exampleTitle = $TextInfo.ToTitleCase($exampleTitle) $SectionContent += @( '

Example {0}: {1}

' -f $pathIndex, $exampleTitle From 59a647550d4020bc6b53e844718b0d78abe3d735 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 1 Sep 2022 11:35:22 +0200 Subject: [PATCH 02/15] Update to latest --- modules/Microsoft.Network/connections/readme.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/Microsoft.Network/connections/readme.md b/modules/Microsoft.Network/connections/readme.md index 0f3cc71dc5..a33d639fb6 100644 --- a/modules/Microsoft.Network/connections/readme.md +++ b/modules/Microsoft.Network/connections/readme.md @@ -320,13 +320,8 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -resource kv1 'Microsoft.KeyVault/vaults@2019-09-01' existing = { - name: 'adp-<>-az-kv-x-001' - scope: resourceGroup('<>','validation-rg') -} - -module connections './Microsoft.Network/connections/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Connections' +module Connections './Microsoft.Network/Connections/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-ncvtv' params: { // Required parameters name: '<>ncvtv001' From 2027e032ed67b83029c1e0a0c0613f9d2f391f44 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:51:27 +0200 Subject: [PATCH 03/15] Update to latest --- .../connections/.test/vnet2vnet/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep index 8350f19126..5f9c5ea09e 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.network.connections-${serviceShort}-rg' @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') param serviceShort string = 'ncvtv' @description('Optional. The password to leverage for the login.') From e3bb2088da00fd59a5204f99844fd33ca6b22486 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:04:30 +0200 Subject: [PATCH 04/15] Update to latest --- .../connections/.test/vnet2vnet/deploy.test.bicep | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep index 5f9c5ea09e..3a22acd414 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(80) param resourceGroupName string = 'ms.network.connections-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'ncvtv' @description('Optional. The password to leverage for the login.') From 70517e295efd1e90fbfd60f387848a769b04c11e Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:54:24 +0200 Subject: [PATCH 05/15] Update to latest --- modules/Microsoft.Network/connections/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/readme.md b/modules/Microsoft.Network/connections/readme.md index 58ce298db1..24b86cf268 100644 --- a/modules/Microsoft.Network/connections/readme.md +++ b/modules/Microsoft.Network/connections/readme.md @@ -321,7 +321,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module Connections './Microsoft.Network/Connections/deploy.bicep' = { +module connections './Microsoft.Network/connections/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-ncvtv' params: { // Required parameters From 472b46605c0e58bffd4d52294a9c6b6ae9c657d1 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 20:03:46 +0200 Subject: [PATCH 06/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep --- .../connections/.test/vnet2vnet/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep index 3a22acd414..fd006b946d 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(80) param resourceGroupName string = 'ms.network.connections-${serviceShort}-rg' From c77e68fdb97029a6a048c0f2f6468a8188f8fd82 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 19 Sep 2022 21:20:29 +0200 Subject: [PATCH 07/15] Update to latest --- utilities/tools/Set-ModuleReadMe.ps1 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 6469605289..25923c3d62 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -896,13 +896,6 @@ function Set-DeploymentExamplesSection { '' ) -<<<<<<< HEAD - $TextInfo = (Get-Culture -Name 'en-US').TextInfo - $moduleRoot = Split-Path $TemplateFilePath -Parent - $fullIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/') - -======= ->>>>>>> main # Get resource type and make first letter upper case. Requires manual handling as ToTitleCase lowercases everything but the first letter $providerNamespace = ($fullModuleIdentifier.Split('/')[0] -split '\.' | ForEach-Object { $_.Substring(0, 1).ToUpper() + $_.Substring(1) }) -join '.' $resourceType = $fullModuleIdentifier.Split('/')[1] From 67ef8b0949082022f2a051686fa46ea7d6662dd2 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:11:59 +0200 Subject: [PATCH 08/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index 6aaccc70af..875053c943 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -7,7 +7,7 @@ param primaryPublicIPName string @description('Required. The name of the primary VNET to create.') param primaryVirtualNetworkName string -@description('Required. The name of the primary VNET Gateways to create.') +@description('Required. The name of the primary Virtual Network Gateway to create.') param primaryVirtualNetworkGateway string @description('Required. The name of the secondary Public IP to create.') From 28b0e2a79b137debe9997f7634c202aa87840c6d Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:09 +0200 Subject: [PATCH 09/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index 875053c943..978cadaa9b 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -16,7 +16,7 @@ param secondaryPublicIPName string @description('Required. The name of the secondary VNET to create.') param secondaryVirtualNetworkName string -@description('Required. The name of the secondary VNET Gateways to create.') +@description('Required. The name of the secondary Virtual Network Gateway to create.') param secondaryVirtualNetworkGateway string resource primaryVirtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { From 226fb1464a64d75b54da764218460e1ec4923238 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:20 +0200 Subject: [PATCH 10/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index 978cadaa9b..e1cb5b74ed 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -125,7 +125,7 @@ resource secondaryVNETGateway 'Microsoft.Network/virtualNetworkGateways@2021-08- } } -@description('The resource ID of the first created Virtual Network Gateways.') +@description('The resource ID of the created primary Virtual Network Gateway.') output primaryVNETGatewayResourceID string = primaryVNETGateway.id @description('The resource ID of the second created Virtual Network Gateways.') From 1ba232a19e5d9c8b9b244dd6065c7e3e0cf0301b Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:27 +0200 Subject: [PATCH 11/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep index fd006b946d..9ab0bb9a17 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -34,7 +34,7 @@ module resourceGroupResources 'dependencies.bicep' = { params: { primaryPublicIPName: 'dep-<>-pip-${serviceShort}-1' primaryVirtualNetworkName: 'dep-<>-vnet-${serviceShort}-1' - primaryVirtualNetworkGateway: 'dep-<>-vpn-gw-${serviceShort}-1' + primaryVirtualNetworkGatewayName: 'dep-<>-vpn-gw-${serviceShort}-1' secondaryPublicIPName: 'dep-<>-pip-${serviceShort}-2' secondaryVirtualNetworkName: 'dep-<>-vnet-${serviceShort}-2' secondaryVirtualNetworkGateway: 'dep-<>-vpn-gw-${serviceShort}-2' From c2ca5f8a683894d3ad2394df6b41c28fe4bef15e Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:41 +0200 Subject: [PATCH 12/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index e1cb5b74ed..d393e266fb 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -128,5 +128,5 @@ resource secondaryVNETGateway 'Microsoft.Network/virtualNetworkGateways@2021-08- @description('The resource ID of the created primary Virtual Network Gateway.') output primaryVNETGatewayResourceID string = primaryVNETGateway.id -@description('The resource ID of the second created Virtual Network Gateways.') +@description('The resource ID of the created secondary Virtual Network Gateway.') output secondaryVNETGatewayResourceID string = secondaryVNETGateway.id From e50e93bf71494874be309fb92fd93f3464e87909 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:49 +0200 Subject: [PATCH 13/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep index 9ab0bb9a17..8366e0e89b 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/deploy.test.bicep @@ -37,7 +37,7 @@ module resourceGroupResources 'dependencies.bicep' = { primaryVirtualNetworkGatewayName: 'dep-<>-vpn-gw-${serviceShort}-1' secondaryPublicIPName: 'dep-<>-pip-${serviceShort}-2' secondaryVirtualNetworkName: 'dep-<>-vnet-${serviceShort}-2' - secondaryVirtualNetworkGateway: 'dep-<>-vpn-gw-${serviceShort}-2' + secondaryVirtualNetworkGatewayName: 'dep-<>-vpn-gw-${serviceShort}-2' } } From 62265cda3dbe807bf9acb179f9969d1408b536fd Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:12:56 +0200 Subject: [PATCH 14/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index d393e266fb..83f5044506 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -17,7 +17,7 @@ param secondaryPublicIPName string param secondaryVirtualNetworkName string @description('Required. The name of the secondary Virtual Network Gateway to create.') -param secondaryVirtualNetworkGateway string +param secondaryVirtualNetworkGatewayName string resource primaryVirtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: primaryVirtualNetworkName From 6c83461e6e58f04ff99b95f7b47fe0a0f73a1cd5 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 27 Sep 2022 21:13:02 +0200 Subject: [PATCH 15/15] Update modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../connections/.test/vnet2vnet/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep index 83f5044506..8dfed7d0f8 100644 --- a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep +++ b/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep @@ -8,7 +8,7 @@ param primaryPublicIPName string param primaryVirtualNetworkName string @description('Required. The name of the primary Virtual Network Gateway to create.') -param primaryVirtualNetworkGateway string +param primaryVirtualNetworkGatewayName string @description('Required. The name of the secondary Public IP to create.') param secondaryPublicIPName string