From a2d9ec4c9ebd6f69d11c07f9ac445bf327d70017 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 30 Aug 2022 21:52:51 +0200 Subject: [PATCH 01/12] [Modules] Updated Network/VirtualHubs to new dependency approach --- .github/workflows/ms.network.virtualhubs.yml | 3 +- .../.test/default/dependencies.bicep | 40 ++++++ .../.test/default/deploy.test.bicep | 75 +++++++++++ .../virtualHubs/.test/min.parameters.json | 15 --- .../virtualHubs/.test/min/dependencies.bicep | 13 ++ .../virtualHubs/.test/min/deploy.test.bicep | 47 +++++++ .../virtualHubs/.test/parameters.json | 48 ------- .../Microsoft.Network/virtualHubs/readme.md | 120 +++++++++--------- utilities/tools/Set-ModuleReadMe.ps1 | 6 +- 9 files changed, 239 insertions(+), 128 deletions(-) create mode 100644 modules/Microsoft.Network/virtualHubs/.test/default/dependencies.bicep create mode 100644 modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep delete mode 100644 modules/Microsoft.Network/virtualHubs/.test/min.parameters.json create mode 100644 modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep create mode 100644 modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.Network/virtualHubs/.test/parameters.json diff --git a/.github/workflows/ms.network.virtualhubs.yml b/.github/workflows/ms.network.virtualhubs.yml index 6f8804f622..12c1e63689 100644 --- a/.github/workflows/ms.network.virtualhubs.yml +++ b/.github/workflows/ms.network.virtualhubs.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/virtualHubs/.test/default/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/default/dependencies.bicep new file mode 100644 index 0000000000..ccdcc86da6 --- /dev/null +++ b/modules/Microsoft.Network/virtualHubs/.test/default/dependencies.bicep @@ -0,0 +1,40 @@ +@description('Required. The name of the Virtual WAN to create.') +param virtualWANName string + +@description('Required. The name of the Virtual Network to create.') +param virtualNetworkName string + +@description('Optional. The location to deploy resources to.') +param location string = resourceGroup().location + +resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' = { + name: virtualWANName + location: location +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { + name: virtualNetworkName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + subnets: [ + { + name: 'sxx-subnet-01' + properties: { + + addressPrefix: '10.0.0.0/24' + } + } + ] + } +} + +@description('The resource ID of the created Virtual WAN') +output virtualWWANResourceId string = virtualWan.id + +@description('The resource ID of the created Virtual Network') +output virtualNetworkResourceId string = virtualNetwork.id diff --git a/modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep new file mode 100644 index 0000000000..af2d6da907 --- /dev/null +++ b/modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep @@ -0,0 +1,75 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(80) +param resourceGroupName string = 'ms.network.virtualHub-${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 = 'nvhdef' + +// =========== // +// 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)}-nestedDependencies' + params: { + virtualWANName: 'dep-<>-vw-${serviceShort}' + virtualNetworkName: 'dep-<>-vnet-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>-${serviceShort}' + lock: 'CanNotDelete' + addressPrefix: '10.1.0.0/16' + virtualWanId: resourceGroupResources.outputs.virtualWWANResourceId + hubRouteTables: [ + { + name: 'routeTable1' + } + ] + hubVirtualNetworkConnections: [ + { + name: 'connection1' + remoteVirtualNetworkId: resourceGroupResources.outputs.virtualNetworkResourceId + routingConfiguration: { + associatedRouteTable: { + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-${serviceShort}/hubRouteTables/routeTable1' + } + propagatedRouteTables: { + ids: [ + { + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-${serviceShort}/hubRouteTables/routeTable1' + } + ] + labels: [ + 'none' + ] + } + } + } + ] + } +} diff --git a/modules/Microsoft.Network/virtualHubs/.test/min.parameters.json b/modules/Microsoft.Network/virtualHubs/.test/min.parameters.json deleted file mode 100644 index dbe2fa650a..0000000000 --- a/modules/Microsoft.Network/virtualHubs/.test/min.parameters.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-vhub-min-001" - }, - "addressPrefix": { - "value": "10.0.0.0/16" - }, - "virtualWanId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001" - } - } -} diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep new file mode 100644 index 0000000000..33c8d7907d --- /dev/null +++ b/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep @@ -0,0 +1,13 @@ +@description('Required. The name of the virtual WAN to create.') +param virtualWANName string + +@description('Optional. The location to deploy resources to.') +param location string = resourceGroup().location + +resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' = { + name: virtualWANName + location: location +} + +@description('The resource ID of the created Virtual WAN') +output virtualWWANResourceId string = virtualWan.id diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..f656f9e586 --- /dev/null +++ b/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep @@ -0,0 +1,47 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(80) +param resourceGroupName string = 'ms.network.virtualHub-${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 = 'nvhmin' + +// =========== // +// 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)}-nestedDependencies' + params: { + virtualWANName: 'dep-<>-vw-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>-${serviceShort}' + addressPrefix: '10.0.0.0/16' + virtualWanId: resourceGroupResources.outputs.virtualWWANResourceId + } +} diff --git a/modules/Microsoft.Network/virtualHubs/.test/parameters.json b/modules/Microsoft.Network/virtualHubs/.test/parameters.json deleted file mode 100644 index 2660f1be93..0000000000 --- a/modules/Microsoft.Network/virtualHubs/.test/parameters.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-vhub-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "addressPrefix": { - "value": "10.1.0.0/16" - }, - "virtualWanId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001" - }, - "hubRouteTables": { - "value": [ - { - "name": "routeTable1" - } - ] - }, - "hubVirtualNetworkConnections": { - "value": [ - { - "name": "connection1", - "remoteVirtualNetworkId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-vhub", - "routingConfiguration": { - "associatedRouteTable": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1" - }, - "propagatedRouteTables": { - "ids": [ - { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1" - } - ], - "labels": [ - "none" - ] - } - } - } - ] - } - } -} diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md index 5bf6c803ae..cfd144101c 100644 --- a/modules/Microsoft.Network/virtualHubs/readme.md +++ b/modules/Microsoft.Network/virtualHubs/readme.md @@ -112,67 +112,20 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Min

+

Example 1: Default

via Bicep module ```bicep -module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-virtualHubs' - params: { - // Required parameters - addressPrefix: '10.0.0.0/16' - name: '<>-az-vhub-min-001' - virtualWanId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "addressPrefix": { - "value": "10.0.0.0/16" - }, - "name": { - "value": "<>-az-vhub-min-001" - }, - "virtualWanId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001" - } - } -} -``` - -
-

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-virtualHubs' +module Virtualhubs './Microsoft.Network/Virtualhubs/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-nvhdef' params: { // Required parameters addressPrefix: '10.1.0.0/16' - name: '<>-az-vhub-x-001' - virtualWanId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001' + name: '<>-nvhdef' + virtualWanId: '' // Non-required parameters hubRouteTables: [ { @@ -182,15 +135,15 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { hubVirtualNetworkConnections: [ { name: 'connection1' - remoteVirtualNetworkId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-vhub' + remoteVirtualNetworkId: '' routingConfiguration: { associatedRouteTable: { - id: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1' + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1' } propagatedRouteTables: { ids: [ { - id: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1' + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1' } ] labels: [ @@ -222,10 +175,10 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { "value": "10.1.0.0/16" }, "name": { - "value": "<>-az-vhub-x-001" + "value": "<>-nvhdef" }, "virtualWanId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001" + "value": "" }, // Non-required parameters "hubRouteTables": { @@ -239,15 +192,15 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { "value": [ { "name": "connection1", - "remoteVirtualNetworkId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-vhub", + "remoteVirtualNetworkId": "", "routingConfiguration": { "associatedRouteTable": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1" + "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1" }, "propagatedRouteTables": { "ids": [ { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualHubs/<>-az-vHub-x-001/hubRouteTables/routeTable1" + "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1" } ], "labels": [ @@ -267,3 +220,50 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = {

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module Virtualhubs './Microsoft.Network/Virtualhubs/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-nvhmin' + params: { + // Required parameters + addressPrefix: '10.0.0.0/16' + name: '<>-nvhmin' + virtualWanId: '' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "addressPrefix": { + "value": "10.0.0.0/16" + }, + "name": { + "value": "<>-nvhmin" + }, + "virtualWanId": { + "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 c8334a455d28e12b69d3f9600902d8a17451066f Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 1 Sep 2022 11:36:42 +0200 Subject: [PATCH 02/12] Update to latest --- .../Microsoft.Network/virtualHubs/readme.md | 53 ++----------------- 1 file changed, 3 insertions(+), 50 deletions(-) diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md index 17f3eda1bf..fcb4690e4f 100644 --- a/modules/Microsoft.Network/virtualHubs/readme.md +++ b/modules/Microsoft.Network/virtualHubs/readme.md @@ -119,55 +119,8 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-VirtualHubs' - params: { - // Required parameters - addressPrefix: '10.0.0.0/16' - name: '<>-az-vhub-min-001' - virtualWanId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001' - } -} -``` - - -

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "addressPrefix": { - "value": "10.0.0.0/16" - }, - "name": { - "value": "<>-az-vhub-min-001" - }, - "virtualWanId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualWans/adp-<>-az-vw-x-001" - } - } -} -``` - -
-

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-VirtualHubs' +module VirtualHubs './Microsoft.Network/VirtualHubs/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-nvhdef' params: { // Required parameters addressPrefix: '10.1.0.0/16' @@ -275,7 +228,7 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { via Bicep module ```bicep -module Virtualhubs './Microsoft.Network/Virtualhubs/deploy.bicep' = { +module VirtualHubs './Microsoft.Network/VirtualHubs/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-nvhmin' params: { // Required parameters From 4303129f896feb6c3a09b2e91153a371e6cf6822 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 8 Sep 2022 19:13:33 +0200 Subject: [PATCH 03/12] Updated folder default to common. --- .../.test/{default => common}/dependencies.bicep | 0 .../virtualHubs/.test/{default => common}/deploy.test.bicep | 0 modules/Microsoft.Network/virtualHubs/readme.md | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename modules/Microsoft.Network/virtualHubs/.test/{default => common}/dependencies.bicep (100%) rename modules/Microsoft.Network/virtualHubs/.test/{default => common}/deploy.test.bicep (100%) diff --git a/modules/Microsoft.Network/virtualHubs/.test/default/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/default/dependencies.bicep rename to modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/default/deploy.test.bicep rename to modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md index fcb4690e4f..027adaf629 100644 --- a/modules/Microsoft.Network/virtualHubs/readme.md +++ b/modules/Microsoft.Network/virtualHubs/readme.md @@ -112,14 +112,14 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Default

+

Example 1: Common

via Bicep module ```bicep -module VirtualHubs './Microsoft.Network/VirtualHubs/deploy.bicep' = { +module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-nvhdef' params: { // Required parameters @@ -228,7 +228,7 @@ module VirtualHubs './Microsoft.Network/VirtualHubs/deploy.bicep' = { via Bicep module ```bicep -module VirtualHubs './Microsoft.Network/VirtualHubs/deploy.bicep' = { +module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-nvhmin' params: { // Required parameters From 08a0429d6aa8989ba72a491b9832405f7129a986 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:51:46 +0200 Subject: [PATCH 04/12] Update to latest --- .../virtualHubs/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep index af2d6da907..ed0b7828a2 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep @@ -11,7 +11,7 @@ param resourceGroupName string = 'ms.network.virtualHub-${serviceShort}-rg' 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 = 'nvhdef' +param serviceShort string = 'nvhcom' // =========== // // Deployments // From 7383d5af0cb8157e40c4350d76b0c4c7bac37f5a Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:04:53 +0200 Subject: [PATCH 05/12] Update to latest --- .../virtualHubs/.test/common/deploy.test.bicep | 6 +++--- .../virtualHubs/.test/min/deploy.test.bicep | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep index ed0b7828a2..c4ee14c643 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/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.virtualHub-${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 = 'nvhcom' // =========== // diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep index f656f9e586..c29b2728d8 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/min/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.virtualHub-${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 = 'nvhmin' // =========== // From 65eb07fe92c23125dae19581600f580dc3fdccc3 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:56:24 +0200 Subject: [PATCH 06/12] Update to latest --- modules/Microsoft.Network/virtualHubs/readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Microsoft.Network/virtualHubs/readme.md index d80b4466f3..84fb3ec32a 100644 --- a/modules/Microsoft.Network/virtualHubs/readme.md +++ b/modules/Microsoft.Network/virtualHubs/readme.md @@ -121,11 +121,11 @@ The following module usage examples are retrieved from the content of the files ```bicep module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-test-nvhdef' + name: '${uniqueString(deployment().name)}-test-nvhcom' params: { // Required parameters addressPrefix: '10.1.0.0/16' - name: '<>-nvhdef' + name: '<>-nvhcom' virtualWanId: '' // Non-required parameters hubRouteTables: [ @@ -139,12 +139,12 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { remoteVirtualNetworkId: '' routingConfiguration: { associatedRouteTable: { - id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1' + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhcom/hubRouteTables/routeTable1' } propagatedRouteTables: { ids: [ { - id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1' + id: '${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhcom/hubRouteTables/routeTable1' } ] labels: [ @@ -176,7 +176,7 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { "value": "10.1.0.0/16" }, "name": { - "value": "<>-nvhdef" + "value": "<>-nvhcom" }, "virtualWanId": { "value": "" @@ -196,12 +196,12 @@ module virtualHubs './Microsoft.Network/virtualHubs/deploy.bicep' = { "remoteVirtualNetworkId": "", "routingConfiguration": { "associatedRouteTable": { - "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1" + "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhcom/hubRouteTables/routeTable1" }, "propagatedRouteTables": { "ids": [ { - "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhdef/hubRouteTables/routeTable1" + "id": "${resourceGroup.id}/providers/Microsoft.Network/virtualHubs/<>-nvhcom/hubRouteTables/routeTable1" } ], "labels": [ From 1a4cbebd679150838bdeb5f982469ac1b016a391 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 20:00:58 +0200 Subject: [PATCH 07/12] Update modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep --- .../virtualHubs/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep index c4ee14c643..35d192e34e 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/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.virtualHub-${serviceShort}-rg' From a39e16bd83eaff22182d1c60a045e145dc0b9a84 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 20:01:23 +0200 Subject: [PATCH 08/12] Update modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep --- .../Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep b/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep index c29b2728d8..ed05199222 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/min/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.virtualHub-${serviceShort}-rg' From d59cff01fd94290a7fed51d241593efc9ed4fdae Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 19 Sep 2022 21:19:32 +0200 Subject: [PATCH 09/12] 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 4af6157495fdc58842b4703b259af018e71d01c8 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Thu, 29 Sep 2022 22:45:15 +0200 Subject: [PATCH 10/12] Update modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../virtualHubs/.test/common/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep index ccdcc86da6..1c2a0791af 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep @@ -33,7 +33,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { } } -@description('The resource ID of the created Virtual WAN') +@description('The resource ID of the created Virtual WAN.') output virtualWWANResourceId string = virtualWan.id @description('The resource ID of the created Virtual Network') From e4b1ececd57927ecc8cfc270538acb7d8c4736df Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Thu, 29 Sep 2022 22:45:21 +0200 Subject: [PATCH 11/12] Update modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../virtualHubs/.test/common/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep index 1c2a0791af..7db5ca6bd0 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep @@ -36,5 +36,5 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { @description('The resource ID of the created Virtual WAN.') output virtualWWANResourceId string = virtualWan.id -@description('The resource ID of the created Virtual Network') +@description('The resource ID of the created Virtual Network.') output virtualNetworkResourceId string = virtualNetwork.id From e23e6af22292850387c69e5457499e3d903ab4b6 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Thu, 29 Sep 2022 22:45:29 +0200 Subject: [PATCH 12/12] Update modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.Network/virtualHubs/.test/min/dependencies.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep index 33c8d7907d..6b1819ebea 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep @@ -9,5 +9,5 @@ resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' = { location: location } -@description('The resource ID of the created Virtual WAN') +@description('The resource ID of the created Virtual WAN.') output virtualWWANResourceId string = virtualWan.id