From 501fe20ce37f5548a225f6674d704f49358f2b3a Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Fri, 2 Dec 2022 15:03:07 +0100 Subject: [PATCH 1/9] Update to latest --- .../service/.test/max/dependencies.bicep | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep b/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep index 486d972626..48e38fb6b0 100644 --- a/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep +++ b/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep @@ -11,8 +11,6 @@ param location string = resourceGroup().location @secure() param customSecret string = newGuid() -var keyVaultSecretName = 'apimclientsecret' - resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { name: managedIdentityName location: location @@ -36,7 +34,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = { } resource secret 'secrets@2022-07-01' = { - name: keyVaultSecretName + name: 'apimclientsecret' properties: { value: customSecret } From ff45fa5768ce088ad5cc8c5a88597364f23d67a6 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Fri, 2 Dec 2022 15:19:34 +0100 Subject: [PATCH 2/9] Update to latest --- docs/wiki/The library - Module design.md | 1 + .../.test/linux/dependencies.bicep | 5 ++--- .../.test/windows/dependencies.bicep | 5 ++--- .../virtualMachines/.test/linux/dependencies.bicep | 10 ++++------ .../virtualMachines/.test/windows/dependencies.bicep | 10 ++++------ .../.test/common/dependencies.bicep | 4 +--- .../managedInstances/.test/common/dependencies.bicep | 3 +-- .../managedInstances/.test/min/dependencies.bicep | 3 +-- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md index 5bc473fce7..a7d01dbfd4 100644 --- a/docs/wiki/The library - Module design.md +++ b/docs/wiki/The library - Module design.md @@ -567,6 +567,7 @@ In addition, they follow these file-type-specific guidelines: - If the module deploys a resource group level resource, the template should further have a `resourceGroupName` parameter and subsequent resource deployment. As a reference for the default name you can use `ms..-${serviceShort}-test-rg`. - Each file should also provide a `location` parameter that may default to the deployments default location - It is recommended to define all major resource names in the `deploy.test.bicep` file as it makes later maintenance easier. To implement this, make sure to pass all resource names to any referenced module. + - Further, for any test file, the usage of variables should be reduced to the absolute minimum. In other words: You should only use variables if you must use them in more than one place. The idea is to keep the test files as simple as possible - References to dependencies should be implemented using resource references in combination with outputs. In other words: You should not hardcode any references into the module template's deployment. Instead use references such as `resourceGroupResources.outputs.managedIdentityPrincipalId` - If any diagnostic resources (e.g., a Log Analytics workspace) are required for a test scenario, you can reference the centralized `modules/.shared/dependencyConstructs/diagnostic.dependencies.bicep` template. It will also provide you with all outputs you'd need. diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep index dc4e1fa522..11cf0a7c6e 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep @@ -22,7 +22,6 @@ param sshDeploymentScriptName string @description('Required. The name of the SSH Key to create.') param sshKeyName string -var storageContainerName = 'scripts' var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { @@ -107,7 +106,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: 'default' resource container 'containers@2021-09-01' = { - name: storageContainerName + name: 'scripts' } } } @@ -187,7 +186,7 @@ output storageAccountName string = storageAccount.name output storageAccountResourceId string = storageAccount.id @description('The URL of the Custom Script Extension in the created Storage Account') -output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageContainerName}/${storageAccountCSEFileName}' +output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageAccount::blobService::container.name}/${storageAccountCSEFileName}' @description('The Public Key of the created SSH Key') output SSHKeyPublicKey string = sshKey.properties.publicKey diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep index 7e55210407..9a45dc25c6 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep @@ -19,7 +19,6 @@ param managedIdentityName string @description('Required. The name of the Proximity Placement Group to create.') param proximityPlacementGroupName string -var storageContainerName = 'scripts' var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { @@ -104,7 +103,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: 'default' resource container 'containers@2021-09-01' = { - name: storageContainerName + name: 'scripts' } } } @@ -157,7 +156,7 @@ output keyVaultEncryptionKeyUrl string = keyVault::key.properties.keyUriWithVers output storageAccountResourceId string = storageAccount.id @description('The URL of the Custom Script Extension in the created Storage Account') -output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageContainerName}/${storageAccountCSEFileName}' +output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageAccount::blobService::container.name}/${storageAccountCSEFileName}' @description('The name of the Custom Script Extension in the created Storage Account') output storageAccountCSEFileName string = storageAccountCSEFileName diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep index ca2c8d0628..e8a9c9bcc8 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep @@ -31,9 +31,7 @@ param sshKeyName string @description('Optional. The location to deploy to.') param location string = resourceGroup().location -var storageContainerName = 'scripts' var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' -var backupPolicyName = 'backupPolicy' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -109,7 +107,7 @@ resource recoveryServicesVault 'Microsoft.RecoveryServices/vaults@2022-04-01' = } resource backupPolicy 'backupPolicies@2022-03-01' = { - name: backupPolicyName + name: 'backupPolicy' properties: { backupManagementType: 'AzureIaasVM' instantRPDetails: {} @@ -238,7 +236,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: 'default' resource container 'containers@2021-09-01' = { - name: storageContainerName + name: 'scripts' } } } @@ -315,7 +313,7 @@ output recoveryServicesVaultName string = recoveryServicesVault.name output recoveryServicesVaultResourceGroupName string = resourceGroup().name @description('The name of the Backup Policy created in the Backup Recovery Vault.') -output recoveryServicesVaultBackupPolicyName string = backupPolicyName +output recoveryServicesVaultBackupPolicyName string = recoveryServicesVault::backupPolicy.name @description('The resource ID of the created Key Vault.') output keyVaultResourceId string = keyVault.id @@ -330,7 +328,7 @@ output keyVaultEncryptionKeyUrl string = keyVault::key.properties.keyUriWithVers output storageAccountResourceId string = storageAccount.id @description('The URL of the Custom Script Extension in the created Storage Account.') -output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageContainerName}/${storageAccountCSEFileName}' +output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageAccount::blobService::container.name}/${storageAccountCSEFileName}' @description('The name of the Custom Script Extension in the created Storage Account') output storageAccountCSEFileName string = storageAccountCSEFileName diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep index e55490885b..a817eb6280 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep @@ -28,9 +28,7 @@ param proximityPlacementGroupName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var storageContainerName = 'scripts' var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' -var backupPolicyName = 'backupPolicy' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -106,7 +104,7 @@ resource recoveryServicesVault 'Microsoft.RecoveryServices/vaults@2022-04-01' = } resource backupPolicy 'backupPolicies@2022-03-01' = { - name: backupPolicyName + name: 'backupPolicy' properties: { backupManagementType: 'AzureIaasVM' instantRPDetails: {} @@ -235,7 +233,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: 'default' resource container 'containers@2021-09-01' = { - name: storageContainerName + name: 'scripts' } } } @@ -288,7 +286,7 @@ output recoveryServicesVaultName string = recoveryServicesVault.name output recoveryServicesVaultResourceGroupName string = resourceGroup().name @description('The name of the Backup Policy created in the Backup Recovery Vault.') -output recoveryServicesVaultBackupPolicyName string = backupPolicyName +output recoveryServicesVaultBackupPolicyName string = recoveryServicesVault::backupPolicy.name @description('The resource ID of the created Key Vault.') output keyVaultResourceId string = keyVault.id @@ -306,7 +304,7 @@ output storageAccountResourceId string = storageAccount.id output storageAccountCSEFileName string = storageAccountCSEFileName @description('The URL of the Custom Script Extension in the created Storage Account') -output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageContainerName}/${storageAccountCSEFileName}' +output storageAccountCSEFileUrl string = '${storageAccount.properties.primaryEndpoints.blob}${storageAccount::blobService::container.name}/${storageAccountCSEFileName}' @description('The resource ID of the created Proximity Placement Group.') output proximityPlacementGroupResourceId string = proximityPlacementGroup.id diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep b/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep index 19ccd21a1d..acfa4cdc09 100644 --- a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep @@ -16,8 +16,6 @@ param keyVaultName string @description('Required. The name of the Deployment Script to create for the Certificate generation.') param certDeploymentScriptName string -var CertName = 'applicationGatewaySslCertificate' - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location @@ -96,7 +94,7 @@ resource certDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' properties: { azPowerShellVersion: '8.0' retentionInterval: 'P1D' - arguments: '-KeyVaultName "${keyVault.name}" -CertName "${CertName}"' + arguments: '-KeyVaultName "${keyVault.name}" -CertName "applicationGatewaySslCertificate"' scriptContent: loadTextContent('../.scripts/New-Certificate.ps1') } } diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep index 2b12c654c5..c118de3373 100644 --- a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep +++ b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep @@ -16,7 +16,6 @@ param keyVaultName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var sqlMiVnetAddressPrefix = '10.0.0.0/16' var sqlMiSubnetAddressPrefix = '10.0.0.0/24' var sqlMiSubnetAddressPrefixString = replace(replace(sqlMiSubnetAddressPrefix, '.', '-'), '/', '-') @@ -263,7 +262,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - sqlMiVnetAddressPrefix + '10.0.0.0/16' ] } subnets: [ diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep b/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep index 43f7e59e19..08e97efca0 100644 --- a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep +++ b/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep @@ -10,7 +10,6 @@ param routeTableName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var sqlMiVnetAddressPrefix = '10.0.0.0/16' var sqlMiSubnetAddressPrefix = '10.0.0.0/24' var sqlMiSubnetAddressPrefixString = replace(replace(sqlMiSubnetAddressPrefix, '.', '-'), '/', '-') @@ -257,7 +256,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - sqlMiVnetAddressPrefix + '10.0.0.0/16' ] } subnets: [ From 4605adcdd334c9384eb7b96d7982b647a7527cd1 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:18:34 +0100 Subject: [PATCH 3/9] Updated vnet handling --- .../.test/common/dependencies.bicep | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep index c118de3373..c1d723234e 100644 --- a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep +++ b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep @@ -16,8 +16,9 @@ param keyVaultName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var sqlMiSubnetAddressPrefix = '10.0.0.0/24' -var sqlMiSubnetAddressPrefixString = replace(replace(sqlMiSubnetAddressPrefix, '.', '-'), '/', '-') +var vnetAddressPrefix = '10.0.0.0/16' +var subnetAddressPrefix = '10.0.0.0/24' +var subnetAddressPrefixString = replace(replace(subnetAddressPrefix, '.', '-'), '/', '-') resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName @@ -25,13 +26,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 properties: { securityRules: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI provisioning Control Plane Deployment and Authentication Service' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'SqlManagement' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 100 direction: 'Inbound' @@ -45,13 +46,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI Supportability' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetSaw' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 101 direction: 'Inbound' @@ -63,13 +64,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI Supportability through Corpnet ranges' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetPublic' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 102 direction: 'Inbound' @@ -80,40 +81,40 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${subnetAddressPrefixString}-v10' properties: { description: 'Allow Azure Load Balancer inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' sourceAddressPrefix: 'AzureLoadBalancer' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 103 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI internal inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix - destinationAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 104 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI services outbound traffic over https' protocol: 'Tcp' sourcePortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: subnetAddressPrefix destinationAddressPrefix: 'AzureCloud' access: 'Allow' priority: 100 @@ -125,14 +126,14 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${subnetAddressPrefixString}-v10' properties: { description: 'Allow MI internal outbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix - destinationAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: subnetAddressPrefix access: 'Allow' priority: 101 direction: 'Outbound' @@ -149,9 +150,9 @@ resource routeTable 'Microsoft.Network/routeTables@2021-08-01' = { disableBgpRoutePropagation: false routes: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${sqlMiSubnetAddressPrefixString}-to-vnetlocal' + name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${subnetAddressPrefixString}-to-vnetlocal' properties: { - addressPrefix: sqlMiSubnetAddressPrefix + addressPrefix: subnetAddressPrefix nextHopType: 'VnetLocal' hasBgpOverride: false } @@ -262,14 +263,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + vnetAddressPrefix ] } subnets: [ { name: 'ManagedInstance' properties: { - addressPrefix: sqlMiSubnetAddressPrefix + addressPrefix: subnetAddressPrefix routeTable: { id: routeTable.id } From 77c57514adf206ed44bf94659ffccb628aea7f1f Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:19:32 +0100 Subject: [PATCH 4/9] Updated vnet handling --- .../.test/common/dependencies.bicep | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep index c1d723234e..9f671c7f51 100644 --- a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep +++ b/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep @@ -16,9 +16,8 @@ param keyVaultName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var vnetAddressPrefix = '10.0.0.0/16' -var subnetAddressPrefix = '10.0.0.0/24' -var subnetAddressPrefixString = replace(replace(subnetAddressPrefix, '.', '-'), '/', '-') +var addressPrefix = '10.0.0.0/16' +var addressPrefixString = replace(replace(addressPrefix, '.', '-'), '/', '-') resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName @@ -26,13 +25,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 properties: { securityRules: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${addressPrefixString}-v10' properties: { description: 'Allow MI provisioning Control Plane Deployment and Authentication Service' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'SqlManagement' - destinationAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 100 direction: 'Inbound' @@ -46,13 +45,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${addressPrefixString}-v10' properties: { description: 'Allow MI Supportability' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetSaw' - destinationAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 101 direction: 'Inbound' @@ -64,13 +63,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${addressPrefixString}-v10' properties: { description: 'Allow MI Supportability through Corpnet ranges' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetPublic' - destinationAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 102 direction: 'Inbound' @@ -81,40 +80,40 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${addressPrefixString}-v10' properties: { description: 'Allow Azure Load Balancer inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' sourceAddressPrefix: 'AzureLoadBalancer' - destinationAddressPrefix: subnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 103 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${addressPrefixString}-v10' properties: { description: 'Allow MI internal inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: subnetAddressPrefix - destinationAddressPrefix: subnetAddressPrefix + sourceAddressPrefix: addressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 104 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${addressPrefixString}-v10' properties: { description: 'Allow MI services outbound traffic over https' protocol: 'Tcp' sourcePortRange: '*' - sourceAddressPrefix: subnetAddressPrefix + sourceAddressPrefix: addressPrefix destinationAddressPrefix: 'AzureCloud' access: 'Allow' priority: 100 @@ -126,14 +125,14 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${subnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${addressPrefixString}-v10' properties: { description: 'Allow MI internal outbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: subnetAddressPrefix - destinationAddressPrefix: subnetAddressPrefix + sourceAddressPrefix: addressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 101 direction: 'Outbound' @@ -150,9 +149,9 @@ resource routeTable 'Microsoft.Network/routeTables@2021-08-01' = { disableBgpRoutePropagation: false routes: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${subnetAddressPrefixString}-to-vnetlocal' + name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${addressPrefixString}-to-vnetlocal' properties: { - addressPrefix: subnetAddressPrefix + addressPrefix: addressPrefix nextHopType: 'VnetLocal' hasBgpOverride: false } @@ -263,14 +262,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - vnetAddressPrefix + addressPrefix ] } subnets: [ { name: 'ManagedInstance' properties: { - addressPrefix: subnetAddressPrefix + addressPrefix: addressPrefix routeTable: { id: routeTable.id } From 285cec0abd128468fa6ad1d2f65095accb53d82b Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:25:45 +0100 Subject: [PATCH 5/9] Updated address space usage --- .../.test/pe/dependencies.bicep | 6 ++- .../.test/linux.ssecmk/dependencies.bicep | 6 ++- .../.test/linux.atmg/dependencies.bicep | 6 ++- .../.test/linux.min/dependencies.bicep | 6 ++- .../.test/linux/dependencies.bicep | 5 ++- .../.test/windows.atmg/dependencies.bicep | 6 ++- .../.test/windows.min/dependencies.bicep | 6 ++- .../.test/windows.ssecmk/dependencies.bicep | 6 ++- .../.test/windows/dependencies.bicep | 5 ++- .../.test/common/dependencies.bicep | 8 ++-- .../.test/min/dependencies.bicep | 44 +++++++++---------- .../servers/.test/pe/dependencies.bicep | 8 ++-- 12 files changed, 66 insertions(+), 46 deletions(-) diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep index 14afb1f1b4..a92ed9b76a 100644 --- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep +++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param virtualNetworkName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep index 46fc01f371..c151582fc4 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep @@ -19,20 +19,22 @@ param sshKeyName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep index 5f11adedc9..213b7d0df1 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep @@ -13,20 +13,22 @@ param sshKeyName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep index e54a7b691d..10f13067f5 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep @@ -13,20 +13,22 @@ param sshKeyName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep index e8a9c9bcc8..9a239dbc8e 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep @@ -32,6 +32,7 @@ param sshKeyName string param location string = resourceGroup().location var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' +var addressPrefix = '10.0.0.0/16' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -39,14 +40,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep index 543caab37f..51d5f6bb36 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep @@ -4,20 +4,22 @@ param virtualNetworkName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep index d4eef6887c..4157fbe2b2 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep @@ -4,20 +4,22 @@ param virtualNetworkName string @description('Optional. The location to deploy to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep index b6d2d768ef..7f2ed7d2ce 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep @@ -10,20 +10,22 @@ param diskEncryptionSetName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep b/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep index a817eb6280..9f7d6b1b0b 100644 --- a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep @@ -29,6 +29,7 @@ param proximityPlacementGroupName string param location string = resourceGroup().location var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' +var addressPrefix = '10.0.0.0/16' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -36,14 +37,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep index 7db5ca6bd0..f721d7d00d 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep @@ -7,6 +7,8 @@ param virtualNetworkName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' = { name: virtualWANName location: location @@ -18,15 +20,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { - name: 'sxx-subnet-01' + name: 'default-subnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep b/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep index 08e97efca0..0f5dc286b8 100644 --- a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep +++ b/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep @@ -10,8 +10,8 @@ param routeTableName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location -var sqlMiSubnetAddressPrefix = '10.0.0.0/24' -var sqlMiSubnetAddressPrefixString = replace(replace(sqlMiSubnetAddressPrefix, '.', '-'), '/', '-') +var addressPrefix = '10.0.0.0/16' +var addressPrefixString = replace(replace(addressPrefix, '.', '-'), '/', '-') resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName @@ -19,13 +19,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 properties: { securityRules: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-sqlmgmt-in-${addressPrefixString}-v10' properties: { description: 'Allow MI provisioning Control Plane Deployment and Authentication Service' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'SqlManagement' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 100 direction: 'Inbound' @@ -39,13 +39,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corpsaw-in-${addressPrefixString}-v10' properties: { description: 'Allow MI Supportability' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetSaw' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 101 direction: 'Inbound' @@ -57,13 +57,13 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-corppublic-in-${addressPrefixString}-v10' properties: { description: 'Allow MI Supportability through Corpnet ranges' protocol: 'Tcp' sourcePortRange: '*' sourceAddressPrefix: 'CorpNetPublic' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 102 direction: 'Inbound' @@ -74,40 +74,40 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-healthprobe-in-${addressPrefixString}-v10' properties: { description: 'Allow Azure Load Balancer inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' sourceAddressPrefix: 'AzureLoadBalancer' - destinationAddressPrefix: sqlMiSubnetAddressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 103 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-in-${addressPrefixString}-v10' properties: { description: 'Allow MI internal inbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix - destinationAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: addressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 104 direction: 'Inbound' } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-services-out-${addressPrefixString}-v10' properties: { description: 'Allow MI services outbound traffic over https' protocol: 'Tcp' sourcePortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: addressPrefix destinationAddressPrefix: 'AzureCloud' access: 'Allow' priority: 100 @@ -119,14 +119,14 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 } } { - name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${sqlMiSubnetAddressPrefixString}-v10' + name: 'Microsoft.Sql-managedInstances_UseOnly_mi-internal-out-${addressPrefixString}-v10' properties: { description: 'Allow MI internal outbound traffic' protocol: '*' sourcePortRange: '*' destinationPortRange: '*' - sourceAddressPrefix: sqlMiSubnetAddressPrefix - destinationAddressPrefix: sqlMiSubnetAddressPrefix + sourceAddressPrefix: addressPrefix + destinationAddressPrefix: addressPrefix access: 'Allow' priority: 101 direction: 'Outbound' @@ -143,9 +143,9 @@ resource routeTable 'Microsoft.Network/routeTables@2021-08-01' = { disableBgpRoutePropagation: false routes: [ { - name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${sqlMiSubnetAddressPrefixString}-to-vnetlocal' + name: 'Microsoft.Sql-managedInstances_UseOnly_subnet-${addressPrefixString}-to-vnetlocal' properties: { - addressPrefix: sqlMiSubnetAddressPrefix + addressPrefix: addressPrefix nextHopType: 'VnetLocal' hasBgpOverride: false } @@ -256,14 +256,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'ManagedInstance' properties: { - addressPrefix: sqlMiSubnetAddressPrefix + addressPrefix: addressPrefix routeTable: { id: routeTable.id } diff --git a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep b/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep index 0978822027..3ba852a304 100644 --- a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep +++ b/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep @@ -4,21 +4,23 @@ param virtualNetworkName string @description('Optional. The location to deploy resources to.') param location string = resourceGroup().location +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { - name: 'sxx-subnet-pe-01' + name: 'default-subnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] From e76e078b185d6ca98d65900e0eea67cce4ea07d6 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:31:44 +0100 Subject: [PATCH 6/9] Updated address space usage --- .../DomainServices/.test/common/dependencies.bicep | 5 +++-- .../automationAccounts/.test/common/dependencies.bicep | 6 ++++-- .../batchAccounts/.test/common/dependencies.bicep | 6 ++++-- .../batchAccounts/.test/encr/dependencies.bicep | 6 ++++-- .../Microsoft.Cache/redis/.test/common/dependencies.bicep | 6 ++++-- .../accounts/.test/encr/dependencies.bicep | 6 ++++-- .../accounts/.test/speech/dependencies.bicep | 6 ++++-- .../.test/linux.min/dependencies.bicep | 6 ++++-- .../virtualMachineScaleSets/.test/linux/dependencies.bicep | 5 +++-- .../.test/windows.min/dependencies.bicep | 6 ++++-- .../.test/windows/dependencies.bicep | 5 +++-- .../registries/.test/common/dependencies.bicep | 6 ++++-- .../registries/.test/encr/dependencies.bicep | 6 ++++-- .../registries/.test/pe/dependencies.bicep | 6 ++++-- .../factories/.test/common/dependencies.bicep | 6 ++++-- .../topics/.test/common/dependencies.bicep | 6 ++++-- .../Microsoft.EventGrid/topics/.test/pe/dependencies.bicep | 6 ++++-- .../privateLinkScopes/.test/common/dependencies.bicep | 6 ++++-- .../Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep | 6 ++++-- .../workspaces/.test/common/dependencies.bicep | 6 ++++-- .../workspaces/.test/encr/dependencies.bicep | 6 ++++-- .../applicationGateways/.test/common/dependencies.bicep | 6 ++++-- .../loadBalancers/.test/internal/dependencies.bicep | 6 ++++-- .../networkInterfaces/.test/common/dependencies.bicep | 6 ++++-- .../networkInterfaces/.test/min/dependencies.bicep | 6 ++++-- .../networkWatchers/.test/common/dependencies.bicep | 6 ++++-- .../privateDnsZones/.test/common/dependencies.bicep | 6 ++++-- .../privateEndpoints/.test/common/dependencies.bicep | 6 ++++-- .../privateEndpoints/.test/min/dependencies.bicep | 6 ++++-- .../virtualHubs/.test/common/dependencies.bicep | 2 +- .../vaults/.test/common/dependencies.bicep | 6 ++++-- .../namespaces/.test/common/dependencies.bicep | 6 ++++-- .../namespaces/.test/encr/dependencies.bicep | 6 ++++-- .../namespaces/.test/pe/dependencies.bicep | 6 ++++-- modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep | 2 +- .../workspaces/.test/common/dependencies.bicep | 6 ++++-- .../sites/.test/functionAppCommon/dependencies.bicep | 6 ++++-- .../sites/.test/webAppCommon/dependencies.bicep | 6 ++++-- .../staticSites/.test/common/dependencies.bicep | 6 ++++-- 39 files changed, 147 insertions(+), 76 deletions(-) diff --git a/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep b/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep index 4a13b87479..6347cdb897 100644 --- a/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep +++ b/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep @@ -15,6 +15,7 @@ param certDeploymentScriptName string var certPWSecretName = 'pfxCertificatePassword' var certSecretName = 'pfxBase64Certificate' +var addressPrefix = '10.0.0.0/16' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -22,14 +23,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep b/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep index 0fee983b7b..c9e11ef44b 100644 --- a/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep +++ b/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param keyVaultName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep b/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep index 446a125411..cc88fbffef 100644 --- a/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep +++ b/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep @@ -10,6 +10,8 @@ param managedIdentityName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: storageAccountName location: location @@ -25,14 +27,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep b/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep index 576465d4c1..fc58da5894 100644 --- a/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep +++ b/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep @@ -13,6 +13,8 @@ param managedIdentityName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: storageAccountName location: location @@ -28,14 +30,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep b/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep index a0300f449e..e3f77c7003 100644 --- a/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep +++ b/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep b/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep index 93aa8495b2..1fec321793 100644 --- a/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep +++ b/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep @@ -10,20 +10,22 @@ param managedIdentityName string @description('Required. The name of the Key Vault to create.') param keyVaultName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep b/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep index fd7c492403..9f1d9f6634 100644 --- a/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep +++ b/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep index 42242725f6..8bc6ecd52c 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep @@ -13,20 +13,22 @@ param sshDeploymentScriptName string @description('Required. The name of the SSH Key to create.') param sshKeyName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep index 11cf0a7c6e..07a0220bef 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep @@ -23,6 +23,7 @@ param sshDeploymentScriptName string param sshKeyName string var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' +var addressPrefix = '10.0.0.0/16' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -30,14 +31,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep index 12d074b6a7..35801ed823 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep index 9a45dc25c6..9e5ddbf970 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep @@ -20,6 +20,7 @@ param managedIdentityName string param proximityPlacementGroupName string var storageAccountCSEFileName = 'scriptExtensionMasterInstaller.ps1' +var addressPrefix = '10.0.0.0/16' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName @@ -27,14 +28,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep b/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep index 5fec9e40cc..a1cf849490 100644 --- a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep +++ b/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep b/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep index 641bfbe2fb..1ccddcada9 100644 --- a/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep +++ b/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep @@ -10,20 +10,22 @@ param keyVaultName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep b/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep index 20a8ab60ea..b40eceeecc 100644 --- a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep +++ b/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep b/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep index 5317c0c39b..0a65641473 100644 --- a/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep +++ b/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep @@ -13,20 +13,22 @@ param managedIdentityName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep b/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep index d1fabdb239..1281808844 100644 --- a/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep +++ b/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep b/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep index 7b6231994f..36760779bc 100644 --- a/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep +++ b/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep b/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep index 75805034a2..3b81287ace 100644 --- a/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep +++ b/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param managedIdentityName string @description('Required. The name of the Log Analytics Workspace to create.') param logAnalyticsWorkspaceName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep b/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep index 5f00a308a1..688f2f2797 100644 --- a/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep +++ b/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep b/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep index 2829f2a4e5..e8d05c137c 100644 --- a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep +++ b/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep @@ -16,20 +16,22 @@ param applicationInsightsName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep b/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep index 3b36df5dc2..40e4a128ef 100644 --- a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep +++ b/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep @@ -18,20 +18,22 @@ param applicationInsightsName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep b/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep index acfa4cdc09..36f9944f20 100644 --- a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep @@ -16,20 +16,22 @@ param keyVaultName string @description('Required. The name of the Deployment Script to create for the Certificate generation.') param certDeploymentScriptName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep b/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep index c45afc0d82..a0ce801b74 100644 --- a/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep +++ b/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep b/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep index a6c15600bc..f0b711e434 100644 --- a/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep @@ -13,20 +13,22 @@ param applicationSecurityGroupName string @description('Required. The name of the Load Balancer Backend Address Pool to create.') param loadBalancerName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep b/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep index 91351ab840..978d8fa796 100644 --- a/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep b/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep index d5183b7fd4..e9c49b8ddc 100644 --- a/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep @@ -20,20 +20,22 @@ param virtualMachineName string @secure() param password string = newGuid() +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep index a3cab26da9..581b2cd449 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep b/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep index a516c02970..39fcecbe59 100644 --- a/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep @@ -13,20 +13,22 @@ param managedIdentityName string @description('Required. The name of the Application Security Group to create.') param applicationSecurityGroupName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep b/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep index ad2ed286f2..6237b32712 100644 --- a/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Key Vault to create.') param keyVaultName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep index f721d7d00d..1c86b0f68e 100644 --- a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep @@ -25,7 +25,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { } subnets: [ { - name: 'default-subnet' + name: 'defaultSubnet' properties: { addressPrefix: addressPrefix diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep b/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep index 3ac6c39683..416aefa8b7 100644 --- a/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep +++ b/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep b/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep index 3f8f9b1c52..e551480248 100644 --- a/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep +++ b/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep b/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep index e3283a67bb..598f2ef701 100644 --- a/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep +++ b/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { name: managedIdentityName location: location @@ -21,14 +23,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep b/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep index 711d47f7ee..e84295c592 100644 --- a/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep +++ b/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep b/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep index 3ba852a304..03ec3c24c9 100644 --- a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep +++ b/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep @@ -17,7 +17,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { } subnets: [ { - name: 'default-subnet' + name: 'defaultSubnet' properties: { addressPrefix: addressPrefix diff --git a/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep b/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep index 13d66a25e1..ff04548e32 100644 --- a/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep +++ b/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { name: managedIdentityName location: location @@ -21,14 +23,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep b/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep index fdcc085b31..6f7f7f7cb3 100644 --- a/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep +++ b/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep @@ -16,20 +16,22 @@ param storageAccountName string @description('Required. The name of the Application Insights instance to create.') param applicationInsightsName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep b/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep index 542edbb9e5..8ce6b01cc0 100644 --- a/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep +++ b/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep @@ -10,20 +10,22 @@ param managedIdentityName string @description('Required. The name of the Server Farm to create.') param serverFarmName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep b/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep index 6342518c23..83aa7bcd46 100644 --- a/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep +++ b/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep @@ -13,20 +13,22 @@ param siteName string @description('Required. The name of the Server Farm to create.') param serverFarmName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] From 4d3070ea9a3579d9937b93a9856e969b36a9db82 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:35:42 +0100 Subject: [PATCH 7/9] Update to latest --- .../accounts/.test/common/dependencies.bicep | 6 ++++-- .../flexibleServers/.test/private/dependencies.bicep | 6 ++++-- .../namespaces/.test/common/dependencies.bicep | 6 ++++-- .../namespaces/.test/pe/dependencies.bicep | 6 ++++-- .../vaults/.test/common/dependencies.bicep | 6 ++++-- .../netAppAccounts/.test/nfs3/dependencies.bicep | 6 ++++-- .../netAppAccounts/.test/nfs41/dependencies.bicep | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep b/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep index 60e25dc5e0..257b8ac137 100644 --- a/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep +++ b/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.CognitiveServices' diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep b/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep index 0324dbcc0d..59a6c539b6 100644 --- a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep +++ b/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix delegations: [ { name: 'Microsoft.DBforPostgreSQL.flexibleServers' diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep index d04b499e87..c0ea09afc0 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param managedIdentityName string @description('Required. The name of the Storage Account to create.') param storageAccountName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.EventHub' diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep index 4e869fa70c..a5642c092a 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.EventHub' diff --git a/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep b/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep index 5119944dd2..064a1f10d8 100644 --- a/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep +++ b/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.KeyVault' diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep index 1e484ccd9a..f360ac3c90 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix delegations: [ { name: 'netappDel' diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep index 1e484ccd9a..f360ac3c90 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix delegations: [ { name: 'netappDel' From 9f1ebb8821e1fa61c7e6a92c9f63a6a1d638d81d Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 27 Dec 2022 11:41:33 +0100 Subject: [PATCH 8/9] Update to latest --- .../azureFirewalls/.test/addpip/dependencies.bicep | 6 ++++-- .../azureFirewalls/.test/common/dependencies.bicep | 6 ++++-- .../azureFirewalls/.test/custompip/dependencies.bicep | 6 ++++-- .../azureFirewalls/.test/min/dependencies.bicep | 6 ++++-- .../bastionHosts/.test/common/dependencies.bicep | 6 ++++-- .../bastionHosts/.test/custompip/dependencies.bicep | 6 ++++-- .../bastionHosts/.test/min/dependencies.bicep | 6 ++++-- .../storageAccounts/.test/encr/dependencies.bicep | 6 ++++-- .../privateLinkHubs/.test/common/dependencies.bicep | 6 ++++-- .../hostingEnvironments/.test/asev2/dependencies.bicep | 8 +++++--- .../hostingEnvironments/.test/asev3/dependencies.bicep | 6 ++++-- 11 files changed, 45 insertions(+), 23 deletions(-) diff --git a/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep b/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep index 3ba1faf83b..8d8fc50017 100644 --- a/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep +++ b/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Public IP to create.') param publicIPName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureFirewallSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep b/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep index a889aeb149..d8b4279427 100644 --- a/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param publicIPName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureFirewallSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep b/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep index a6ab54882e..1748a2e50c 100644 --- a/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep +++ b/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureFirewallSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep b/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep index 5d70333cf0..bd6b937f6e 100644 --- a/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureFirewallSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep b/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep index 53311deb6c..6cb3743d3c 100644 --- a/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param publicIPName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureBastionSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep b/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep index c05d23eeb9..7f9f2ef02b 100644 --- a/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep +++ b/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureBastionSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep b/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep index 8b08c39916..a2cb671f61 100644 --- a/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'AzureBastionSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep b/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep index 6ba3295226..6dc0c63aaf 100644 --- a/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep +++ b/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = { name: keyVaultName location: location @@ -42,14 +44,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.Storage' diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep b/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep index b69a8bc5a1..d03ab875f4 100644 --- a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep +++ b/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName location: location @@ -23,14 +25,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix networkSecurityGroup: { id: networkSecurityGroup.id } diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep b/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep index 846bbb4ea7..57e095a001 100644 --- a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep +++ b/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName location: location @@ -19,7 +21,7 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-0 name: 'AllowPortsForASE2' properties: { access: 'Allow' - destinationAddressPrefix: '10.0.9.0/24' + destinationAddressPrefix: addressPrefix destinationPortRange: '454-455' direction: 'Inbound' priority: 1020 @@ -38,14 +40,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.9.0/24' + addressPrefix: addressPrefix networkSecurityGroup: { id: networkSecurityGroup.id } diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep b/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep index 3c800a0ba9..56572c8429 100644 --- a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep +++ b/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep @@ -10,6 +10,8 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-08-01' = { name: networkSecurityGroupName location: location @@ -38,14 +40,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.7.0/24' + addressPrefix: addressPrefix networkSecurityGroup: { id: networkSecurityGroup.id } From a276212e5754ecba7b532f055e112583373b4787 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Thu, 29 Dec 2022 17:29:09 +0100 Subject: [PATCH 9/9] Updated renmaining var --- .../privateLinkServices/.test/common/dependencies.bicep | 6 ++++-- .../privateLinkServices/.test/min/dependencies.bicep | 6 ++++-- .../virtualNetworkGateways/.test/aadvpn/dependencies.bicep | 6 ++++-- .../.test/expressRoute/dependencies.bicep | 6 ++++-- .../virtualNetworkGateways/.test/vpn/dependencies.bicep | 6 ++++-- .../virtualNetworks/.test/vnetPeering/dependencies.bicep | 6 ++++-- .../webPubSub/.test/common/dependencies.bicep | 6 ++++-- .../webPubSub/.test/pe/dependencies.bicep | 6 ++++-- .../storageAccounts/.test/common/dependencies.bicep | 6 ++++-- 9 files changed, 36 insertions(+), 18 deletions(-) diff --git a/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep b/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep index 971e8062cb..3bcae47f46 100644 --- a/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep +++ b/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep @@ -10,20 +10,22 @@ param loadBalancerName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix privateLinkServiceNetworkPolicies: 'Disabled' } } diff --git a/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep b/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep index f1294291f9..7eb2bf4a46 100644 --- a/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep +++ b/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Load Balancer to create.') param loadBalancerName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix privateLinkServiceNetworkPolicies: 'Disabled' } } diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep index 044d115b84..49ffdf8cda 100644 --- a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep +++ b/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'GatewaySubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep index 044d115b84..49ffdf8cda 100644 --- a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep +++ b/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'GatewaySubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep b/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep index 044d115b84..49ffdf8cda 100644 --- a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep +++ b/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'GatewaySubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep b/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep index 60f4350ac5..249436cb05 100644 --- a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep +++ b/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.1.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.1.0.0/24' + addressPrefix: addressPrefix } } ] diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep b/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep index 8cabbbd616..6364d0949a 100644 --- a/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep +++ b/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' } diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep b/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep index 8c5984bfdd..29920a4872 100644 --- a/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep +++ b/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep @@ -4,20 +4,22 @@ param location string = resourceGroup().location @description('Required. The name of the Virtual Network to create.') param virtualNetworkName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/16' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' } diff --git a/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep b/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep index 42fd056f24..d130bdb97d 100644 --- a/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep +++ b/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep @@ -7,20 +7,22 @@ param virtualNetworkName string @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +var addressPrefix = '10.0.0.0/16' + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: virtualNetworkName location: location properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + addressPrefix ] } subnets: [ { name: 'defaultSubnet' properties: { - addressPrefix: '10.0.0.0/24' + addressPrefix: addressPrefix serviceEndpoints: [ { service: 'Microsoft.Storage'