From fed1f3356b72cc42f6fe24095c7ae82bf9558585 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Sat, 18 Nov 2023 19:05:00 +0100 Subject: [PATCH] [Modules] Added itempotency to tests [4/5] (#4213) * Updated batch 4 * Refreshed NW * Test update to vnet * Update to latest * Refreshed templates * Update to latest --- .../main.json | 4 +- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../application-security-group/main.json | 4 +- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/azure-firewall/main.json | 12 ++--- .../tests/e2e/addpip/main.test.bicep | 7 +-- .../tests/e2e/custompip/main.test.bicep | 7 +-- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/hubcommon/main.test.bicep | 7 +-- .../tests/e2e/hubmin/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/bastion-host/main.json | 8 ++-- .../tests/e2e/custompip/main.test.bicep | 7 +-- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/connection/main.json | 4 +- .../tests/e2e/vnet2vnet/main.test.bicep | 7 +-- .../network/dns-forwarding-ruleset/main.json | 12 ++--- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/dns-resolver/main.json | 4 +- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/dns-zone/main.json | 44 +++++++++---------- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../dns-zone/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/express-route-circuit/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/express-route-gateway/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/front-door/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../front-door/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/ip-group/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../ip-group/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/local-network-gateway/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/nat-gateway/main.json | 20 ++++----- .../nat-gateway/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/prefixCombined/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/network-interface/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/network-manager/main.json | 32 +++++++------- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/network-security-group/main.json | 8 ++-- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/network-watcher/README.md | 6 +-- modules/network/network-watcher/main.json | 12 ++--- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/private-dns-zone/main.json | 40 ++++++++--------- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/private-endpoint/main.json | 8 ++-- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/private-link-service/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/public-ip-address/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/public-ip-prefix/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/route-table/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../route-table/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/service-endpoint-policy/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/trafficmanagerprofile/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/virtual-hub/main.json | 12 ++--- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../virtual-hub/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- .../network/virtual-network-gateway/main.json | 12 ++--- .../tests/e2e/aadvpn/main.test.bicep | 7 +-- .../tests/e2e/expressRoute/main.test.bicep | 7 +-- .../tests/e2e/vpn/main.test.bicep | 7 +-- modules/network/virtual-wan/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../virtual-wan/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/vpn-gateway/main.json | 12 ++--- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../vpn-gateway/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/network/vpn-site/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../vpn-site/tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- 133 files changed, 557 insertions(+), 457 deletions(-) diff --git a/modules/network/application-gateway-web-application-firewall-policy/main.json b/modules/network/application-gateway-web-application-firewall-policy/main.json index 160f4e7b60..3d860d9883 100644 --- a/modules/network/application-gateway-web-application-firewall-policy/main.json +++ b/modules/network/application-gateway-web-application-firewall-policy/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5940192377706231381" + "version": "0.23.1.45101", + "templateHash": "2444407542563544390" }, "name": "Application Gateway Web Application Firewall (WAF) Policies", "description": "This module deploys an Application Gateway Web Application Firewall (WAF) Policy.", diff --git a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep index a06afa8f68..6d6e62eff2 100644 --- a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep +++ b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep index 0629a475af..5ef5d817c3 100644 --- a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/application-gateway/tests/e2e/max/main.test.bicep b/modules/network/application-gateway/tests/e2e/max/main.test.bicep index a43632ad5d..895da7a68c 100644 --- a/modules/network/application-gateway/tests/e2e/max/main.test.bicep +++ b/modules/network/application-gateway/tests/e2e/max/main.test.bicep @@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe var appGWName = '${namePrefix}${serviceShort}001' var appGWExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/applicationGateways/${appGWName}' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: appGWName @@ -495,4 +496,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep index d86f1bc749..52253dd7c9 100644 --- a/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep @@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe var appGWName = '${namePrefix}${serviceShort}001' var appGWExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/applicationGateways/${appGWName}' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: appGWName @@ -495,4 +496,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/application-security-group/main.json b/modules/network/application-security-group/main.json index f6b82ac527..81e7562d2c 100644 --- a/modules/network/application-security-group/main.json +++ b/modules/network/application-security-group/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5654528138086993351" + "version": "0.23.1.45101", + "templateHash": "4261949823005751944" }, "name": "Application Security Groups (ASG)", "description": "This module deploys an Application Security Group (ASG).", diff --git a/modules/network/application-security-group/tests/e2e/max/main.test.bicep b/modules/network/application-security-group/tests/e2e/max/main.test.bicep index 338980479c..1c6db275ed 100644 --- a/modules/network/application-security-group/tests/e2e/max/main.test.bicep +++ b/modules/network/application-security-group/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep index 052a71f7b1..37d595cd4f 100644 --- a/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/azure-firewall/main.json b/modules/network/azure-firewall/main.json index 786b73a652..7d62269841 100644 --- a/modules/network/azure-firewall/main.json +++ b/modules/network/azure-firewall/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3800476164049795980" + "version": "0.23.1.45101", + "templateHash": "13795244529737704006" }, "name": "Azure Firewalls", "description": "This module deploys an Azure Firewall.", @@ -536,8 +536,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", @@ -1067,8 +1067,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", diff --git a/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep index 373c6489e0..61b216c4a3 100644 --- a/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep @@ -45,9 +45,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep index 0632d591fb..37fb6178bc 100644 --- a/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep @@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -99,4 +100,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep index 9d5c870954..7530eeedd1 100644 --- a/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep @@ -46,12 +46,13 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' vNetId: nestedDependencies.outputs.virtualNetworkResourceId } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep index aeba7abd0e..5870bd2081 100644 --- a/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep @@ -45,9 +45,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -64,4 +65,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep index 362ff67a62..dd3dd67364 100644 --- a/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep @@ -44,9 +44,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -57,4 +58,4 @@ module testDeployment '../../../main.bicep' = { } } } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/max/main.test.bicep b/modules/network/azure-firewall/tests/e2e/max/main.test.bicep index 654c2e950c..22a9bd66d0 100644 --- a/modules/network/azure-firewall/tests/e2e/max/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/max/main.test.bicep @@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -187,4 +188,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep b/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep index beb7ff6624..eb3d525802 100644 --- a/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep @@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -187,4 +188,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/bastion-host/main.json b/modules/network/bastion-host/main.json index a5fd8c192b..e767ea151b 100644 --- a/modules/network/bastion-host/main.json +++ b/modules/network/bastion-host/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "387274338478290784" + "version": "0.23.1.45101", + "templateHash": "18247198571712055537" }, "name": "Bastion Hosts", "description": "This module deploys a Bastion Host.", @@ -456,8 +456,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", diff --git a/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep b/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep index 500158ac2b..0db344d679 100644 --- a/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep @@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep b/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep index e150c3dd41..dd96e2e579 100644 --- a/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep @@ -46,12 +46,13 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' vNetId: nestedDependencies.outputs.virtualNetworkResourceId } -} +}] diff --git a/modules/network/bastion-host/tests/e2e/max/main.test.bicep b/modules/network/bastion-host/tests/e2e/max/main.test.bicep index c601028796..2623cdb0d2 100644 --- a/modules/network/bastion-host/tests/e2e/max/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/max/main.test.bicep @@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep b/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep index 30d7f82891..c94cc48d12 100644 --- a/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep @@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/connection/main.json b/modules/network/connection/main.json index 06b806ec90..9c15afa676 100644 --- a/modules/network/connection/main.json +++ b/modules/network/connection/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12513996667923008520" + "version": "0.23.1.45101", + "templateHash": "13101983309900723680" }, "name": "Virtual Network Gateway Connections", "description": "This module deploys a Virtual Network Gateway Connection.", diff --git a/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep b/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep index 7512784f5f..5ead06960a 100644 --- a/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep +++ b/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep @@ -52,9 +52,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -77,4 +78,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-forwarding-ruleset/main.json b/modules/network/dns-forwarding-ruleset/main.json index 18a95ff4a7..438e3ce462 100644 --- a/modules/network/dns-forwarding-ruleset/main.json +++ b/modules/network/dns-forwarding-ruleset/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "606770546796558268" + "version": "0.23.1.45101", + "templateHash": "6102897897413870050" }, "name": "Dns Forwarding Rulesets", "description": "This template deploys an dns forwarding ruleset.", @@ -285,8 +285,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14481617304679147684" + "version": "0.23.1.45101", + "templateHash": "15853222260858972029" }, "name": "Dns Forwarding Rulesets Forwarding Rules", "description": "This template deploys Forwarding Rule in a Dns Forwarding Ruleset.", @@ -432,8 +432,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13868433916800604215" + "version": "0.23.1.45101", + "templateHash": "10716706455477062359" }, "name": "Dns Forwarding Rulesets Virtual Network Links", "description": "This template deploys Virtual Network Link in a Dns Forwarding Ruleset.", diff --git a/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep index c43583ba3e..fa68f8b9b4 100644 --- a/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep +++ b/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep @@ -48,9 +48,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -58,4 +59,4 @@ module testDeployment '../../../main.bicep' = { nestedDependencies.outputs.dnsResolverOutboundEndpointsResourceId ] } -} +}] diff --git a/modules/network/dns-forwarding-ruleset/tests/e2e/max/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/max/main.test.bicep index 62b410d4e1..58a5b8b7cd 100644 --- a/modules/network/dns-forwarding-ruleset/tests/e2e/max/main.test.bicep +++ b/modules/network/dns-forwarding-ruleset/tests/e2e/max/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -91,4 +92,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-forwarding-ruleset/tests/e2e/waf-aligned/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/waf-aligned/main.test.bicep index d6dfab9955..37eca099f6 100644 --- a/modules/network/dns-forwarding-ruleset/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/dns-forwarding-ruleset/tests/e2e/waf-aligned/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -91,4 +92,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-resolver/main.json b/modules/network/dns-resolver/main.json index f865583ec3..95fa4fc6e0 100644 --- a/modules/network/dns-resolver/main.json +++ b/modules/network/dns-resolver/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "1368516182536244739" + "version": "0.23.1.45101", + "templateHash": "5702313837113326877" }, "name": "DNS Resolvers", "description": "This module deploys a DNS Resolver.", diff --git a/modules/network/dns-resolver/tests/e2e/max/main.test.bicep b/modules/network/dns-resolver/tests/e2e/max/main.test.bicep index a15b78dbf0..563c9295ba 100644 --- a/modules/network/dns-resolver/tests/e2e/max/main.test.bicep +++ b/modules/network/dns-resolver/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +73,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-resolver/tests/e2e/waf-aligned/main.test.bicep b/modules/network/dns-resolver/tests/e2e/waf-aligned/main.test.bicep index 8748710b28..972297e6cf 100644 --- a/modules/network/dns-resolver/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/dns-resolver/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +73,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-zone/main.json b/modules/network/dns-zone/main.json index 588848d689..73ab825aba 100644 --- a/modules/network/dns-zone/main.json +++ b/modules/network/dns-zone/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14383961739979857836" + "version": "0.23.1.45101", + "templateHash": "192131081135137851" }, "name": "Public DNS Zones", "description": "This module deploys a Public DNS zone.", @@ -331,8 +331,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10974837461645436691" + "version": "0.23.1.45101", + "templateHash": "9611074560358227947" }, "name": "Public DNS Zone A record", "description": "This module deploys a Public DNS Zone A record.", @@ -599,8 +599,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11266429358803831455" + "version": "0.23.1.45101", + "templateHash": "14864971256419465724" }, "name": "Public DNS Zone AAAA record", "description": "This module deploys a Public DNS Zone AAAA record.", @@ -867,8 +867,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13232609782269052972" + "version": "0.23.1.45101", + "templateHash": "1267823163217140681" }, "name": "Public DNS Zone CNAME record", "description": "This module deploys a Public DNS Zone CNAME record.", @@ -1134,8 +1134,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "17336929917389994115" + "version": "0.23.1.45101", + "templateHash": "334963919740395938" }, "name": "Public DNS Zone CAA record", "description": "This module deploys a Public DNS Zone CAA record.", @@ -1393,8 +1393,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16614736782890395121" + "version": "0.23.1.45101", + "templateHash": "913365561266018486" }, "name": "Public DNS Zone MX record", "description": "This module deploys a Public DNS Zone MX record.", @@ -1652,8 +1652,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10360566575253611568" + "version": "0.23.1.45101", + "templateHash": "14921767837432456957" }, "name": "Public DNS Zone NS record", "description": "This module deploys a Public DNS Zone NS record.", @@ -1911,8 +1911,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "694884293764156099" + "version": "0.23.1.45101", + "templateHash": "1781674036442480125" }, "name": "Public DNS Zone PTR record", "description": "This module deploys a Public DNS Zone PTR record.", @@ -2170,8 +2170,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10526329700400149290" + "version": "0.23.1.45101", + "templateHash": "15508005336915398346" }, "name": "Public DNS Zone SOA record", "description": "This module deploys a Public DNS Zone SOA record.", @@ -2429,8 +2429,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "2773338273433722142" + "version": "0.23.1.45101", + "templateHash": "12022158765353146053" }, "name": "Public DNS Zone SRV record", "description": "This module deploys a Public DNS Zone SRV record.", @@ -2688,8 +2688,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "8314659933691992641" + "version": "0.23.1.45101", + "templateHash": "12802491396062490027" }, "name": "Public DNS Zone TXT record", "description": "This module deploys a Public DNS Zone TXT record.", diff --git a/modules/network/dns-zone/tests/e2e/defaults/main.test.bicep b/modules/network/dns-zone/tests/e2e/defaults/main.test.bicep index 169bf08e48..2f820dd353 100644 --- a/modules/network/dns-zone/tests/e2e/defaults/main.test.bicep +++ b/modules/network/dns-zone/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' } -} +}] diff --git a/modules/network/dns-zone/tests/e2e/max/main.test.bicep b/modules/network/dns-zone/tests/e2e/max/main.test.bicep index f1ec3b4b4a..3e016759eb 100644 --- a/modules/network/dns-zone/tests/e2e/max/main.test.bicep +++ b/modules/network/dns-zone/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' @@ -219,4 +220,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/dns-zone/tests/e2e/waf-aligned/main.test.bicep b/modules/network/dns-zone/tests/e2e/waf-aligned/main.test.bicep index 6e754253e1..a1b86c65e9 100644 --- a/modules/network/dns-zone/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/dns-zone/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' @@ -219,4 +220,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/express-route-circuit/main.json b/modules/network/express-route-circuit/main.json index bdcfd8633a..482950e671 100644 --- a/modules/network/express-route-circuit/main.json +++ b/modules/network/express-route-circuit/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3204607868859274788" + "version": "0.23.1.45101", + "templateHash": "6315579544397323393" }, "name": "ExpressRoute Circuits", "description": "This module deploys an Express Route Circuit.", diff --git a/modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep index c6bc88b5d7..1296f33399 100644 --- a/modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep +++ b/modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -48,4 +49,4 @@ module testDeployment '../../../main.bicep' = { peeringLocation: 'Amsterdam' serviceProviderName: 'Equinix' } -} +}] diff --git a/modules/network/express-route-circuit/tests/e2e/max/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/max/main.test.bicep index 3243abdb14..015786939d 100644 --- a/modules/network/express-route-circuit/tests/e2e/max/main.test.bicep +++ b/modules/network/express-route-circuit/tests/e2e/max/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +104,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/express-route-circuit/tests/e2e/waf-aligned/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/waf-aligned/main.test.bicep index a7c2a372a3..d3509c0c8d 100644 --- a/modules/network/express-route-circuit/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/express-route-circuit/tests/e2e/waf-aligned/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +104,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/express-route-gateway/main.json b/modules/network/express-route-gateway/main.json index d2746f5621..6be627532b 100644 --- a/modules/network/express-route-gateway/main.json +++ b/modules/network/express-route-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14898040937418721724" + "version": "0.23.1.45101", + "templateHash": "13411012748796915951" }, "name": "Express Route Gateways", "description": "This module deploys an Express Route Gateway.", diff --git a/modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep index e60a1ef9ca..d9a40783f7 100644 --- a/modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep +++ b/modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep @@ -46,13 +46,14 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' virtualHubId: nestedDependencies.outputs.virtualHubResourceId } -} +}] diff --git a/modules/network/express-route-gateway/tests/e2e/max/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/max/main.test.bicep index 1578837962..42867d94f4 100644 --- a/modules/network/express-route-gateway/tests/e2e/max/main.test.bicep +++ b/modules/network/express-route-gateway/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +73,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/express-route-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/waf-aligned/main.test.bicep index 3c237372da..e95b805cb0 100644 --- a/modules/network/express-route-gateway/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/express-route-gateway/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +73,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep b/modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep index 94f9f074c1..510a9cc539 100644 --- a/modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep +++ b/modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/firewall-policy/tests/e2e/max/main.test.bicep b/modules/network/firewall-policy/tests/e2e/max/main.test.bicep index 880b8de836..733806d96f 100644 --- a/modules/network/firewall-policy/tests/e2e/max/main.test.bicep +++ b/modules/network/firewall-policy/tests/e2e/max/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -90,4 +91,4 @@ module testDeployment '../../../main.bicep' = { allowSqlRedirect: true autoLearnPrivateRanges: 'Enabled' } -} +}] diff --git a/modules/network/firewall-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/firewall-policy/tests/e2e/waf-aligned/main.test.bicep index 2c496ca64e..9d4a296941 100644 --- a/modules/network/firewall-policy/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/firewall-policy/tests/e2e/waf-aligned/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -90,4 +91,4 @@ module testDeployment '../../../main.bicep' = { allowSqlRedirect: true autoLearnPrivateRanges: 'Enabled' } -} +}] diff --git a/modules/network/front-door-web-application-firewall-policy/main.json b/modules/network/front-door-web-application-firewall-policy/main.json index ab41c5bfa9..deff6d2c90 100644 --- a/modules/network/front-door-web-application-firewall-policy/main.json +++ b/modules/network/front-door-web-application-firewall-policy/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "17032186144877035425" + "version": "0.23.1.45101", + "templateHash": "4704133430078422281" }, "name": "Front Door Web Application Firewall (WAF) Policies", "description": "This module deploys a Front Door Web Application Firewall (WAF) Policy.", diff --git a/modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep index 779069f9bd..bf7f841060 100644 --- a/modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep +++ b/modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/front-door-web-application-firewall-policy/tests/e2e/max/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/max/main.test.bicep index 7bce666da5..835ce7f757 100644 --- a/modules/network/front-door-web-application-firewall-policy/tests/e2e/max/main.test.bicep +++ b/modules/network/front-door-web-application-firewall-policy/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/front-door-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep index f7f4e7fad3..4248cdace9 100644 --- a/modules/network/front-door-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/front-door-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/front-door/main.json b/modules/network/front-door/main.json index 633202d39a..3b20f006ef 100644 --- a/modules/network/front-door/main.json +++ b/modules/network/front-door/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "2830838705545746095" + "version": "0.23.1.45101", + "templateHash": "18065323177030790685" }, "name": "Azure Front Doors", "description": "This module deploys an Azure Front Door.", diff --git a/modules/network/front-door/tests/e2e/defaults/main.test.bicep b/modules/network/front-door/tests/e2e/defaults/main.test.bicep index ab263c6aaf..6af3d2e506 100644 --- a/modules/network/front-door/tests/e2e/defaults/main.test.bicep +++ b/modules/network/front-door/tests/e2e/defaults/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName @@ -124,4 +125,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/front-door/tests/e2e/max/main.test.bicep b/modules/network/front-door/tests/e2e/max/main.test.bicep index bb77bb9c3e..c94b99aa79 100644 --- a/modules/network/front-door/tests/e2e/max/main.test.bicep +++ b/modules/network/front-door/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName @@ -158,4 +159,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/front-door/tests/e2e/waf-aligned/main.test.bicep b/modules/network/front-door/tests/e2e/waf-aligned/main.test.bicep index 7767577465..93650d477c 100644 --- a/modules/network/front-door/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/front-door/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName @@ -158,4 +159,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/ip-group/main.json b/modules/network/ip-group/main.json index e9dc0c6cbc..f286f1deb9 100644 --- a/modules/network/ip-group/main.json +++ b/modules/network/ip-group/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9765196609767428090" + "version": "0.23.1.45101", + "templateHash": "16568387528687642838" }, "name": "IP Groups", "description": "This module deploys an IP Group.", diff --git a/modules/network/ip-group/tests/e2e/defaults/main.test.bicep b/modules/network/ip-group/tests/e2e/defaults/main.test.bicep index 9139a8b6b1..9511792159 100644 --- a/modules/network/ip-group/tests/e2e/defaults/main.test.bicep +++ b/modules/network/ip-group/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/ip-group/tests/e2e/max/main.test.bicep b/modules/network/ip-group/tests/e2e/max/main.test.bicep index 568ddb0caa..5e9c862414 100644 --- a/modules/network/ip-group/tests/e2e/max/main.test.bicep +++ b/modules/network/ip-group/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/ip-group/tests/e2e/waf-aligned/main.test.bicep b/modules/network/ip-group/tests/e2e/waf-aligned/main.test.bicep index 124d1cdf86..6636c832de 100644 --- a/modules/network/ip-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/ip-group/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/local-network-gateway/main.json b/modules/network/local-network-gateway/main.json index f11208ec19..da3cea4c2d 100644 --- a/modules/network/local-network-gateway/main.json +++ b/modules/network/local-network-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9834860024329832524" + "version": "0.23.1.45101", + "templateHash": "18232422639786183281" }, "name": "Local Network Gateways", "description": "This module deploys a Local Network Gateway.", diff --git a/modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep index ab43e878e1..1265fabb0d 100644 --- a/modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep +++ b/modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep @@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -49,4 +50,4 @@ module testDeployment '../../../main.bicep' = { ] localGatewayPublicIpAddress: '8.8.8.8' } -} +}] diff --git a/modules/network/local-network-gateway/tests/e2e/max/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/max/main.test.bicep index c320c4dba1..93352e6ce5 100644 --- a/modules/network/local-network-gateway/tests/e2e/max/main.test.bicep +++ b/modules/network/local-network-gateway/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/local-network-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/waf-aligned/main.test.bicep index e47e0f4ebc..4c3d7522ce 100644 --- a/modules/network/local-network-gateway/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/local-network-gateway/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/nat-gateway/main.json b/modules/network/nat-gateway/main.json index 9bc6c9a1c5..496bdfff0a 100644 --- a/modules/network/nat-gateway/main.json +++ b/modules/network/nat-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11905897400304782014" + "version": "0.23.1.45101", + "templateHash": "9381387795158980533" }, "name": "NAT Gateways", "description": "This module deploys a NAT Gateway.", @@ -425,8 +425,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", @@ -945,8 +945,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "311381109175947078" + "version": "0.23.1.45101", + "templateHash": "16528829671778949522" } }, "parameters": { @@ -1021,8 +1021,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12289116883631984029" + "version": "0.23.1.45101", + "templateHash": "9244193973447540175" }, "name": "Public IP Prefixes", "description": "This module deploys a Public IP Prefix.", @@ -1317,8 +1317,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "311381109175947078" + "version": "0.23.1.45101", + "templateHash": "16528829671778949522" } }, "parameters": { diff --git a/modules/network/nat-gateway/tests/e2e/max/main.test.bicep b/modules/network/nat-gateway/tests/e2e/max/main.test.bicep index 36cd281d6e..7fc011d550 100644 --- a/modules/network/nat-gateway/tests/e2e/max/main.test.bicep +++ b/modules/network/nat-gateway/tests/e2e/max/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -115,4 +116,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep b/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep index 13de1ef352..d874324327 100644 --- a/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep +++ b/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep @@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/nat-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/nat-gateway/tests/e2e/waf-aligned/main.test.bicep index 024f35b432..9f155e50f0 100644 --- a/modules/network/nat-gateway/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/nat-gateway/tests/e2e/waf-aligned/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -115,4 +116,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-interface/main.json b/modules/network/network-interface/main.json index 9ece338c5f..03cd427c05 100644 --- a/modules/network/network-interface/main.json +++ b/modules/network/network-interface/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "6506615823435977032" + "version": "0.23.1.45101", + "templateHash": "2750011165297287068" }, "name": "Network Interface", "description": "This module deploys a Network Interface.", diff --git a/modules/network/network-interface/tests/e2e/defaults/main.test.bicep b/modules/network/network-interface/tests/e2e/defaults/main.test.bicep index 3ba824eace..00d24eea4b 100644 --- a/modules/network/network-interface/tests/e2e/defaults/main.test.bicep +++ b/modules/network/network-interface/tests/e2e/defaults/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -59,4 +60,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/network-interface/tests/e2e/max/main.test.bicep b/modules/network/network-interface/tests/e2e/max/main.test.bicep index 586661dbc4..02129671ef 100644 --- a/modules/network/network-interface/tests/e2e/max/main.test.bicep +++ b/modules/network/network-interface/tests/e2e/max/main.test.bicep @@ -63,9 +63,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -124,4 +125,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-interface/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-interface/tests/e2e/waf-aligned/main.test.bicep index 218c13495c..fe4128d347 100644 --- a/modules/network/network-interface/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/network-interface/tests/e2e/waf-aligned/main.test.bicep @@ -63,9 +63,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -124,4 +125,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-manager/main.json b/modules/network/network-manager/main.json index 28bf192614..24d0104710 100644 --- a/modules/network/network-manager/main.json +++ b/modules/network/network-manager/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11982582623966534114" + "version": "0.23.1.45101", + "templateHash": "7208377569507005040" }, "name": "Network Managers", "description": "This module deploys a Network Manager.", @@ -302,8 +302,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "15734624931109113465" + "version": "0.23.1.45101", + "templateHash": "3787957853488500608" }, "name": "Network Manager Network Groups", "description": "This module deploys a Network Manager Network Group.\r\nA network group is a collection of same-type network resources that you can associate with network manager configurations. You can add same-type network resources after you create the network group.", @@ -408,8 +408,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13400290933908034947" + "version": "0.23.1.45101", + "templateHash": "6119539562042886994" }, "name": "Network Manager Network Group Static Members", "description": "This module deploys a Network Manager Network Group Static Member.\r\nStatic membership allows you to explicitly add virtual networks to a group by manually selecting individual virtual networks.", @@ -571,8 +571,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5280310149581848411" + "version": "0.23.1.45101", + "templateHash": "16434535140284685195" }, "name": "Network Manager Connectivity Configurations", "description": "This module deploys a Network Manager Connectivity Configuration.\r\nConnectivity configurations define hub-and-spoke or mesh topologies applied to one or more network groups.", @@ -750,8 +750,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9309301917607746358" + "version": "0.23.1.45101", + "templateHash": "5036358037363252898" }, "name": "Network Manager Scope Connections", "description": "This module deploys a Network Manager Scope Connection.\r\nCreate a cross-tenant connection to manage a resource from another tenant.", @@ -889,8 +889,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14740794033127814314" + "version": "0.23.1.45101", + "templateHash": "11083461428572717010" }, "name": "Network Manager Security Admin Configurations", "description": "This module deploys an Network Manager Security Admin Configuration.\r\nA security admin configuration contains a set of rule collections. Each rule collection contains one or more security admin rules.", @@ -1011,8 +1011,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11695176114935586913" + "version": "0.23.1.45101", + "templateHash": "17187717862116828818" }, "name": "Network Manager Security Admin Configuration Rule Collections", "description": "This module deploys an Network Manager Security Admin Configuration Rule Collection.\r\nA security admin configuration contains a set of rule collections. Each rule collection contains one or more security admin rules. Security admin rules allows enforcing security policy criteria that matches the conditions set. Warning: A rule collection without rule will cause a deployment configuration for security admin goal state in network manager to fail.", @@ -1146,8 +1146,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "8150493920671936292" + "version": "0.23.1.45101", + "templateHash": "144106033297451553" }, "name": "Network Manager Security Admin Configuration Rule Collection Rules", "description": "This module deploys an Azure Virtual Network Manager (AVNM) Security Admin Configuration Rule Collection Rule.\r\nA security admin configuration contains a set of rule collections. Each rule collection contains one or more security admin rules.", diff --git a/modules/network/network-manager/tests/e2e/max/main.test.bicep b/modules/network/network-manager/tests/e2e/max/main.test.bicep index a1cb6fb4f6..1fb6b04824 100644 --- a/modules/network/network-manager/tests/e2e/max/main.test.bicep +++ b/modules/network/network-manager/tests/e2e/max/main.test.bicep @@ -53,9 +53,10 @@ module nestedDependencies 'dependencies.bicep' = { var networkManagerName = '${namePrefix}${serviceShort}001' var networkManagerExpecetedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/networkManagers/${networkManagerName}' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: networkManagerName enableDefaultTelemetry: enableDefaultTelemetry @@ -252,4 +253,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep index 0b70f2b7b8..1d94d18ba7 100644 --- a/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep @@ -53,9 +53,10 @@ module nestedDependencies 'dependencies.bicep' = { var networkManagerName = '${namePrefix}${serviceShort}001' var networkManagerExpecetedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/networkManagers/${networkManagerName}' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: networkManagerName enableDefaultTelemetry: enableDefaultTelemetry @@ -252,4 +253,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-security-group/main.json b/modules/network/network-security-group/main.json index 04902fe9a1..5a078217ce 100644 --- a/modules/network/network-security-group/main.json +++ b/modules/network/network-security-group/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16143869939725478184" + "version": "0.23.1.45101", + "templateHash": "750109442263573618" }, "name": "Network Security Groups", "description": "This module deploys a Network security Group (NSG).", @@ -427,8 +427,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "820939823450891186" + "version": "0.23.1.45101", + "templateHash": "5230356401692373453" }, "name": "Network Security Group (NSG) Security Rules", "description": "This module deploys a Network Security Group (NSG) Security Rule.", diff --git a/modules/network/network-security-group/tests/e2e/defaults/main.test.bicep b/modules/network/network-security-group/tests/e2e/defaults/main.test.bicep index 0e74b84bbe..e3113e43e2 100644 --- a/modules/network/network-security-group/tests/e2e/defaults/main.test.bicep +++ b/modules/network/network-security-group/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/network-security-group/tests/e2e/max/main.test.bicep b/modules/network/network-security-group/tests/e2e/max/main.test.bicep index ba20a64fbc..24664977f4 100644 --- a/modules/network/network-security-group/tests/e2e/max/main.test.bicep +++ b/modules/network/network-security-group/tests/e2e/max/main.test.bicep @@ -61,9 +61,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -157,4 +158,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-security-group/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-security-group/tests/e2e/waf-aligned/main.test.bicep index 7c9ac93549..0a6ccc8de6 100644 --- a/modules/network/network-security-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/network-security-group/tests/e2e/waf-aligned/main.test.bicep @@ -61,9 +61,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -157,4 +158,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-watcher/README.md b/modules/network/network-watcher/README.md index a9c59a060f..84b24a7db1 100644 --- a/modules/network/network-watcher/README.md +++ b/modules/network/network-watcher/README.md @@ -43,7 +43,7 @@ This instance deploys the module with the minimum set of required parameters. ```bicep module networkWatcher 'br:bicep/modules/network.network-watcher:1.0.0' = { - name: '${uniqueString(deployment().name, testLocation)}-test-nnwmin' + name: '${uniqueString(deployment().name, location)}-test-nnwmin' params: { enableDefaultTelemetry: '' location: '' @@ -87,7 +87,7 @@ This instance deploys the module with most of its features enabled. ```bicep module networkWatcher 'br:bicep/modules/network.network-watcher:1.0.0' = { - name: '${uniqueString(deployment().name, testLocation)}-test-nnwmax' + name: '${uniqueString(deployment().name, location)}-test-nnwmax' params: { connectionMonitors: [ { @@ -305,7 +305,7 @@ This instance deploys the module in alignment with the best-practices of the Azu ```bicep module networkWatcher 'br:bicep/modules/network.network-watcher:1.0.0' = { - name: '${uniqueString(deployment().name, testLocation)}-test-nnwwaf' + name: '${uniqueString(deployment().name, location)}-test-nnwwaf' params: { connectionMonitors: [ { diff --git a/modules/network/network-watcher/main.json b/modules/network/network-watcher/main.json index 85e335cbac..af0b8f4ed7 100644 --- a/modules/network/network-watcher/main.json +++ b/modules/network/network-watcher/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "768801903323165380" + "version": "0.23.1.45101", + "templateHash": "16212234798998363097" }, "name": "Network Watchers", "description": "This module deploys a Network Watcher.", @@ -267,8 +267,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3258279638384899203" + "version": "0.23.1.45101", + "templateHash": "15782320161408670286" }, "name": "Network Watchers Connection Monitors", "description": "This module deploys a Network Watcher Connection Monitor.", @@ -456,8 +456,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "7397123180177309349" + "version": "0.23.1.45101", + "templateHash": "13019883939201211211" }, "name": "NSG Flow Logs", "description": "This module controls the Network Security Group Flow Logs and analytics settings.\r\n**Note: this module must be run on the Resource Group where Network Watcher is deployed**", diff --git a/modules/network/network-watcher/tests/e2e/defaults/main.test.bicep b/modules/network/network-watcher/tests/e2e/defaults/main.test.bicep index 73452b204c..c05b464bdb 100644 --- a/modules/network/network-watcher/tests/e2e/defaults/main.test.bicep +++ b/modules/network/network-watcher/tests/e2e/defaults/main.test.bicep @@ -36,12 +36,13 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // ============== // #disable-next-line no-hardcoded-location // Disabled as the default RG & location are created in always one location, but each test has to deploy into a different one var testLocation = 'northeurope' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, testLocation)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry // Note: This value is not required and only set to enable testing location: testLocation } -} +}] diff --git a/modules/network/network-watcher/tests/e2e/max/main.test.bicep b/modules/network/network-watcher/tests/e2e/max/main.test.bicep index d4dcd43292..578321530e 100644 --- a/modules/network/network-watcher/tests/e2e/max/main.test.bicep +++ b/modules/network/network-watcher/tests/e2e/max/main.test.bicep @@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // ============== // #disable-next-line no-hardcoded-location // Disabled as the default RG & location are created in always one location, but each test has to deploy into a different one var testLocation = 'westeurope' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, testLocation)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: 'NetworkWatcher_${testLocation}' @@ -155,4 +156,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep index 730c05be9e..b940f74c67 100644 --- a/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep @@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // ============== // #disable-next-line no-hardcoded-location // Disabled as the default RG & location are created in always one location, but each test has to deploy into a different one var testLocation = 'westeurope' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, testLocation)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: 'NetworkWatcher_${testLocation}' @@ -155,4 +156,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-dns-zone/main.json b/modules/network/private-dns-zone/main.json index 88f780099a..105ede90f1 100644 --- a/modules/network/private-dns-zone/main.json +++ b/modules/network/private-dns-zone/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3388913792473865283" + "version": "0.23.1.45101", + "templateHash": "9913746381155072618" }, "name": "Private DNS Zones", "description": "This module deploys a Private DNS zone.", @@ -318,8 +318,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12900025093691887371" + "version": "0.23.1.45101", + "templateHash": "3949185236374936253" }, "name": "Private DNS Zone A record", "description": "This module deploys a Private DNS Zone A record.", @@ -577,8 +577,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "4724178141308652025" + "version": "0.23.1.45101", + "templateHash": "18254437762408001216" }, "name": "Private DNS Zone AAAA record", "description": "This module deploys a Private DNS Zone AAAA record.", @@ -836,8 +836,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14332603634620066077" + "version": "0.23.1.45101", + "templateHash": "5688376231538421822" }, "name": "Private DNS Zone CNAME record", "description": "This module deploys a Private DNS Zone CNAME record.", @@ -1095,8 +1095,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13915386259037819236" + "version": "0.23.1.45101", + "templateHash": "6121652824910092918" }, "name": "Private DNS Zone MX record", "description": "This module deploys a Private DNS Zone MX record.", @@ -1354,8 +1354,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "8103973730749015801" + "version": "0.23.1.45101", + "templateHash": "13755349248029897715" }, "name": "Private DNS Zone PTR record", "description": "This module deploys a Private DNS Zone PTR record.", @@ -1613,8 +1613,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11066047807464279527" + "version": "0.23.1.45101", + "templateHash": "17071167904833492436" }, "name": "Private DNS Zone SOA record", "description": "This module deploys a Private DNS Zone SOA record.", @@ -1872,8 +1872,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "6734977459689095702" + "version": "0.23.1.45101", + "templateHash": "11637594462630888096" }, "name": "Private DNS Zone SRV record", "description": "This module deploys a Private DNS Zone SRV record.", @@ -2131,8 +2131,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "15093956155477786576" + "version": "0.23.1.45101", + "templateHash": "61165308790737358" }, "name": "Private DNS Zone TXT record", "description": "This module deploys a Private DNS Zone TXT record.", @@ -2392,8 +2392,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14262386012436592269" + "version": "0.23.1.45101", + "templateHash": "2575181024828080198" }, "name": "Private DNS Zone Virtual Network Link", "description": "This module deploys a Private DNS Zone Virtual Network Link.", diff --git a/modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep index ac3e057214..9302e41bcf 100644 --- a/modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep +++ b/modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' } -} +}] diff --git a/modules/network/private-dns-zone/tests/e2e/max/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/max/main.test.bicep index d62a97edb9..8e28928ada 100644 --- a/modules/network/private-dns-zone/tests/e2e/max/main.test.bicep +++ b/modules/network/private-dns-zone/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' @@ -221,4 +222,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-dns-zone/tests/e2e/waf-aligned/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/waf-aligned/main.test.bicep index 116e5bb75b..591d3e4e8d 100644 --- a/modules/network/private-dns-zone/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/private-dns-zone/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001.com' @@ -221,4 +222,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-endpoint/main.json b/modules/network/private-endpoint/main.json index 9b9e3e9991..2d73f7ad0f 100644 --- a/modules/network/private-endpoint/main.json +++ b/modules/network/private-endpoint/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12078057657290521609" + "version": "0.23.1.45101", + "templateHash": "6873008238043407177" }, "name": "Private Endpoints", "description": "This module deploys a Private Endpoint.", @@ -408,8 +408,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16391702514342252839" + "version": "0.23.1.45101", + "templateHash": "17578977753131828304" }, "name": "Private Endpoint Private DNS Zone Groups", "description": "This module deploys a Private Endpoint Private DNS Zone Group.", diff --git a/modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep b/modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep index c2f9894353..51389d4e03 100644 --- a/modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep +++ b/modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -59,4 +60,4 @@ module testDeployment '../../../main.bicep' = { serviceResourceId: nestedDependencies.outputs.keyVaultResourceId subnetResourceId: nestedDependencies.outputs.subnetResourceId } -} +}] diff --git a/modules/network/private-endpoint/tests/e2e/max/main.test.bicep b/modules/network/private-endpoint/tests/e2e/max/main.test.bicep index dcb523c227..0812571d74 100644 --- a/modules/network/private-endpoint/tests/e2e/max/main.test.bicep +++ b/modules/network/private-endpoint/tests/e2e/max/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep b/modules/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep index 4e7c2b4c1f..72e2c7f377 100644 --- a/modules/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-link-service/main.json b/modules/network/private-link-service/main.json index 1a1d8491cc..2b7574b6aa 100644 --- a/modules/network/private-link-service/main.json +++ b/modules/network/private-link-service/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3379360327986898312" + "version": "0.23.1.45101", + "templateHash": "1799801226722953083" }, "name": "Private Link Services", "description": "This module deploys a Private Link Service.", diff --git a/modules/network/private-link-service/tests/e2e/defaults/main.test.bicep b/modules/network/private-link-service/tests/e2e/defaults/main.test.bicep index 6ecb49281d..c6a012f831 100644 --- a/modules/network/private-link-service/tests/e2e/defaults/main.test.bicep +++ b/modules/network/private-link-service/tests/e2e/defaults/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/private-link-service/tests/e2e/max/main.test.bicep b/modules/network/private-link-service/tests/e2e/max/main.test.bicep index 8333f18672..1fc85cda3b 100644 --- a/modules/network/private-link-service/tests/e2e/max/main.test.bicep +++ b/modules/network/private-link-service/tests/e2e/max/main.test.bicep @@ -48,9 +48,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +104,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/private-link-service/tests/e2e/waf-aligned/main.test.bicep b/modules/network/private-link-service/tests/e2e/waf-aligned/main.test.bicep index c327e89f13..cc74016e1e 100644 --- a/modules/network/private-link-service/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/private-link-service/tests/e2e/waf-aligned/main.test.bicep @@ -48,9 +48,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +104,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/public-ip-address/main.json b/modules/network/public-ip-address/main.json index 70133688a7..1f444a3ba0 100644 --- a/modules/network/public-ip-address/main.json +++ b/modules/network/public-ip-address/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", diff --git a/modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep b/modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep index 8b2bad4c9a..c4f1e366fd 100644 --- a/modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep +++ b/modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/public-ip-address/tests/e2e/max/main.test.bicep b/modules/network/public-ip-address/tests/e2e/max/main.test.bicep index aed225af85..7ce46d663b 100644 --- a/modules/network/public-ip-address/tests/e2e/max/main.test.bicep +++ b/modules/network/public-ip-address/tests/e2e/max/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/public-ip-address/tests/e2e/waf-aligned/main.test.bicep b/modules/network/public-ip-address/tests/e2e/waf-aligned/main.test.bicep index 61d5598c0e..5e16ba63ef 100644 --- a/modules/network/public-ip-address/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/public-ip-address/tests/e2e/waf-aligned/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/public-ip-prefix/main.json b/modules/network/public-ip-prefix/main.json index 8245998e85..d327e41009 100644 --- a/modules/network/public-ip-prefix/main.json +++ b/modules/network/public-ip-prefix/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12289116883631984029" + "version": "0.23.1.45101", + "templateHash": "9244193973447540175" }, "name": "Public IP Prefixes", "description": "This module deploys a Public IP Prefix.", diff --git a/modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep index 5b412000e6..520214d9be 100644 --- a/modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep +++ b/modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep @@ -37,12 +37,13 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' prefixLength: 28 } -} +}] diff --git a/modules/network/public-ip-prefix/tests/e2e/max/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/max/main.test.bicep index 8e6d167811..2a0444770e 100644 --- a/modules/network/public-ip-prefix/tests/e2e/max/main.test.bicep +++ b/modules/network/public-ip-prefix/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -70,4 +71,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/public-ip-prefix/tests/e2e/waf-aligned/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/waf-aligned/main.test.bicep index 298ddcbc5d..cc31fc6d98 100644 --- a/modules/network/public-ip-prefix/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/public-ip-prefix/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -70,4 +71,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/route-table/main.json b/modules/network/route-table/main.json index 8563735479..d3838e6b03 100644 --- a/modules/network/route-table/main.json +++ b/modules/network/route-table/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16231060934698023931" + "version": "0.23.1.45101", + "templateHash": "17284213437442846894" }, "name": "Route Tables", "description": "This module deploys a User Defined Route Table (UDR).", diff --git a/modules/network/route-table/tests/e2e/defaults/main.test.bicep b/modules/network/route-table/tests/e2e/defaults/main.test.bicep index 8a237dfdcf..bc7617bb87 100644 --- a/modules/network/route-table/tests/e2e/defaults/main.test.bicep +++ b/modules/network/route-table/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/route-table/tests/e2e/max/main.test.bicep b/modules/network/route-table/tests/e2e/max/main.test.bicep index 591f42c921..f611d8c177 100644 --- a/modules/network/route-table/tests/e2e/max/main.test.bicep +++ b/modules/network/route-table/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -79,4 +80,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/route-table/tests/e2e/waf-aligned/main.test.bicep b/modules/network/route-table/tests/e2e/waf-aligned/main.test.bicep index 83c92c0105..6edf7269f8 100644 --- a/modules/network/route-table/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/route-table/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -79,4 +80,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/service-endpoint-policy/main.json b/modules/network/service-endpoint-policy/main.json index 0d1e589b59..0901fb297c 100644 --- a/modules/network/service-endpoint-policy/main.json +++ b/modules/network/service-endpoint-policy/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10435227051484673475" + "version": "0.23.1.45101", + "templateHash": "8576779256610363047" }, "name": "Service Endpoint Policies", "description": "This module deploys a Service Endpoint Policy.", diff --git a/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep index 70ff126389..56ed8c03d5 100644 --- a/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep +++ b/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' } -} +}] diff --git a/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep index 383bd64097..8ad3addf74 100644 --- a/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep +++ b/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' @@ -82,4 +83,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep index f2a407ed2a..ab52288ff9 100644 --- a/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' @@ -82,4 +83,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/trafficmanagerprofile/main.json b/modules/network/trafficmanagerprofile/main.json index 5fb51da587..b70a6f3e81 100644 --- a/modules/network/trafficmanagerprofile/main.json +++ b/modules/network/trafficmanagerprofile/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10183539121866982078" + "version": "0.23.1.45101", + "templateHash": "11095049412788663057" }, "name": "Traffic Manager Profiles", "description": "This module deploys a Traffic Manager Profile.", diff --git a/modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep index 9f2602f94f..a8e21d17c1 100644 --- a/modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep +++ b/modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,13 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName relativeName: resourceName } -} +}] diff --git a/modules/network/trafficmanagerprofile/tests/e2e/max/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/max/main.test.bicep index e33f38cf77..b937b8d2af 100644 --- a/modules/network/trafficmanagerprofile/tests/e2e/max/main.test.bicep +++ b/modules/network/trafficmanagerprofile/tests/e2e/max/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName @@ -98,4 +99,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/trafficmanagerprofile/tests/e2e/waf-aligned/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/waf-aligned/main.test.bicep index a1a7cb5738..bddc3fdf32 100644 --- a/modules/network/trafficmanagerprofile/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/trafficmanagerprofile/tests/e2e/waf-aligned/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: resourceName @@ -98,4 +99,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/virtual-hub/main.json b/modules/network/virtual-hub/main.json index 718814eff9..acbcfb5ce7 100644 --- a/modules/network/virtual-hub/main.json +++ b/modules/network/virtual-hub/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11534311815660563241" + "version": "0.23.1.45101", + "templateHash": "3410935905412487886" }, "name": "Virtual Hubs", "description": "This module deploys a Virtual Hub.\r\nIf you are planning to deploy a Secure Virtual Hub (with an Azure Firewall integrated), please refer to the Azure Firewall module.", @@ -283,8 +283,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16158603795616593379" + "version": "0.23.1.45101", + "templateHash": "14379005468048197578" }, "name": "Virtual Hub Route Tables", "description": "This module deploys a Virtual Hub Route Table.", @@ -414,8 +414,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16334618854228578572" + "version": "0.23.1.45101", + "templateHash": "1891918102977675989" }, "name": "Virtual Hub Virtual Network Connections", "description": "This module deploys a Virtual Hub Virtual Network Connection.", diff --git a/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep b/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep index 1e6bb24c21..584c74324e 100644 --- a/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep +++ b/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep @@ -46,13 +46,14 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' addressPrefix: '10.0.0.0/16' virtualWanId: nestedDependencies.outputs.virtualWWANResourceId } -} +}] diff --git a/modules/network/virtual-hub/tests/e2e/max/main.test.bicep b/modules/network/virtual-hub/tests/e2e/max/main.test.bicep index 40bfcc913c..b8ffb6fc70 100644 --- a/modules/network/virtual-hub/tests/e2e/max/main.test.bicep +++ b/modules/network/virtual-hub/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' @@ -91,4 +92,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep b/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep index 8ca1b21cbd..befed0daa5 100644 --- a/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' @@ -91,4 +92,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/virtual-network-gateway/main.json b/modules/network/virtual-network-gateway/main.json index eaa29a2c28..6ed43a2056 100644 --- a/modules/network/virtual-network-gateway/main.json +++ b/modules/network/virtual-network-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10499044138923307873" + "version": "0.23.1.45101", + "templateHash": "2357059360379446061" }, "name": "Virtual Network Gateways", "description": "This module deploys a Virtual Network Gateway.", @@ -656,8 +656,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "18404193892947466906" + "version": "0.23.1.45101", + "templateHash": "15536304828480480757" }, "name": "Public IP Addresses", "description": "This module deploys a Public IP Address.", @@ -1182,8 +1182,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14778714560462406442" + "version": "0.23.1.45101", + "templateHash": "10871428827476692387" }, "name": "VPN Gateway NAT Rules", "description": "This module deploys a Virtual Network Gateway NAT Rule.", diff --git a/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep index 3c9305aa5b..95dfbe06d2 100644 --- a/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep @@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -120,4 +121,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep index 9a22c3afa9..272b39ce1f 100644 --- a/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep @@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -107,4 +108,4 @@ module testDeployment '../../../main.bicep' = { '3' ] } -} +}] diff --git a/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep index 903303e2af..3f983e947f 100644 --- a/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep @@ -59,9 +59,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -149,4 +150,4 @@ module testDeployment '../../../main.bicep' = { ] enableBgpRouteTranslationForNat: true } -} +}] diff --git a/modules/network/virtual-wan/main.json b/modules/network/virtual-wan/main.json index c359e2792f..73f79cbc33 100644 --- a/modules/network/virtual-wan/main.json +++ b/modules/network/virtual-wan/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16118078360254929709" + "version": "0.23.1.45101", + "templateHash": "4189892179924911704" }, "name": "Virtual WANs", "description": "This module deploys a Virtual WAN.", diff --git a/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep b/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep index 9b861faa22..85f5f16915 100644 --- a/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep +++ b/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/network/virtual-wan/tests/e2e/max/main.test.bicep b/modules/network/virtual-wan/tests/e2e/max/main.test.bicep index d0dd150785..3642b75961 100644 --- a/modules/network/virtual-wan/tests/e2e/max/main.test.bicep +++ b/modules/network/virtual-wan/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep b/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep index 748fcbeaac..290a115237 100644 --- a/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/vpn-gateway/main.json b/modules/network/vpn-gateway/main.json index bd6b9d0262..aefc4f89d9 100644 --- a/modules/network/vpn-gateway/main.json +++ b/modules/network/vpn-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "1887977315027479771" + "version": "0.23.1.45101", + "templateHash": "8700890331432111745" }, "name": "VPN Gateways", "description": "This module deploys a VPN Gateway.", @@ -205,8 +205,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "4165642550711844737" + "version": "0.23.1.45101", + "templateHash": "2150556463317760652" }, "name": "VPN Gateway NAT Rules", "description": "This module deploys a VPN Gateway NAT Rule.", @@ -379,8 +379,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13660788048333105050" + "version": "0.23.1.45101", + "templateHash": "6383697389251029881" }, "name": "VPN Gateway VPN Connections", "description": "This module deploys a VPN Gateway VPN Connection.", diff --git a/modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep index e79cff0f46..49411aaf37 100644 --- a/modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep +++ b/modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep @@ -47,12 +47,13 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' virtualHubResourceId: nestedDependencies.outputs.virtualHubResourceId } -} +}] diff --git a/modules/network/vpn-gateway/tests/e2e/max/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/max/main.test.bicep index 798de44466..14d39aec03 100644 --- a/modules/network/vpn-gateway/tests/e2e/max/main.test.bicep +++ b/modules/network/vpn-gateway/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -99,4 +100,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/vpn-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/waf-aligned/main.test.bicep index 7d7999ab09..96e00bdab5 100644 --- a/modules/network/vpn-gateway/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/vpn-gateway/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -99,4 +100,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/network/vpn-site/main.json b/modules/network/vpn-site/main.json index 486e0953cf..0a32dfa9f5 100644 --- a/modules/network/vpn-site/main.json +++ b/modules/network/vpn-site/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9467816521347210128" + "version": "0.23.1.45101", + "templateHash": "12353107767353318428" }, "name": "VPN Sites", "description": "This module deploys a VPN Site.", diff --git a/modules/network/vpn-site/tests/e2e/defaults/main.test.bicep b/modules/network/vpn-site/tests/e2e/defaults/main.test.bicep index 2c805b566b..e765763573 100644 --- a/modules/network/vpn-site/tests/e2e/defaults/main.test.bicep +++ b/modules/network/vpn-site/tests/e2e/defaults/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' @@ -58,4 +59,4 @@ module testDeployment '../../../main.bicep' = { ] ipAddress: '1.2.3.4' } -} +}] diff --git a/modules/network/vpn-site/tests/e2e/max/main.test.bicep b/modules/network/vpn-site/tests/e2e/max/main.test.bicep index 8f0bab6726..629bdd1bd9 100644 --- a/modules/network/vpn-site/tests/e2e/max/main.test.bicep +++ b/modules/network/vpn-site/tests/e2e/max/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' @@ -111,4 +112,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/network/vpn-site/tests/e2e/waf-aligned/main.test.bicep b/modules/network/vpn-site/tests/e2e/waf-aligned/main.test.bicep index 66ea85793c..62ed03a40d 100644 --- a/modules/network/vpn-site/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/network/vpn-site/tests/e2e/waf-aligned/main.test.bicep @@ -47,9 +47,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}' @@ -111,4 +112,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}]