From cb5a82d237b56cccbf4ae40c8e515edb82506dc9 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 18:23:52 +0100 Subject: [PATCH 1/5] Updated test cases of batch 1 --- modules/aad/domain-service/tests/e2e/max/main.test.bicep | 7 ++++--- .../domain-service/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../server/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../analysis-services/server/tests/e2e/max/main.test.bicep | 7 ++++--- .../server/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../service/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../api-management/service/tests/e2e/max/main.test.bicep | 7 ++++--- .../service/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../configuration-store/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../configuration-store/tests/e2e/encr/main.test.bicep | 7 ++++--- .../configuration-store/tests/e2e/max/main.test.bicep | 7 ++++--- .../configuration-store/tests/e2e/pe/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../app/container-app/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/app/container-app/tests/e2e/max/main.test.bicep | 7 ++++--- .../container-app/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../managed-environment/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../app/managed-environment/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../automation-account/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../automation-account/tests/e2e/encr/main.test.bicep | 7 ++++--- .../automation-account/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../batch/batch-account/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/batch/batch-account/tests/e2e/encr/main.test.bicep | 7 ++++--- modules/batch/batch-account/tests/e2e/max/main.test.bicep | 7 ++++--- .../batch-account/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../redis-enterprise/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../cache/redis-enterprise/tests/e2e/geo/main.test.bicep | 7 ++++--- .../cache/redis-enterprise/tests/e2e/max/main.test.bicep | 7 ++++--- .../redis-enterprise/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/cache/redis/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/cache/redis/tests/e2e/max/main.test.bicep | 7 ++++--- modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/cdn/profile/tests/e2e/afd/main.test.bicep | 7 ++++--- modules/cdn/profile/tests/e2e/max/main.test.bicep | 7 ++++--- modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../account/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../account/tests/e2e/encr/main.test.bicep | 7 ++++--- .../account/tests/e2e/max/main.test.bicep | 7 ++++--- .../account/tests/e2e/speech/main.test.bicep | 7 ++++--- .../account/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../availability-set/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../compute/availability-set/tests/e2e/max/main.test.bicep | 7 ++++--- .../availability-set/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../tests/e2e/accessPolicies/main.test.bicep | 7 ++++--- .../disk-encryption-set/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/compute/disk/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/compute/disk/tests/e2e/image/main.test.bicep | 7 ++++--- modules/compute/disk/tests/e2e/import/main.test.bicep | 7 ++++--- modules/compute/disk/tests/e2e/max/main.test.bicep | 7 ++++--- modules/compute/disk/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/compute/gallery/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/compute/gallery/tests/e2e/max/main.test.bicep | 7 ++++--- .../compute/gallery/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/compute/image/tests/e2e/max/main.test.bicep | 7 ++++--- .../compute/image/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 ++++--- .../ssh-public-key/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../compute/ssh-public-key/tests/e2e/max/main.test.bicep | 7 ++++--- .../ssh-public-key/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../tests/e2e/linux.min/main.test.bicep | 7 ++++--- .../tests/e2e/linux.ssecmk/main.test.bicep | 7 ++++--- .../tests/e2e/linux/main.test.bicep | 7 ++++--- .../tests/e2e/windows.min/main.test.bicep | 7 ++++--- .../tests/e2e/windows/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/linux.atmg/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/linux.min/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/linux/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/windows.atmg/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/windows.min/main.test.bicep | 7 ++++--- .../tests/e2e/windows.ssecmk/main.test.bicep | 7 ++++--- .../virtual-machine/tests/e2e/windows/main.test.bicep | 7 ++++--- .../consumption/budget/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/consumption/budget/tests/e2e/max/main.test.bicep | 7 ++++--- .../budget/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../container-group/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../container-group/tests/e2e/encr/main.test.bicep | 7 ++++--- .../container-group/tests/e2e/max/main.test.bicep | 7 ++++--- .../container-group/tests/e2e/private/main.test.bicep | 7 ++++--- .../container-group/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../registry/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../registry/tests/e2e/encr/main.test.bicep | 7 ++++--- .../registry/tests/e2e/max/main.test.bicep | 7 ++++--- .../registry/tests/e2e/pe/main.test.bicep | 7 ++++--- .../registry/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../managed-cluster/tests/e2e/azure/main.test.bicep | 7 ++++--- .../managed-cluster/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../managed-cluster/tests/e2e/kubenet/main.test.bicep | 7 ++++--- .../managed-cluster/tests/e2e/priv/main.test.bicep | 7 ++++--- 93 files changed, 372 insertions(+), 279 deletions(-) diff --git a/modules/aad/domain-service/tests/e2e/max/main.test.bicep b/modules/aad/domain-service/tests/e2e/max/main.test.bicep index 57a8a8aae6..ded712cfce 100644 --- a/modules/aad/domain-service/tests/e2e/max/main.test.bicep +++ b/modules/aad/domain-service/tests/e2e/max/main.test.bicep @@ -68,9 +68,10 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { scope: resourceGroup } -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' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep index 605f339c95..c5528895c7 100644 --- a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep @@ -68,9 +68,10 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { scope: resourceGroup } -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' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/analysis-services/server/tests/e2e/defaults/main.test.bicep b/modules/analysis-services/server/tests/e2e/defaults/main.test.bicep index 195a66ec25..d068d9795e 100644 --- a/modules/analysis-services/server/tests/e2e/defaults/main.test.bicep +++ b/modules/analysis-services/server/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}' } -} +}] diff --git a/modules/analysis-services/server/tests/e2e/max/main.test.bicep b/modules/analysis-services/server/tests/e2e/max/main.test.bicep index 05de9c3d73..95d51e6ea4 100644 --- a/modules/analysis-services/server/tests/e2e/max/main.test.bicep +++ b/modules/analysis-services/server/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}' @@ -117,4 +118,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/analysis-services/server/tests/e2e/waf-aligned/main.test.bicep b/modules/analysis-services/server/tests/e2e/waf-aligned/main.test.bicep index 7d160d3715..e5705e2cbf 100644 --- a/modules/analysis-services/server/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/analysis-services/server/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}' @@ -117,4 +118,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/api-management/service/tests/e2e/defaults/main.test.bicep b/modules/api-management/service/tests/e2e/defaults/main.test.bicep index 1e18f22439..693a2e0673 100644 --- a/modules/api-management/service/tests/e2e/defaults/main.test.bicep +++ b/modules/api-management/service/tests/e2e/defaults/main.test.bicep @@ -38,13 +38,14 @@ 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' publisherEmail: 'apimgmt-noreply@mail.windowsazure.com' publisherName: '${namePrefix}-az-amorg-x-001' } -} +}] diff --git a/modules/api-management/service/tests/e2e/max/main.test.bicep b/modules/api-management/service/tests/e2e/max/main.test.bicep index c1918b4ef4..928c5fadbf 100644 --- a/modules/api-management/service/tests/e2e/max/main.test.bicep +++ b/modules/api-management/service/tests/e2e/max/main.test.bicep @@ -64,9 +64,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' @@ -216,4 +217,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/api-management/service/tests/e2e/waf-aligned/main.test.bicep b/modules/api-management/service/tests/e2e/waf-aligned/main.test.bicep index e6246837b8..4353168b14 100644 --- a/modules/api-management/service/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/api-management/service/tests/e2e/waf-aligned/main.test.bicep @@ -64,9 +64,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' @@ -216,4 +217,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep index c791402a8d..895734bd01 100644 --- a/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep +++ b/modules/app-configuration/configuration-store/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/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep index fbe976165f..638592ffe0 100644 --- a/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/encr/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' @@ -96,4 +97,4 @@ module testDeployment '../../../main.bicep' = { userAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId } } -} +}] diff --git a/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep index a87462b588..19a12b153d 100644 --- a/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep +++ b/modules/app-configuration/configuration-store/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' @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep index a8367ca982..59ca3034ed 100644 --- a/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep @@ -43,9 +43,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' @@ -74,4 +75,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep index 22770e01be..5dc733b270 100644 --- a/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/app-configuration/configuration-store/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' @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/app/container-app/tests/e2e/defaults/main.test.bicep b/modules/app/container-app/tests/e2e/defaults/main.test.bicep index 33c8893ba4..b00bf36743 100644 --- a/modules/app/container-app/tests/e2e/defaults/main.test.bicep +++ b/modules/app/container-app/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/app/container-app/tests/e2e/max/main.test.bicep b/modules/app/container-app/tests/e2e/max/main.test.bicep index 68cd3514ae..c6e62e91bb 100644 --- a/modules/app/container-app/tests/e2e/max/main.test.bicep +++ b/modules/app/container-app/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/app/container-app/tests/e2e/waf-aligned/main.test.bicep b/modules/app/container-app/tests/e2e/waf-aligned/main.test.bicep index baa721dd00..622021b558 100644 --- a/modules/app/container-app/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/app/container-app/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/app/managed-environment/tests/e2e/defaults/main.test.bicep b/modules/app/managed-environment/tests/e2e/defaults/main.test.bicep index 89142b2b49..40a1ae5178 100644 --- a/modules/app/managed-environment/tests/e2e/defaults/main.test.bicep +++ b/modules/app/managed-environment/tests/e2e/defaults/main.test.bicep @@ -45,12 +45,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' logAnalyticsWorkspaceResourceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId } -} +}] diff --git a/modules/app/managed-environment/tests/e2e/max/main.test.bicep b/modules/app/managed-environment/tests/e2e/max/main.test.bicep index 1843a5b3ce..7eecb1c599 100644 --- a/modules/app/managed-environment/tests/e2e/max/main.test.bicep +++ b/modules/app/managed-environment/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' = { Env: 'test' } } -} +}] diff --git a/modules/app/managed-environment/tests/e2e/waf-aligned/main.test.bicep b/modules/app/managed-environment/tests/e2e/waf-aligned/main.test.bicep index 49d64c4d2c..f7416ce8ed 100644 --- a/modules/app/managed-environment/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/app/managed-environment/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' = { Env: 'test' } } -} +}] diff --git a/modules/automation/automation-account/tests/e2e/defaults/main.test.bicep b/modules/automation/automation-account/tests/e2e/defaults/main.test.bicep index 1c536702fe..2e93cc9a4a 100644 --- a/modules/automation/automation-account/tests/e2e/defaults/main.test.bicep +++ b/modules/automation/automation-account/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/automation/automation-account/tests/e2e/encr/main.test.bicep b/modules/automation/automation-account/tests/e2e/encr/main.test.bicep index 4c72655f49..8c9cc7cbfe 100644 --- a/modules/automation/automation-account/tests/e2e/encr/main.test.bicep +++ b/modules/automation/automation-account/tests/e2e/encr/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' @@ -65,4 +66,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/automation/automation-account/tests/e2e/max/main.test.bicep b/modules/automation/automation-account/tests/e2e/max/main.test.bicep index f0984bd8c6..2b4aa987dd 100644 --- a/modules/automation/automation-account/tests/e2e/max/main.test.bicep +++ b/modules/automation/automation-account/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' @@ -258,4 +259,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep b/modules/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep index ebff0d4bc1..d2cf185381 100644 --- a/modules/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/automation/automation-account/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' @@ -258,4 +259,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/batch/batch-account/tests/e2e/defaults/main.test.bicep b/modules/batch/batch-account/tests/e2e/defaults/main.test.bicep index dedd65a96c..aa138f8c7d 100644 --- a/modules/batch/batch-account/tests/e2e/defaults/main.test.bicep +++ b/modules/batch/batch-account/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' storageAccountId: nestedDependencies.outputs.storageAccountResourceId } -} +}] diff --git a/modules/batch/batch-account/tests/e2e/encr/main.test.bicep b/modules/batch/batch-account/tests/e2e/encr/main.test.bicep index a50db3f7d6..903cde087e 100644 --- a/modules/batch/batch-account/tests/e2e/encr/main.test.bicep +++ b/modules/batch/batch-account/tests/e2e/encr/main.test.bicep @@ -50,9 +50,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' @@ -87,4 +88,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/batch/batch-account/tests/e2e/max/main.test.bicep b/modules/batch/batch-account/tests/e2e/max/main.test.bicep index 87a36e6670..64ae401f0e 100644 --- a/modules/batch/batch-account/tests/e2e/max/main.test.bicep +++ b/modules/batch/batch-account/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/batch/batch-account/tests/e2e/waf-aligned/main.test.bicep b/modules/batch/batch-account/tests/e2e/waf-aligned/main.test.bicep index 20fbc393af..d4edb44cb9 100644 --- a/modules/batch/batch-account/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/batch/batch-account/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep index 5ac671c1b6..667f64420a 100644 --- a/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep +++ b/modules/cache/redis-enterprise/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/cache/redis-enterprise/tests/e2e/geo/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep index f91f72b254..5d09f89094 100644 --- a/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep +++ b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { var redisCacheEnterpriseName = '${namePrefix}${serviceShort}001' var redisCacheEnterpriseExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Cache/redisEnterprise/${redisCacheEnterpriseName}' -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: redisCacheEnterpriseName @@ -87,4 +88,4 @@ module testDeployment '../../../main.bicep' = { resourceType: 'Redis Cache Enterprise' } } -} +}] diff --git a/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep index ce2540744f..11967b6582 100644 --- a/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep +++ b/modules/cache/redis-enterprise/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' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { resourceType: 'Redis Cache Enterprise' } } -} +}] diff --git a/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep index cd0e90a7d9..e11f40719a 100644 --- a/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/cache/redis-enterprise/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' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { resourceType: 'Redis Cache Enterprise' } } -} +}] diff --git a/modules/cache/redis/tests/e2e/defaults/main.test.bicep b/modules/cache/redis/tests/e2e/defaults/main.test.bicep index 4c8ef85da3..2a915f730c 100644 --- a/modules/cache/redis/tests/e2e/defaults/main.test.bicep +++ b/modules/cache/redis/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/cache/redis/tests/e2e/max/main.test.bicep b/modules/cache/redis/tests/e2e/max/main.test.bicep index 5162295ff3..a22d38e2f5 100644 --- a/modules/cache/redis/tests/e2e/max/main.test.bicep +++ b/modules/cache/redis/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' @@ -118,4 +119,4 @@ module testDeployment '../../../main.bicep' = { resourceType: 'Redis Cache' } } -} +}] diff --git a/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep b/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep index 814b68ace3..b6bcc8ad00 100644 --- a/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/cache/redis/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' @@ -118,4 +119,4 @@ module testDeployment '../../../main.bicep' = { resourceType: 'Redis Cache' } } -} +}] diff --git a/modules/cdn/profile/tests/e2e/afd/main.test.bicep b/modules/cdn/profile/tests/e2e/afd/main.test.bicep index 391920c781..9d3e21d539 100644 --- a/modules/cdn/profile/tests/e2e/afd/main.test.bicep +++ b/modules/cdn/profile/tests/e2e/afd/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: { name: 'dep-${namePrefix}-test-${serviceShort}' location: 'global' @@ -128,4 +129,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/cdn/profile/tests/e2e/max/main.test.bicep b/modules/cdn/profile/tests/e2e/max/main.test.bicep index 5298d3dc2c..fb18eefa09 100644 --- a/modules/cdn/profile/tests/e2e/max/main.test.bicep +++ b/modules/cdn/profile/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: { name: 'dep-${namePrefix}-test-${serviceShort}' location: location @@ -98,4 +99,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep b/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep index 8df82c8a93..00e2285b20 100644 --- a/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/cdn/profile/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: { name: 'dep-${namePrefix}-test-${serviceShort}' location: location @@ -98,4 +99,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep b/modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep index e597ad984c..0f682f11ba 100644 --- a/modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,13 @@ 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' kind: 'SpeechServices' } -} +}] diff --git a/modules/cognitive-services/account/tests/e2e/encr/main.test.bicep b/modules/cognitive-services/account/tests/e2e/encr/main.test.bicep index aa2163900a..b7d16451bc 100644 --- a/modules/cognitive-services/account/tests/e2e/encr/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/encr/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' @@ -68,4 +69,4 @@ module testDeployment '../../../main.bicep' = { } restrictOutboundNetworkAccess: false } -} +}] diff --git a/modules/cognitive-services/account/tests/e2e/max/main.test.bicep b/modules/cognitive-services/account/tests/e2e/max/main.test.bicep index f548446c6c..46fdb9801d 100644 --- a/modules/cognitive-services/account/tests/e2e/max/main.test.bicep +++ b/modules/cognitive-services/account/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' @@ -134,4 +135,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep b/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep index 0ec0c858c4..a124fe65ca 100644 --- a/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep @@ -43,9 +43,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' @@ -78,4 +79,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep b/modules/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep index 6db604335b..e5289a44e2 100644 --- a/modules/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/cognitive-services/account/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' @@ -134,4 +135,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/availability-set/tests/e2e/defaults/main.test.bicep b/modules/compute/availability-set/tests/e2e/defaults/main.test.bicep index d2e69aba00..ba54d3f25e 100644 --- a/modules/compute/availability-set/tests/e2e/defaults/main.test.bicep +++ b/modules/compute/availability-set/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/compute/availability-set/tests/e2e/max/main.test.bicep b/modules/compute/availability-set/tests/e2e/max/main.test.bicep index c05e914de3..1241842e7b 100644 --- a/modules/compute/availability-set/tests/e2e/max/main.test.bicep +++ b/modules/compute/availability-set/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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/availability-set/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/availability-set/tests/e2e/waf-aligned/main.test.bicep index 01bac9f002..7a305c8119 100644 --- a/modules/compute/availability-set/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/availability-set/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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep b/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep index 7baafd495c..03686f8b7b 100644 --- a/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep +++ b/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/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' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/disk-encryption-set/tests/e2e/max/main.test.bicep b/modules/compute/disk-encryption-set/tests/e2e/max/main.test.bicep index d854daacec..eb235a9e48 100644 --- a/modules/compute/disk-encryption-set/tests/e2e/max/main.test.bicep +++ b/modules/compute/disk-encryption-set/tests/e2e/max/main.test.bicep @@ -51,9 +51,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' @@ -81,4 +82,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/disk-encryption-set/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/disk-encryption-set/tests/e2e/waf-aligned/main.test.bicep index e5354c3489..6398abdf33 100644 --- a/modules/compute/disk-encryption-set/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/disk-encryption-set/tests/e2e/waf-aligned/main.test.bicep @@ -51,9 +51,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' @@ -81,4 +82,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/disk/tests/e2e/defaults/main.test.bicep b/modules/compute/disk/tests/e2e/defaults/main.test.bicep index 68c1b85ac6..95b44f7771 100644 --- a/modules/compute/disk/tests/e2e/defaults/main.test.bicep +++ b/modules/compute/disk/tests/e2e/defaults/main.test.bicep @@ -37,13 +37,14 @@ 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' sku: 'Standard_LRS' diskSizeGB: 1 } -} +}] diff --git a/modules/compute/disk/tests/e2e/image/main.test.bicep b/modules/compute/disk/tests/e2e/image/main.test.bicep index 27dd941489..7b49045a5d 100644 --- a/modules/compute/disk/tests/e2e/image/main.test.bicep +++ b/modules/compute/disk/tests/e2e/image/main.test.bicep @@ -42,9 +42,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/compute/disk/tests/e2e/import/main.test.bicep b/modules/compute/disk/tests/e2e/import/main.test.bicep index d3f891d57f..e343bbfbdc 100644 --- a/modules/compute/disk/tests/e2e/import/main.test.bicep +++ b/modules/compute/disk/tests/e2e/import/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/compute/disk/tests/e2e/max/main.test.bicep b/modules/compute/disk/tests/e2e/max/main.test.bicep index 7916ad9f61..cd544f46b9 100644 --- a/modules/compute/disk/tests/e2e/max/main.test.bicep +++ b/modules/compute/disk/tests/e2e/max/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/compute/disk/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/disk/tests/e2e/waf-aligned/main.test.bicep index 95bd0f5d73..0b70c6e0b5 100644 --- a/modules/compute/disk/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/disk/tests/e2e/waf-aligned/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/compute/gallery/tests/e2e/defaults/main.test.bicep b/modules/compute/gallery/tests/e2e/defaults/main.test.bicep index 690725cdd9..f7a09d997c 100644 --- a/modules/compute/gallery/tests/e2e/defaults/main.test.bicep +++ b/modules/compute/gallery/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/compute/gallery/tests/e2e/max/main.test.bicep b/modules/compute/gallery/tests/e2e/max/main.test.bicep index a93ee28315..efc7e9a946 100644 --- a/modules/compute/gallery/tests/e2e/max/main.test.bicep +++ b/modules/compute/gallery/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' @@ -186,4 +187,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/gallery/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/gallery/tests/e2e/waf-aligned/main.test.bicep index 755e9e49c5..c519821e4f 100644 --- a/modules/compute/gallery/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/gallery/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' @@ -186,4 +187,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/image/tests/e2e/max/main.test.bicep b/modules/compute/image/tests/e2e/max/main.test.bicep index 7b5bd31348..e4da6461c2 100644 --- a/modules/compute/image/tests/e2e/max/main.test.bicep +++ b/modules/compute/image/tests/e2e/max/main.test.bicep @@ -55,9 +55,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' @@ -83,4 +84,4 @@ module testDeployment '../../../main.bicep' = { tagB: 'Player' } } -} +}] diff --git a/modules/compute/image/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/image/tests/e2e/waf-aligned/main.test.bicep index 83e55ae5ed..8403077e92 100644 --- a/modules/compute/image/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/image/tests/e2e/waf-aligned/main.test.bicep @@ -55,9 +55,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' @@ -83,4 +84,4 @@ module testDeployment '../../../main.bicep' = { tagB: 'Player' } } -} +}] diff --git a/modules/compute/proximity-placement-group/tests/e2e/defaults/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/defaults/main.test.bicep index 47ce68a6d6..9ac35b31d9 100644 --- a/modules/compute/proximity-placement-group/tests/e2e/defaults/main.test.bicep +++ b/modules/compute/proximity-placement-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/compute/proximity-placement-group/tests/e2e/max/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/max/main.test.bicep index 93f79eb2fe..c996b25ec1 100644 --- a/modules/compute/proximity-placement-group/tests/e2e/max/main.test.bicep +++ b/modules/compute/proximity-placement-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' @@ -85,4 +86,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/compute/proximity-placement-group/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/waf-aligned/main.test.bicep index d58853a01e..498ccb1f1d 100644 --- a/modules/compute/proximity-placement-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/proximity-placement-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' @@ -85,4 +86,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep index a44d0b7d0c..c0e78b3fd3 100644 --- a/modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep @@ -37,11 +37,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/compute/ssh-public-key/tests/e2e/max/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/max/main.test.bicep index a35550fe1c..5913288f41 100644 --- a/modules/compute/ssh-public-key/tests/e2e/max/main.test.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/max/main.test.bicep @@ -49,12 +49,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}-sshkey-${serviceShort}001' publicKey: nestedDependencies.outputs.publicKey } -} +}] diff --git a/modules/compute/ssh-public-key/tests/e2e/waf-aligned/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/waf-aligned/main.test.bicep index e432ba94de..38825503d4 100644 --- a/modules/compute/ssh-public-key/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/waf-aligned/main.test.bicep @@ -49,12 +49,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}-sshkey-${serviceShort}001' publicKey: nestedDependencies.outputs.publicKey } -} +}] diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep index 110a696ad0..7878e685a0 100644 --- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/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' @@ -91,4 +92,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep index a574e6b411..ac90b7dd77 100644 --- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/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 location: location @@ -119,4 +120,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep index 3ba0990f66..75a68d6d4b 100644 --- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/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' @@ -206,4 +207,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep index 6afe0758de..e9eca80fae 100644 --- a/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/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' @@ -86,4 +87,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep index 2269ee9558..9ce1834aff 100644 --- a/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep @@ -66,9 +66,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' @@ -202,4 +203,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep index 4e53732a23..abe9d3477e 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep @@ -52,9 +52,10 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -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 location: location @@ -120,4 +121,4 @@ module testDeployment '../../../main.bicep' = { dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep index 4c3fffb43d..abc4778738 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep @@ -52,9 +52,10 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -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 location: location @@ -99,4 +100,4 @@ module testDeployment '../../../main.bicep' = { dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep index 1e0d29b188..bdbb80ac95 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep @@ -67,9 +67,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}' @@ -301,4 +302,4 @@ module testDeployment '../../../main.bicep' = { dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep index b1314bce14..57fe099203 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.atmg/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 location: location @@ -89,4 +90,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep index 68c34d8494..65bb1d8a5d 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.min/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 location: location @@ -82,4 +83,4 @@ module testDeployment '../../../main.bicep' = { vmSize: 'Standard_DS2_v2' adminPassword: password } -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep index ff7c06d244..aab6f53a26 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep @@ -53,9 +53,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 location: location @@ -107,4 +108,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep index 795e801f7e..cf3f774315 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep @@ -70,9 +70,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 location: location @@ -319,4 +320,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/consumption/budget/tests/e2e/defaults/main.test.bicep b/modules/consumption/budget/tests/e2e/defaults/main.test.bicep index e9d47202bb..44789640d2 100644 --- a/modules/consumption/budget/tests/e2e/defaults/main.test.bicep +++ b/modules/consumption/budget/tests/e2e/defaults/main.test.bicep @@ -20,8 +20,9 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -30,4 +31,4 @@ module testDeployment '../../../main.bicep' = { 'dummy@contoso.com' ] } -} +}] diff --git a/modules/consumption/budget/tests/e2e/max/main.test.bicep b/modules/consumption/budget/tests/e2e/max/main.test.bicep index 691655f30f..15fa49855c 100644 --- a/modules/consumption/budget/tests/e2e/max/main.test.bicep +++ b/modules/consumption/budget/tests/e2e/max/main.test.bicep @@ -20,8 +20,9 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -37,4 +38,4 @@ module testDeployment '../../../main.bicep' = { 110 ] } -} +}] diff --git a/modules/consumption/budget/tests/e2e/waf-aligned/main.test.bicep b/modules/consumption/budget/tests/e2e/waf-aligned/main.test.bicep index ec51e97926..0d2260e7d8 100644 --- a/modules/consumption/budget/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/consumption/budget/tests/e2e/waf-aligned/main.test.bicep @@ -20,8 +20,9 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -37,4 +38,4 @@ module testDeployment '../../../main.bicep' = { 110 ] } -} +}] diff --git a/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep b/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep index e498caa1d5..d8bb8445fd 100644 --- a/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep +++ b/modules/container-instance/container-group/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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep b/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep index 2417490304..3548dcd7c5 100644 --- a/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/encr/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' @@ -131,4 +132,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-instance/container-group/tests/e2e/max/main.test.bicep b/modules/container-instance/container-group/tests/e2e/max/main.test.bicep index d98a8c184b..702d554eb7 100644 --- a/modules/container-instance/container-group/tests/e2e/max/main.test.bicep +++ b/modules/container-instance/container-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' @@ -124,4 +125,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-instance/container-group/tests/e2e/private/main.test.bicep b/modules/container-instance/container-group/tests/e2e/private/main.test.bicep index 56ed91d9c9..c7dbe09d3a 100644 --- a/modules/container-instance/container-group/tests/e2e/private/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/private/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' @@ -140,4 +141,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep b/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep index 389ed3cfc7..f52dc2cc43 100644 --- a/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/container-instance/container-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' @@ -124,4 +125,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-registry/registry/tests/e2e/defaults/main.test.bicep b/modules/container-registry/registry/tests/e2e/defaults/main.test.bicep index 4646019d7f..648869f165 100644 --- a/modules/container-registry/registry/tests/e2e/defaults/main.test.bicep +++ b/modules/container-registry/registry/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/container-registry/registry/tests/e2e/encr/main.test.bicep b/modules/container-registry/registry/tests/e2e/encr/main.test.bicep index 9c93b863b2..3331c63626 100644 --- a/modules/container-registry/registry/tests/e2e/encr/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/encr/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' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-registry/registry/tests/e2e/max/main.test.bicep b/modules/container-registry/registry/tests/e2e/max/main.test.bicep index 5a9631cb3d..5b3de38698 100644 --- a/modules/container-registry/registry/tests/e2e/max/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/max/main.test.bicep @@ -64,9 +64,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/container-registry/registry/tests/e2e/pe/main.test.bicep b/modules/container-registry/registry/tests/e2e/pe/main.test.bicep index e114baa09b..ead4de2de4 100644 --- a/modules/container-registry/registry/tests/e2e/pe/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/pe/main.test.bicep @@ -43,9 +43,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/container-registry/registry/tests/e2e/waf-aligned/main.test.bicep b/modules/container-registry/registry/tests/e2e/waf-aligned/main.test.bicep index c2373864c7..eed76d8431 100644 --- a/modules/container-registry/registry/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/waf-aligned/main.test.bicep @@ -64,9 +64,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/container-service/managed-cluster/tests/e2e/azure/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep index 51b7cf66bd..3478814ed8 100644 --- a/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep @@ -68,9 +68,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' @@ -264,4 +265,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep index 833719b5e2..e152e775ae 100644 --- a/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep @@ -34,9 +34,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { location: location } -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: '${namePrefix}${serviceShort}001' enableDefaultTelemetry: enableDefaultTelemetry @@ -52,4 +53,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep index 9183f19294..ac7a497a78 100644 --- a/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/kubenet/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' @@ -167,4 +168,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep index 46d56ddb63..cd287517a6 100644 --- a/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/priv/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' @@ -168,4 +169,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] From fe2499984a7f08d425aede1398763fb1227b5ca4 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 18:31:32 +0100 Subject: [PATCH 2/5] Updated test templates --- .../factory/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/data-factory/factory/tests/e2e/max/main.test.bicep | 7 ++++--- .../factory/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../backup-vault/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../backup-vault/tests/e2e/max/main.test.bicep | 7 ++++--- .../backup-vault/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../access-connector/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../access-connector/tests/e2e/max/main.test.bicep | 7 ++++--- .../access-connector/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/databricks/workspace/tests/e2e/max/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/private/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/public/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/private/main.test.bicep | 7 ++++--- .../flexible-server/tests/e2e/public/main.test.bicep | 7 ++++--- .../application-group/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../application-group/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../host-pool/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../host-pool/tests/e2e/max/main.test.bicep | 7 ++++--- .../host-pool/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../scaling-plan/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../scaling-plan/tests/e2e/max/main.test.bicep | 7 ++++--- .../scaling-plan/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/max/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../dev-test-lab/lab/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep | 7 ++++--- .../dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../tests/e2e/defaults/main.test.bicep | 7 ++++--- .../digital-twins-instance/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../database-account/tests/e2e/gremlindb/main.test.bicep | 7 ++++--- .../database-account/tests/e2e/mongodb/main.test.bicep | 7 ++++--- .../database-account/tests/e2e/plain/main.test.bicep | 7 ++++--- .../database-account/tests/e2e/sqldb/main.test.bicep | 7 ++++--- .../event-grid/domain/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/event-grid/domain/tests/e2e/max/main.test.bicep | 7 ++++--- modules/event-grid/domain/tests/e2e/pe/main.test.bicep | 7 ++++--- .../domain/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../system-topic/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../event-grid/system-topic/tests/e2e/max/main.test.bicep | 7 ++++--- .../system-topic/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../event-grid/topic/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/event-grid/topic/tests/e2e/max/main.test.bicep | 7 ++++--- modules/event-grid/topic/tests/e2e/pe/main.test.bicep | 7 ++++--- .../event-grid/topic/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../event-hub/namespace/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/event-hub/namespace/tests/e2e/encr/main.test.bicep | 7 ++++--- modules/event-hub/namespace/tests/e2e/max/main.test.bicep | 7 ++++--- modules/event-hub/namespace/tests/e2e/pe/main.test.bicep | 7 ++++--- .../namespace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../health-bot/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../health-bot/health-bot/tests/e2e/max/main.test.bicep | 7 ++++--- .../health-bot/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/max/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../action-group/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../insights/action-group/tests/e2e/max/main.test.bicep | 7 ++++--- .../action-group/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../activity-log-alert/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../insights/component/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/insights/component/tests/e2e/max/main.test.bicep | 7 ++++--- .../component/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../tests/e2e/defaults/main.test.bicep | 7 ++++--- .../data-collection-endpoint/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../tests/e2e/customadv/main.test.bicep | 7 ++++--- .../tests/e2e/custombasic/main.test.bicep | 7 ++++--- .../tests/e2e/customiis/main.test.bicep | 7 ++++--- .../tests/e2e/defaults/main.test.bicep | 7 ++++--- .../data-collection-rule/tests/e2e/linux/main.test.bicep | 7 ++++--- .../data-collection-rule/tests/e2e/windows/main.test.bicep | 7 ++++--- .../diagnostic-setting/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../insights/metric-alert/tests/e2e/max/main.test.bicep | 7 ++++--- .../metric-alert/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../private-link-scope/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../private-link-scope/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../scheduled-query-rule/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../insights/webtest/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/insights/webtest/tests/e2e/max/main.test.bicep | 7 ++++--- .../insights/webtest/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- 91 files changed, 364 insertions(+), 273 deletions(-) diff --git a/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep b/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep index a6d55d1d70..f4ffda85f6 100644 --- a/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep +++ b/modules/data-factory/factory/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/data-factory/factory/tests/e2e/max/main.test.bicep b/modules/data-factory/factory/tests/e2e/max/main.test.bicep index 8e8dd7f0ad..44d6099188 100644 --- a/modules/data-factory/factory/tests/e2e/max/main.test.bicep +++ b/modules/data-factory/factory/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' @@ -158,4 +159,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep b/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep index 8c332672b1..758e8cdb29 100644 --- a/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/data-factory/factory/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' @@ -158,4 +159,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep index c28874ad47..eb6dd485a2 100644 --- a/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep +++ b/modules/data-protection/backup-vault/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/data-protection/backup-vault/tests/e2e/max/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep index 9a85777eb1..4d25b7b7c4 100644 --- a/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep +++ b/modules/data-protection/backup-vault/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' @@ -135,4 +136,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep index ef8e13b397..8d44a80490 100644 --- a/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/data-protection/backup-vault/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' @@ -135,4 +136,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep b/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep index 815fc5ca3d..17bf07d2fc 100644 --- a/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep +++ b/modules/databricks/access-connector/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/databricks/access-connector/tests/e2e/max/main.test.bicep b/modules/databricks/access-connector/tests/e2e/max/main.test.bicep index d67edfcaff..9cd9142b38 100644 --- a/modules/databricks/access-connector/tests/e2e/max/main.test.bicep +++ b/modules/databricks/access-connector/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' @@ -76,4 +77,4 @@ module testDeployment '../../../main.bicep' = { } location: resourceGroup.location } -} +}] diff --git a/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep b/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep index e61783c03c..5fa221c407 100644 --- a/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/databricks/access-connector/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' @@ -76,4 +77,4 @@ module testDeployment '../../../main.bicep' = { } location: resourceGroup.location } -} +}] diff --git a/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep b/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep index 9735d40a22..8c3002937e 100644 --- a/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/databricks/workspace/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/databricks/workspace/tests/e2e/max/main.test.bicep b/modules/databricks/workspace/tests/e2e/max/main.test.bicep index cbf4a382c1..00f1d84997 100644 --- a/modules/databricks/workspace/tests/e2e/max/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/max/main.test.bicep @@ -72,9 +72,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' @@ -153,4 +154,4 @@ module testDeployment '../../../main.bicep' = { vnetAddressPrefix: '10.100' location: resourceGroup.location } -} +}] diff --git a/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep index 4f74e4d560..537323ad34 100644 --- a/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep @@ -72,9 +72,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' @@ -153,4 +154,4 @@ module testDeployment '../../../main.bicep' = { vnetAddressPrefix: '10.100' location: resourceGroup.location } -} +}] diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep index b127e422f4..60b6289226 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep @@ -42,9 +42,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' @@ -53,4 +54,4 @@ module testDeployment '../../../main.bicep' = { skuName: 'Standard_B1ms' tier: 'Burstable' } -} +}] diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep index 27819b80b1..d44c848f61 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/private/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' @@ -130,4 +131,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep index affcf5e126..24333fa93c 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep @@ -80,9 +80,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' @@ -175,4 +176,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep index bac3973754..f3177dd795 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep @@ -42,9 +42,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' @@ -53,4 +54,4 @@ module testDeployment '../../../main.bicep' = { skuName: 'Standard_B2s' tier: 'Burstable' } -} +}] diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep index eb5a7ba144..fcc65d67d8 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/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' @@ -117,4 +118,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep index ac74978518..524348c63e 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/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' @@ -148,4 +149,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep index 0dcced5bab..54746b0764 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/application-group/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' applicationGroupType: 'RemoteApp' hostpoolName: nestedDependencies.outputs.hostPoolName } -} +}] diff --git a/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep index 115ba77ed7..49d1fc5088 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/application-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' @@ -116,4 +117,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep index eb507bfeaf..a5bb068c02 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/application-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' @@ -116,4 +117,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep index 0675dbe11e..fc3402a8a1 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/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/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep index d48cbdcade..b014dcfb07 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/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' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep index 6499c1f67f..eb8918d929 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/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' @@ -132,4 +133,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep index 1ded6e5b55..160a5f13a3 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/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/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep index b8426b2533..9f93f1cae3 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/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' @@ -130,4 +131,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep index 0c02e7560e..4e2ea6cc47 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/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' @@ -130,4 +131,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep index 7fc5df6c67..3eb2840ed1 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/workspace/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/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep index 565fbfe6a8..92de7edff9 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/workspace/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' @@ -100,4 +101,4 @@ module testDeployment '../../../main.bicep' = { description: 'This is my first AVD Workspace' friendlyName: 'My first AVD Workspace' } -} +}] diff --git a/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep index e6907c5ee2..4de3839aa1 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/workspace/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' @@ -100,4 +101,4 @@ module testDeployment '../../../main.bicep' = { description: 'This is my first AVD Workspace' friendlyName: 'My first AVD Workspace' } -} +}] diff --git a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep index b74a10c49c..9a583e7a24 100644 --- a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep +++ b/modules/dev-test-lab/lab/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: { name: '${namePrefix}${serviceShort}001' enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep index 302920b17e..b8cb114464 100644 --- a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep @@ -54,9 +54,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' @@ -283,4 +284,4 @@ module testDeployment '../../../main.bicep' = { thresholdValue100SendNotificationWhenExceeded: 'Enabled' } } -} +}] diff --git a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep index 5c1f2064a6..2c682d084a 100644 --- a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep @@ -54,9 +54,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' @@ -283,4 +284,4 @@ module testDeployment '../../../main.bicep' = { thresholdValue100SendNotificationWhenExceeded: 'Enabled' } } -} +}] diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep index 4c2c58a0a8..e62a489683 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/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/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep index 6b1f42d08a..9331f7710e 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep @@ -65,9 +65,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: { eventHubEndpoint: { authenticationType: 'IdentityBased' @@ -129,4 +130,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep index 2c2f2e28ca..cc09bb9358 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep @@ -65,9 +65,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: { eventHubEndpoint: { authenticationType: 'IdentityBased' @@ -129,4 +130,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep b/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep index 44f12410b3..32fcd6ae00 100644 --- a/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/gremlindb/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}002' @@ -158,4 +159,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep b/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep index ddb9ac1a75..c42b32d0a3 100644 --- a/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/mongodb/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' @@ -291,4 +292,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/document-db/database-account/tests/e2e/plain/main.test.bicep b/modules/document-db/database-account/tests/e2e/plain/main.test.bicep index c8dbd06e37..f55695a9d1 100644 --- a/modules/document-db/database-account/tests/e2e/plain/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/plain/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' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep b/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep index eb14ddcb9b..0f5de336a6 100644 --- a/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/sqldb/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' @@ -200,4 +201,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep b/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep index e2d9be8663..69015ce3e4 100644 --- a/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/domain/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/event-grid/domain/tests/e2e/max/main.test.bicep b/modules/event-grid/domain/tests/e2e/max/main.test.bicep index de3be09b26..3be06cfaf7 100644 --- a/modules/event-grid/domain/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/domain/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' @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { '${namePrefix}-topic-${serviceShort}001' ] } -} +}] diff --git a/modules/event-grid/domain/tests/e2e/pe/main.test.bicep b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep index ddaa562218..98d8709f03 100644 --- a/modules/event-grid/domain/tests/e2e/pe/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep @@ -43,9 +43,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' @@ -68,4 +69,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep index bdb9c0b651..d65df56405 100644 --- a/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/domain/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' @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { '${namePrefix}-topic-${serviceShort}001' ] } -} +}] diff --git a/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep index 8bfe4a7feb..ab3814500c 100644 --- a/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep @@ -60,13 +60,14 @@ 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' source: nestedDependencies.outputs.storageAccountResourceId topicType: 'Microsoft.Storage.StorageAccounts' } -} +}] diff --git a/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep index a1fe7d4bf5..cdcc6727cb 100644 --- a/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/system-topic/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep index 0ca8feb5b6..943ee3a929 100644 --- a/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/system-topic/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep b/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep index 89a79f1097..29f7356f10 100644 --- a/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/topic/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/event-grid/topic/tests/e2e/max/main.test.bicep b/modules/event-grid/topic/tests/e2e/max/main.test.bicep index 3ca8f6121e..bba0f24999 100644 --- a/modules/event-grid/topic/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/topic/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' @@ -142,4 +143,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/topic/tests/e2e/pe/main.test.bicep b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep index 99f3160297..e2244c60d7 100644 --- a/modules/event-grid/topic/tests/e2e/pe/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep @@ -43,9 +43,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' @@ -68,4 +69,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep index d093b9d5b8..10a11dab1b 100644 --- a/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/topic/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' @@ -142,4 +143,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep index 424ca90ffe..54328adc66 100644 --- a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep +++ b/modules/event-hub/namespace/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/event-hub/namespace/tests/e2e/encr/main.test.bicep b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep index a7a3e24d64..c38e8cc89a 100644 --- a/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/encr/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' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { } requireInfrastructureEncryption: true } -} +}] diff --git a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep b/modules/event-hub/namespace/tests/e2e/max/main.test.bicep index edfc8d7534..519ac8f839 100644 --- a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep +++ b/modules/event-hub/namespace/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' @@ -225,4 +226,4 @@ module testDeployment '../../../main.bicep' = { maximumThroughputUnits: 4 publicNetworkAccess: 'Disabled' } -} +}] diff --git a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep index e55e3faf2f..e1a8029519 100644 --- a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep @@ -43,9 +43,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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep index 53ec10b8b5..3a0b02e102 100644 --- a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-hub/namespace/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' @@ -225,4 +226,4 @@ module testDeployment '../../../main.bicep' = { maximumThroughputUnits: 4 publicNetworkAccess: 'Disabled' } -} +}] diff --git a/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep index 827853ed5b..f2b46c90a3 100644 --- a/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,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' sku: 'F0' } -} +}] diff --git a/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep index 5f1fafa9ee..674122f700 100644 --- a/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep +++ b/modules/health-bot/health-bot/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' = { ] } } -} +}] diff --git a/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep index 798f69c2f9..dca2e35ad3 100644 --- a/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/health-bot/health-bot/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' = { ] } } -} +}] diff --git a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep index 4eb6a8dc85..d6e6b73cd4 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep @@ -37,13 +37,14 @@ 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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' location: location publicNetworkAccess: 'Enabled' } -} +}] diff --git a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep index 5e4f905ce5..7063ebbdc7 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep +++ b/modules/healthcare-apis/workspace/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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -166,4 +167,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep index bad448e7e7..83679dd97b 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/healthcare-apis/workspace/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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -166,4 +167,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/action-group/tests/e2e/defaults/main.test.bicep b/modules/insights/action-group/tests/e2e/defaults/main.test.bicep index 5ef4c9a8ef..019b31bb3b 100644 --- a/modules/insights/action-group/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,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' groupShortName: 'ag${serviceShort}001' } -} +}] diff --git a/modules/insights/action-group/tests/e2e/max/main.test.bicep b/modules/insights/action-group/tests/e2e/max/main.test.bicep index 7a156298a2..55291588f1 100644 --- a/modules/insights/action-group/tests/e2e/max/main.test.bicep +++ b/modules/insights/action-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' @@ -85,4 +86,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep index 6059b1d2fd..33b5630927 100644 --- a/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/action-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' @@ -85,4 +86,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep b/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep index 74452e4c5f..f0b393e71e 100644 --- a/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep +++ b/modules/insights/activity-log-alert/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' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep index e44bab24e9..4d12202f85 100644 --- a/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/activity-log-alert/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' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/component/tests/e2e/defaults/main.test.bicep b/modules/insights/component/tests/e2e/defaults/main.test.bicep index 0e4fe18e1f..2c505a853f 100644 --- a/modules/insights/component/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/component/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' workspaceResourceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId } -} +}] diff --git a/modules/insights/component/tests/e2e/max/main.test.bicep b/modules/insights/component/tests/e2e/max/main.test.bicep index e272985a9c..69e8998fab 100644 --- a/modules/insights/component/tests/e2e/max/main.test.bicep +++ b/modules/insights/component/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' @@ -94,4 +95,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep index 19788dc94b..e1940171ae 100644 --- a/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/component/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' @@ -94,4 +95,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep index 296447c846..9d0759239d 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep @@ -37,11 +37,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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep index 0bcea4cb4a..3cc4c9c606 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep index e587afcd6a..db4a6e31a0 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep index 2e2f2a7d14..df94e99d0e 100644 --- a/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep @@ -45,9 +45,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -141,4 +142,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep index b0ae869187..b044a95732 100644 --- a/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep @@ -45,9 +45,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -125,4 +126,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep index d157de08b6..16bc3e3382 100644 --- a/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep @@ -45,9 +45,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep index 9ba5932555..0328438f44 100644 --- a/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep @@ -37,9 +37,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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' dataSources: { @@ -83,4 +84,4 @@ module testDeployment '../../../main.bicep' = { enableDefaultTelemetry: enableDefaultTelemetry kind: 'Windows' } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep index 5b5664ffe9..8a213a0651 100644 --- a/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep @@ -44,9 +44,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' description: 'Collecting Linux-specific performance counters and Linux Syslog' @@ -217,4 +218,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Linux' } } -} +}] diff --git a/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep index 9d2ee0f182..5831e1db12 100644 --- a/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep @@ -44,9 +44,10 @@ module resourceGroupResources '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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' description: 'Collecting Windows-specific performance counters and Windows Event Logs' @@ -171,4 +172,4 @@ module testDeployment '../../../main.bicep' = { kind: 'Windows' } } -} +}] diff --git a/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep b/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep index b26c05e269..82001d753f 100644 --- a/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep +++ b/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep @@ -52,8 +52,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -67,4 +68,4 @@ module testDeployment '../../../main.bicep' = { storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId } -} +}] diff --git a/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep index 7836a24eed..a84b3f82bc 100644 --- a/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep @@ -52,8 +52,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -67,4 +68,4 @@ module testDeployment '../../../main.bicep' = { storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId } -} +}] diff --git a/modules/insights/metric-alert/tests/e2e/max/main.test.bicep b/modules/insights/metric-alert/tests/e2e/max/main.test.bicep index f9cc7d5482..aff5f631ca 100644 --- a/modules/insights/metric-alert/tests/e2e/max/main.test.bicep +++ b/modules/insights/metric-alert/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' @@ -84,4 +85,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep index ee7bf8abbd..edad7e8898 100644 --- a/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/metric-alert/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' @@ -84,4 +85,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep index 2ed54c7791..33740e555d 100644 --- a/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/private-link-scope/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/insights/private-link-scope/tests/e2e/max/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep index 6b92ace5e2..dc9ca75fdc 100644 --- a/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep +++ b/modules/insights/private-link-scope/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' @@ -86,4 +87,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep index bda1d61e70..c18ef415f3 100644 --- a/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/private-link-scope/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' @@ -86,4 +87,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep b/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep index d8bc06cf5e..703927ec7c 100644 --- a/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep +++ b/modules/insights/scheduled-query-rule/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' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep index 6c924009a5..3690a19042 100644 --- a/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/scheduled-query-rule/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' @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/insights/webtest/tests/e2e/defaults/main.test.bicep b/modules/insights/webtest/tests/e2e/defaults/main.test.bicep index 99e6969ed2..a8c77a7505 100644 --- a/modules/insights/webtest/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/webtest/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -64,4 +65,4 @@ module testDeployment '../../../main.bicep' = { HttpVerb: 'GET' } } -} +}] diff --git a/modules/insights/webtest/tests/e2e/max/main.test.bicep b/modules/insights/webtest/tests/e2e/max/main.test.bicep index 1a552a552b..6821002ea8 100644 --- a/modules/insights/webtest/tests/e2e/max/main.test.bicep +++ b/modules/insights/webtest/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -74,4 +75,4 @@ module testDeployment '../../../main.bicep' = { name: 'myCustomLockName' } } -} +}] diff --git a/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep index 0fcdae082d..8674910b4f 100644 --- a/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/webtest/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: { name: '${namePrefix}${serviceShort}001' tags: { @@ -74,4 +75,4 @@ module testDeployment '../../../main.bicep' = { name: 'myCustomLockName' } } -} +}] From 4f733710392c75d29b706c744fcdc858ea500335 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 18:35:05 +0100 Subject: [PATCH 3/5] Update to latest --- .../factory/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/data-factory/factory/tests/e2e/max/main.test.bicep | 7 +++---- .../factory/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../backup-vault/tests/e2e/defaults/main.test.bicep | 7 +++---- .../backup-vault/tests/e2e/max/main.test.bicep | 7 +++---- .../backup-vault/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../access-connector/tests/e2e/defaults/main.test.bicep | 7 +++---- .../access-connector/tests/e2e/max/main.test.bicep | 7 +++---- .../access-connector/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../workspace/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/databricks/workspace/tests/e2e/max/main.test.bicep | 7 +++---- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/defaults/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/private/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/public/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/defaults/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/private/main.test.bicep | 7 +++---- .../flexible-server/tests/e2e/public/main.test.bicep | 7 +++---- .../application-group/tests/e2e/defaults/main.test.bicep | 7 +++---- .../application-group/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../host-pool/tests/e2e/defaults/main.test.bicep | 7 +++---- .../host-pool/tests/e2e/max/main.test.bicep | 7 +++---- .../host-pool/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../scaling-plan/tests/e2e/defaults/main.test.bicep | 7 +++---- .../scaling-plan/tests/e2e/max/main.test.bicep | 7 +++---- .../scaling-plan/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../workspace/tests/e2e/defaults/main.test.bicep | 7 +++---- .../workspace/tests/e2e/max/main.test.bicep | 7 +++---- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../dev-test-lab/lab/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep | 7 +++---- .../dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../tests/e2e/defaults/main.test.bicep | 7 +++---- .../digital-twins-instance/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../database-account/tests/e2e/gremlindb/main.test.bicep | 7 +++---- .../database-account/tests/e2e/mongodb/main.test.bicep | 7 +++---- .../database-account/tests/e2e/plain/main.test.bicep | 7 +++---- .../database-account/tests/e2e/sqldb/main.test.bicep | 7 +++---- .../event-grid/domain/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/event-grid/domain/tests/e2e/max/main.test.bicep | 7 +++---- modules/event-grid/domain/tests/e2e/pe/main.test.bicep | 7 +++---- .../domain/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../system-topic/tests/e2e/defaults/main.test.bicep | 7 +++---- .../event-grid/system-topic/tests/e2e/max/main.test.bicep | 7 +++---- .../system-topic/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../event-grid/topic/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/event-grid/topic/tests/e2e/max/main.test.bicep | 7 +++---- modules/event-grid/topic/tests/e2e/pe/main.test.bicep | 7 +++---- .../event-grid/topic/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../event-hub/namespace/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/event-hub/namespace/tests/e2e/encr/main.test.bicep | 7 +++---- modules/event-hub/namespace/tests/e2e/max/main.test.bicep | 7 +++---- modules/event-hub/namespace/tests/e2e/pe/main.test.bicep | 7 +++---- .../namespace/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../health-bot/tests/e2e/defaults/main.test.bicep | 7 +++---- .../health-bot/health-bot/tests/e2e/max/main.test.bicep | 7 +++---- .../health-bot/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../workspace/tests/e2e/defaults/main.test.bicep | 7 +++---- .../workspace/tests/e2e/max/main.test.bicep | 7 +++---- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../action-group/tests/e2e/defaults/main.test.bicep | 7 +++---- .../insights/action-group/tests/e2e/max/main.test.bicep | 7 +++---- .../action-group/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../activity-log-alert/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../insights/component/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/insights/component/tests/e2e/max/main.test.bicep | 7 +++---- .../component/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../tests/e2e/defaults/main.test.bicep | 7 +++---- .../data-collection-endpoint/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../tests/e2e/customadv/main.test.bicep | 7 +++---- .../tests/e2e/custombasic/main.test.bicep | 7 +++---- .../tests/e2e/customiis/main.test.bicep | 7 +++---- .../tests/e2e/defaults/main.test.bicep | 7 +++---- .../data-collection-rule/tests/e2e/linux/main.test.bicep | 7 +++---- .../data-collection-rule/tests/e2e/windows/main.test.bicep | 7 +++---- .../diagnostic-setting/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../insights/metric-alert/tests/e2e/max/main.test.bicep | 7 +++---- .../metric-alert/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../private-link-scope/tests/e2e/defaults/main.test.bicep | 7 +++---- .../private-link-scope/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../scheduled-query-rule/tests/e2e/max/main.test.bicep | 7 +++---- .../tests/e2e/waf-aligned/main.test.bicep | 7 +++---- .../insights/webtest/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/insights/webtest/tests/e2e/max/main.test.bicep | 7 +++---- .../insights/webtest/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- 91 files changed, 273 insertions(+), 364 deletions(-) diff --git a/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep b/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep index f4ffda85f6..a6d55d1d70 100644 --- a/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep +++ b/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/data-factory/factory/tests/e2e/max/main.test.bicep b/modules/data-factory/factory/tests/e2e/max/main.test.bicep index 44d6099188..8e8dd7f0ad 100644 --- a/modules/data-factory/factory/tests/e2e/max/main.test.bicep +++ b/modules/data-factory/factory/tests/e2e/max/main.test.bicep @@ -63,10 +63,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -159,4 +158,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep b/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep index 758e8cdb29..8c332672b1 100644 --- a/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/data-factory/factory/tests/e2e/waf-aligned/main.test.bicep @@ -63,10 +63,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -159,4 +158,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep index eb6dd485a2..c28874ad47 100644 --- a/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep +++ b/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep index 4d25b7b7c4..9a85777eb1 100644 --- a/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep +++ b/modules/data-protection/backup-vault/tests/e2e/max/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -136,4 +135,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep index 8d44a80490..ef8e13b397 100644 --- a/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/data-protection/backup-vault/tests/e2e/waf-aligned/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -136,4 +135,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep b/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep index 17bf07d2fc..815fc5ca3d 100644 --- a/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep +++ b/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/databricks/access-connector/tests/e2e/max/main.test.bicep b/modules/databricks/access-connector/tests/e2e/max/main.test.bicep index 9cd9142b38..d67edfcaff 100644 --- a/modules/databricks/access-connector/tests/e2e/max/main.test.bicep +++ b/modules/databricks/access-connector/tests/e2e/max/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -77,4 +76,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } location: resourceGroup.location } -}] +} diff --git a/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep b/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep index 5fa221c407..e61783c03c 100644 --- a/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/databricks/access-connector/tests/e2e/waf-aligned/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -77,4 +76,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } location: resourceGroup.location } -}] +} diff --git a/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep b/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep index 8c3002937e..9735d40a22 100644 --- a/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/databricks/workspace/tests/e2e/max/main.test.bicep b/modules/databricks/workspace/tests/e2e/max/main.test.bicep index 00f1d84997..cbf4a382c1 100644 --- a/modules/databricks/workspace/tests/e2e/max/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/max/main.test.bicep @@ -72,10 +72,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -154,4 +153,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' vnetAddressPrefix: '10.100' location: resourceGroup.location } -}] +} diff --git a/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep index 537323ad34..4f74e4d560 100644 --- a/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep @@ -72,10 +72,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -154,4 +153,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' vnetAddressPrefix: '10.100' location: resourceGroup.location } -}] +} diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep index 60b6289226..b127e422f4 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep @@ -42,10 +42,9 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -54,4 +53,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' skuName: 'Standard_B1ms' tier: 'Burstable' } -}] +} diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep index d44c848f61..27819b80b1 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -131,4 +130,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] } -}] +} diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep index 24333fa93c..affcf5e126 100644 --- a/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep @@ -80,10 +80,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -176,4 +175,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] } -}] +} diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep index f3177dd795..bac3973754 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep @@ -42,10 +42,9 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -54,4 +53,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' skuName: 'Standard_B2s' tier: 'Burstable' } -}] +} diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep index fcc65d67d8..eb5a7ba144 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -118,4 +117,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep index 524348c63e..ac74978518 100644 --- a/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -149,4 +148,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep index 54746b0764..0dcced5bab 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep @@ -46,14 +46,13 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' applicationGroupType: 'RemoteApp' hostpoolName: nestedDependencies.outputs.hostPoolName } -}] +} diff --git a/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep index 49d1fc5088..115ba77ed7 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/application-group/tests/e2e/max/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -117,4 +116,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep index a5bb068c02..eb507bfeaf 100644 --- a/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/application-group/tests/e2e/waf-aligned/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -117,4 +116,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep index fc3402a8a1..0675dbe11e 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep index b014dcfb07..d48cbdcade 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/tests/e2e/max/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -133,4 +132,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] } } -}] +} diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep index eb8918d929..6499c1f67f 100644 --- a/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/tests/e2e/waf-aligned/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -133,4 +132,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] } } -}] +} diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep index 160a5f13a3..1ded6e5b55 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep index 9f93f1cae3..b8426b2533 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/tests/e2e/max/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -131,4 +130,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] } -}] +} diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep index 4e2ea6cc47..0c02e7560e 100644 --- a/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/tests/e2e/waf-aligned/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -131,4 +130,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] } -}] +} diff --git a/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep index 3eb2840ed1..7fc5df6c67 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep index 92de7edff9..565fbfe6a8 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep +++ b/modules/desktop-virtualization/workspace/tests/e2e/max/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -101,4 +100,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' description: 'This is my first AVD Workspace' friendlyName: 'My first AVD Workspace' } -}] +} diff --git a/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep index 4de3839aa1..e6907c5ee2 100644 --- a/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/desktop-virtualization/workspace/tests/e2e/waf-aligned/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -101,4 +100,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' description: 'This is my first AVD Workspace' friendlyName: 'My first AVD Workspace' } -}] +} diff --git a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep index 9a583e7a24..b74a10c49c 100644 --- a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' enableDefaultTelemetry: enableDefaultTelemetry } -}] +} diff --git a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep index b8cb114464..302920b17e 100644 --- a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep @@ -54,10 +54,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -284,4 +283,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' thresholdValue100SendNotificationWhenExceeded: 'Enabled' } } -}] +} diff --git a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep index 2c682d084a..5c1f2064a6 100644 --- a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep @@ -54,10 +54,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -284,4 +283,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' thresholdValue100SendNotificationWhenExceeded: 'Enabled' } } -}] +} diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep index e62a489683..4c2c58a0a8 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep index 9331f7710e..6b1f42d08a 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep @@ -65,10 +65,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { eventHubEndpoint: { authenticationType: 'IdentityBased' @@ -130,4 +129,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep index cc09bb9358..2c2f2e28ca 100644 --- a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep @@ -65,10 +65,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { eventHubEndpoint: { authenticationType: 'IdentityBased' @@ -130,4 +129,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep b/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep index 32fcd6ae00..44f12410b3 100644 --- a/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep @@ -58,10 +58,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}002' @@ -159,4 +158,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep b/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep index c42b32d0a3..ddb9ac1a75 100644 --- a/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep @@ -58,10 +58,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -292,4 +291,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/document-db/database-account/tests/e2e/plain/main.test.bicep b/modules/document-db/database-account/tests/e2e/plain/main.test.bicep index f55695a9d1..c8dbd06e37 100644 --- a/modules/document-db/database-account/tests/e2e/plain/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/plain/main.test.bicep @@ -58,10 +58,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -108,4 +107,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep b/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep index 0f5de336a6..eb14ddcb9b 100644 --- a/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep @@ -59,10 +59,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -201,4 +200,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep b/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep index 69015ce3e4..e2d9be8663 100644 --- a/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/event-grid/domain/tests/e2e/max/main.test.bicep b/modules/event-grid/domain/tests/e2e/max/main.test.bicep index 3be06cfaf7..de3be09b26 100644 --- a/modules/event-grid/domain/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/max/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -122,4 +121,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' '${namePrefix}-topic-${serviceShort}001' ] } -}] +} diff --git a/modules/event-grid/domain/tests/e2e/pe/main.test.bicep b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep index 98d8709f03..ddaa562218 100644 --- a/modules/event-grid/domain/tests/e2e/pe/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep @@ -43,10 +43,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +68,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep index d65df56405..bdb9c0b651 100644 --- a/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/waf-aligned/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -122,4 +121,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' '${namePrefix}-topic-${serviceShort}001' ] } -}] +} diff --git a/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep index ab3814500c..8bfe4a7feb 100644 --- a/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep @@ -60,14 +60,13 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' source: nestedDependencies.outputs.storageAccountResourceId topicType: 'Microsoft.Storage.StorageAccounts' } -}] +} diff --git a/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep index cdcc6727cb..a1fe7d4bf5 100644 --- a/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/max/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -127,4 +126,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep index 943ee3a929..0ca8feb5b6 100644 --- a/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/waf-aligned/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -127,4 +126,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep b/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep index 29f7356f10..89a79f1097 100644 --- a/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/event-grid/topic/tests/e2e/max/main.test.bicep b/modules/event-grid/topic/tests/e2e/max/main.test.bicep index bba0f24999..3ca8f6121e 100644 --- a/modules/event-grid/topic/tests/e2e/max/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/max/main.test.bicep @@ -63,10 +63,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -143,4 +142,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/topic/tests/e2e/pe/main.test.bicep b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep index e2244c60d7..99f3160297 100644 --- a/modules/event-grid/topic/tests/e2e/pe/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep @@ -43,10 +43,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +68,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep b/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep index 10a11dab1b..d093b9d5b8 100644 --- a/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/waf-aligned/main.test.bicep @@ -63,10 +63,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -143,4 +142,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep index 54328adc66..424ca90ffe 100644 --- a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep index c38e8cc89a..a7a3e24d64 100644 --- a/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep @@ -49,10 +49,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -76,4 +75,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } requireInfrastructureEncryption: true } -}] +} diff --git a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep b/modules/event-hub/namespace/tests/e2e/max/main.test.bicep index 519ac8f839..edfc8d7534 100644 --- a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/max/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -226,4 +225,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' maximumThroughputUnits: 4 publicNetworkAccess: 'Disabled' } -}] +} diff --git a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep index e1a8029519..e55e3faf2f 100644 --- a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep @@ -43,10 +43,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +71,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep index 3a0b02e102..53ec10b8b5 100644 --- a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -226,4 +225,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' maximumThroughputUnits: 4 publicNetworkAccess: 'Disabled' } -}] +} diff --git a/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep index f2b46c90a3..827853ed5b 100644 --- a/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep @@ -38,13 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' sku: 'F0' } -}] +} diff --git a/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep index 674122f700..5f1fafa9ee 100644 --- a/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/max/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -76,4 +75,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] } } -}] +} diff --git a/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep index dca2e35ad3..798f69c2f9 100644 --- a/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/waf-aligned/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -76,4 +75,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] } } -}] +} diff --git a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep index d6e6b73cd4..4eb6a8dc85 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep @@ -37,14 +37,13 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' location: location publicNetworkAccess: 'Enabled' } -}] +} diff --git a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep index 7063ebbdc7..5e4f905ce5 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -167,4 +166,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep index 83679dd97b..bad448e7e7 100644 --- a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep @@ -62,10 +62,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -167,4 +166,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/action-group/tests/e2e/defaults/main.test.bicep b/modules/insights/action-group/tests/e2e/defaults/main.test.bicep index 019b31bb3b..5ef4c9a8ef 100644 --- a/modules/insights/action-group/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/defaults/main.test.bicep @@ -38,13 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' groupShortName: 'ag${serviceShort}001' } -}] +} diff --git a/modules/insights/action-group/tests/e2e/max/main.test.bicep b/modules/insights/action-group/tests/e2e/max/main.test.bicep index 55291588f1..7a156298a2 100644 --- a/modules/insights/action-group/tests/e2e/max/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/max/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -86,4 +85,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep index 33b5630927..6059b1d2fd 100644 --- a/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/waf-aligned/main.test.bicep @@ -46,10 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -86,4 +85,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep b/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep index f0b393e71e..74452e4c5f 100644 --- a/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep +++ b/modules/insights/activity-log-alert/tests/e2e/max/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -107,4 +106,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep index 4d12202f85..e44bab24e9 100644 --- a/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/activity-log-alert/tests/e2e/waf-aligned/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -107,4 +106,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/component/tests/e2e/defaults/main.test.bicep b/modules/insights/component/tests/e2e/defaults/main.test.bicep index 2c505a853f..0e4fe18e1f 100644 --- a/modules/insights/component/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/component/tests/e2e/defaults/main.test.bicep @@ -46,13 +46,12 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' workspaceResourceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId } -}] +} diff --git a/modules/insights/component/tests/e2e/max/main.test.bicep b/modules/insights/component/tests/e2e/max/main.test.bicep index 69e8998fab..e272985a9c 100644 --- a/modules/insights/component/tests/e2e/max/main.test.bicep +++ b/modules/insights/component/tests/e2e/max/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -95,4 +94,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep index e1940171ae..19788dc94b 100644 --- a/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/component/tests/e2e/waf-aligned/main.test.bicep @@ -60,10 +60,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -95,4 +94,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep index 9d0759239d..296447c846 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep @@ -37,12 +37,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep index 3cc4c9c606..0bcea4cb4a 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/max/main.test.bicep @@ -46,10 +46,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +71,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep index db4a6e31a0..e587afcd6a 100644 --- a/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/waf-aligned/main.test.bicep @@ -46,10 +46,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -72,4 +71,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep index df94e99d0e..2e2f2a7d14 100644 --- a/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep @@ -45,10 +45,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -142,4 +141,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep index b044a95732..b0ae869187 100644 --- a/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep @@ -45,10 +45,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -126,4 +125,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep index 16bc3e3382..d157de08b6 100644 --- a/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep @@ -45,10 +45,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' dataCollectionEndpointId: resourceGroupResources.outputs.dataCollectionEndpointResourceId @@ -105,4 +104,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep index 0328438f44..9ba5932555 100644 --- a/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep @@ -37,10 +37,9 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' dataSources: { @@ -84,4 +83,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' enableDefaultTelemetry: enableDefaultTelemetry kind: 'Windows' } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep index 8a213a0651..5b5664ffe9 100644 --- a/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep @@ -44,10 +44,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' description: 'Collecting Linux-specific performance counters and Linux Syslog' @@ -218,4 +217,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Linux' } } -}] +} diff --git a/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep index 5831e1db12..9d2ee0f182 100644 --- a/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep @@ -44,10 +44,9 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' description: 'Collecting Windows-specific performance counters and Windows Event Logs' @@ -172,4 +171,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' kind: 'Windows' } } -}] +} diff --git a/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep b/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep index 82001d753f..b26c05e269 100644 --- a/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep +++ b/modules/insights/diagnostic-setting/tests/e2e/max/main.test.bicep @@ -52,9 +52,8 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' +module testDeployment '../../../main.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -68,4 +67,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId } -}] +} diff --git a/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep index a84b3f82bc..7836a24eed 100644 --- a/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/diagnostic-setting/tests/e2e/waf-aligned/main.test.bicep @@ -52,9 +52,8 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' +module testDeployment '../../../main.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -68,4 +67,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId } -}] +} diff --git a/modules/insights/metric-alert/tests/e2e/max/main.test.bicep b/modules/insights/metric-alert/tests/e2e/max/main.test.bicep index aff5f631ca..f9cc7d5482 100644 --- a/modules/insights/metric-alert/tests/e2e/max/main.test.bicep +++ b/modules/insights/metric-alert/tests/e2e/max/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -85,4 +84,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep index edad7e8898..ee7bf8abbd 100644 --- a/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/metric-alert/tests/e2e/waf-aligned/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -85,4 +84,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep index 33740e555d..2ed54c7791 100644 --- a/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep index dc9ca75fdc..6b92ace5e2 100644 --- a/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep +++ b/modules/insights/private-link-scope/tests/e2e/max/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -87,4 +86,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep index c18ef415f3..bda1d61e70 100644 --- a/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/private-link-scope/tests/e2e/waf-aligned/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -87,4 +86,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep b/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep index 703927ec7c..d8bc06cf5e 100644 --- a/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep +++ b/modules/insights/scheduled-query-rule/tests/e2e/max/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +102,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep index 3690a19042..6c924009a5 100644 --- a/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/scheduled-query-rule/tests/e2e/waf-aligned/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -103,4 +102,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/insights/webtest/tests/e2e/defaults/main.test.bicep b/modules/insights/webtest/tests/e2e/defaults/main.test.bicep index a8c77a7505..99e6969ed2 100644 --- a/modules/insights/webtest/tests/e2e/defaults/main.test.bicep +++ b/modules/insights/webtest/tests/e2e/defaults/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' tags: { @@ -65,4 +64,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' HttpVerb: 'GET' } } -}] +} diff --git a/modules/insights/webtest/tests/e2e/max/main.test.bicep b/modules/insights/webtest/tests/e2e/max/main.test.bicep index 6821002ea8..1a552a552b 100644 --- a/modules/insights/webtest/tests/e2e/max/main.test.bicep +++ b/modules/insights/webtest/tests/e2e/max/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' tags: { @@ -75,4 +74,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' name: 'myCustomLockName' } } -}] +} diff --git a/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep b/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep index 8674910b4f..0fcdae082d 100644 --- a/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/insights/webtest/tests/e2e/waf-aligned/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' tags: { @@ -75,4 +74,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' name: 'myCustomLockName' } } -}] +} From 2c661854eebc6e689c28112a821d41256a8bcec2 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 14 Nov 2023 17:38:25 +0100 Subject: [PATCH 4/5] Undid non-working changes --- .../tests/e2e/max/main.test.bicep | 7 +-- .../tests/e2e/waf-aligned/main.test.bicep | 7 +-- modules/cache/redis/README.md | 12 ++-- modules/cache/redis/main.bicep | 6 +- modules/cache/redis/main.json | 18 +++--- .../redis/tests/e2e/defaults/main.test.bicep | 7 +-- .../cache/redis/tests/e2e/max/main.test.bicep | 9 ++- .../tests/e2e/waf-aligned/main.test.bicep | 9 ++- modules/compute/virtual-machine/README.md | 12 ++-- modules/compute/virtual-machine/main.bicep | 6 +- modules/compute/virtual-machine/main.json | 62 +++++++++---------- .../tests/e2e/linux.atmg/main.test.bicep | 7 +-- .../tests/e2e/linux.min/main.test.bicep | 7 +-- .../tests/e2e/linux/main.test.bicep | 9 ++- .../tests/e2e/windows.atmg/main.test.bicep | 7 +-- .../tests/e2e/windows.min/main.test.bicep | 7 +-- .../tests/e2e/windows.ssecmk/main.test.bicep | 7 +-- .../tests/e2e/windows/main.test.bicep | 9 ++- .../managed-cluster/README.md | 16 ++--- .../managed-cluster/main.bicep | 6 +- .../managed-cluster/main.json | 22 +++---- .../tests/e2e/azure/main.test.bicep | 9 ++- .../tests/e2e/defaults/main.test.bicep | 7 +-- .../tests/e2e/kubenet/main.test.bicep | 9 ++- .../tests/e2e/priv/main.test.bicep | 9 ++- 25 files changed, 135 insertions(+), 151 deletions(-) diff --git a/modules/aad/domain-service/tests/e2e/max/main.test.bicep b/modules/aad/domain-service/tests/e2e/max/main.test.bicep index ded712cfce..57a8a8aae6 100644 --- a/modules/aad/domain-service/tests/e2e/max/main.test.bicep +++ b/modules/aad/domain-service/tests/e2e/max/main.test.bicep @@ -68,10 +68,9 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { scope: resourceGroup } -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -107,4 +106,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep index c5528895c7..605f339c95 100644 --- a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep @@ -68,10 +68,9 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { scope: resourceGroup } -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -107,4 +106,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/cache/redis/README.md b/modules/cache/redis/README.md index 500c93fa81..45e6ec422f 100644 --- a/modules/cache/redis/README.md +++ b/modules/cache/redis/README.md @@ -121,7 +121,7 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = { } managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -207,7 +207,7 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = { "managedIdentities": { "value": { "systemAssigned": true, - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -303,7 +303,7 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = { } managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -389,7 +389,7 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = { "managedIdentities": { "value": { "systemAssigned": true, - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -675,7 +675,7 @@ The managed identity definition for this resource. | Name | Required | Type | Description | | :-- | :-- | :--| :-- | | [`systemAssigned`](#parameter-managedidentitiessystemassigned) | No | bool | Optional. Enables system assigned managed identity on the resource. | -| [`userAssignedResourcesIds`](#parameter-managedidentitiesuserassignedresourcesids) | No | array | Optional. The resource ID(s) to assign to the resource. | +| [`userAssignedResourceIds`](#parameter-managedidentitiesuserassignedresourceids) | No | array | Optional. The resource ID(s) to assign to the resource. | ### Parameter: `managedIdentities.systemAssigned` @@ -684,7 +684,7 @@ Optional. Enables system assigned managed identity on the resource. - Required: No - Type: bool -### Parameter: `managedIdentities.userAssignedResourcesIds` +### Parameter: `managedIdentities.userAssignedResourceIds` Optional. The resource ID(s) to assign to the resource. diff --git a/modules/cache/redis/main.bicep b/modules/cache/redis/main.bicep index e1c36e16c3..bb1d2191e5 100644 --- a/modules/cache/redis/main.bicep +++ b/modules/cache/redis/main.bicep @@ -107,10 +107,10 @@ param enableDefaultTelemetry bool = true var availabilityZones = skuName == 'Premium' ? zoneRedundant ? !empty(zones) ? zones : pickZones('Microsoft.Cache', 'redis', location, 3) : [] : [] -var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourcesIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } +var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourceIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } var identity = !empty(managedIdentities) ? { - type: (managedIdentities.?systemAssigned ?? false) ? (!empty(managedIdentities.?userAssignedResourcesIds ?? {}) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(managedIdentities.?userAssignedResourcesIds ?? {}) ? 'UserAssigned' : null) + type: (managedIdentities.?systemAssigned ?? false) ? (!empty(managedIdentities.?userAssignedResourceIds ?? {}) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(managedIdentities.?userAssignedResourceIds ?? {}) ? 'UserAssigned' : null) userAssignedIdentities: !empty(formattedUserAssignedIdentities) ? formattedUserAssignedIdentities : null } : null @@ -269,7 +269,7 @@ type managedIdentitiesType = { systemAssigned: bool? @description('Optional. The resource ID(s) to assign to the resource.') - userAssignedResourcesIds: string[]? + userAssignedResourceIds: string[]? }? type lockType = { diff --git a/modules/cache/redis/main.json b/modules/cache/redis/main.json index 4d5ef453b0..f05edb97ec 100644 --- a/modules/cache/redis/main.json +++ b/modules/cache/redis/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14680360433148567844" + "version": "0.23.1.45101", + "templateHash": "7671125906841819197" }, "name": "Redis Cache", "description": "This module deploys a Redis Cache.", @@ -23,7 +23,7 @@ "description": "Optional. Enables system assigned managed identity on the resource." } }, - "userAssignedResourcesIds": { + "userAssignedResourceIds": { "type": "array", "items": { "type": "string" @@ -606,8 +606,8 @@ }, "variables": { "availabilityZones": "[if(equals(parameters('skuName'), 'Premium'), if(parameters('zoneRedundant'), if(not(empty(parameters('zones'))), parameters('zones'), pickZones('Microsoft.Cache', 'redis', parameters('location'), 3)), createArray()), createArray())]", - "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", - "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false()), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createObject()))), 'SystemAssigned,UserAssigned', 'SystemAssigned'), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", + "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", + "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false()), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createObject()))), 'SystemAssigned,UserAssigned', 'SystemAssigned'), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", "enableReferencedModulesTelemetry": false, "builtInRoleNames": { "Contributor": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')]", @@ -791,8 +791,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.", @@ -1194,8 +1194,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/cache/redis/tests/e2e/defaults/main.test.bicep b/modules/cache/redis/tests/e2e/defaults/main.test.bicep index 2a915f730c..4c8ef85da3 100644 --- a/modules/cache/redis/tests/e2e/defaults/main.test.bicep +++ b/modules/cache/redis/tests/e2e/defaults/main.test.bicep @@ -38,12 +38,11 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -}] +} diff --git a/modules/cache/redis/tests/e2e/max/main.test.bicep b/modules/cache/redis/tests/e2e/max/main.test.bicep index a22d38e2f5..dd1a06da7d 100644 --- a/modules/cache/redis/tests/e2e/max/main.test.bicep +++ b/modules/cache/redis/tests/e2e/max/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -110,7 +109,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' skuName: 'Premium' managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -119,4 +118,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' resourceType: 'Redis Cache' } } -}] +} diff --git a/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep b/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep index b6bcc8ad00..01f1338b3d 100644 --- a/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/cache/redis/tests/e2e/waf-aligned/main.test.bicep @@ -61,10 +61,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -110,7 +109,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' skuName: 'Premium' managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -119,4 +118,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' resourceType: 'Redis Cache' } } -}] +} diff --git a/modules/compute/virtual-machine/README.md b/modules/compute/virtual-machine/README.md index bda155d259..dfe8bb4ccc 100644 --- a/modules/compute/virtual-machine/README.md +++ b/modules/compute/virtual-machine/README.md @@ -254,7 +254,7 @@ module virtualMachine 'br:bicep/modules/compute.virtual-machine:1.0.0' = { } managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -551,7 +551,7 @@ module virtualMachine 'br:bicep/modules/compute.virtual-machine:1.0.0' = { "managedIdentities": { "value": { "systemAssigned": true, - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -1152,7 +1152,7 @@ module virtualMachine 'br:bicep/modules/compute.virtual-machine:1.0.0' = { } managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -1469,7 +1469,7 @@ module virtualMachine 'br:bicep/modules/compute.virtual-machine:1.0.0' = { "managedIdentities": { "value": { "systemAssigned": true, - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -2371,7 +2371,7 @@ The managed identity definition for this resource. The system-assigned managed i | Name | Required | Type | Description | | :-- | :-- | :--| :-- | | [`systemAssigned`](#parameter-managedidentitiessystemassigned) | No | bool | Optional. Enables system assigned managed identity on the resource. | -| [`userAssignedResourcesIds`](#parameter-managedidentitiesuserassignedresourcesids) | No | array | Optional. The resource ID(s) to assign to the resource. | +| [`userAssignedResourceIds`](#parameter-managedidentitiesuserassignedresourceids) | No | array | Optional. The resource ID(s) to assign to the resource. | ### Parameter: `managedIdentities.systemAssigned` @@ -2380,7 +2380,7 @@ Optional. Enables system assigned managed identity on the resource. - Required: No - Type: bool -### Parameter: `managedIdentities.userAssignedResourcesIds` +### Parameter: `managedIdentities.userAssignedResourceIds` Optional. The resource ID(s) to assign to the resource. diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index b7b7bf73f7..a8660a203e 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -294,11 +294,11 @@ var accountSasProperties = { signedProtocol: 'https' } -var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourcesIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } +var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourceIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } // If AADJoin Extension is enabled then we automatically enable SystemAssigned (required by AADJoin), otherwise we follow the usual logic. var identity = !empty(managedIdentities) ? { - type: (extensionAadJoinConfig.enabled ? true : (managedIdentities.?systemAssigned ?? false)) ? (!empty(managedIdentities.?userAssignedResourcesIds ?? {}) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(managedIdentities.?userAssignedResourcesIds ?? {}) ? 'UserAssigned' : null) + type: (extensionAadJoinConfig.enabled ? true : (managedIdentities.?systemAssigned ?? false)) ? (!empty(managedIdentities.?userAssignedResourceIds ?? {}) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(managedIdentities.?userAssignedResourceIds ?? {}) ? 'UserAssigned' : null) userAssignedIdentities: !empty(formattedUserAssignedIdentities) ? formattedUserAssignedIdentities : null } : null @@ -698,7 +698,7 @@ type managedIdentitiesType = { systemAssigned: bool? @description('Optional. The resource ID(s) to assign to the resource.') - userAssignedResourcesIds: string[]? + userAssignedResourceIds: string[]? }? type lockType = { diff --git a/modules/compute/virtual-machine/main.json b/modules/compute/virtual-machine/main.json index 2fd9016b0e..601f4cfe90 100644 --- a/modules/compute/virtual-machine/main.json +++ b/modules/compute/virtual-machine/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "6920007226521594959" + "version": "0.23.1.45101", + "templateHash": "10032149803242831111" }, "name": "Virtual Machines", "description": "This module deploys a Virtual Machine with one or multiple NICs and optionally one or multiple public IPs.", @@ -23,7 +23,7 @@ "description": "Optional. Enables system assigned managed identity on the resource." } }, - "userAssignedResourcesIds": { + "userAssignedResourceIds": { "type": "array", "items": { "type": "string" @@ -757,8 +757,8 @@ "signedResourceTypes": "o", "signedProtocol": "https" }, - "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", - "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(if(parameters('extensionAadJoinConfig').enabled, true(), coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false())), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createObject()))), 'SystemAssigned,UserAssigned', 'SystemAssigned'), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", + "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", + "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(if(parameters('extensionAadJoinConfig').enabled, true(), coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false())), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createObject()))), 'SystemAssigned,UserAssigned', 'SystemAssigned'), if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", "enableReferencedModulesTelemetry": false, "builtInRoleNames": { "Contributor": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')]", @@ -1000,8 +1000,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10482660512843717253" + "version": "0.23.1.45101", + "templateHash": "10451257297733630828" } }, "definitions": { @@ -1304,8 +1304,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.", @@ -1849,8 +1849,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.", @@ -2344,8 +2344,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -2571,8 +2571,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -2793,8 +2793,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -3020,8 +3020,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -3238,8 +3238,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -3455,8 +3455,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -3676,8 +3676,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -3905,8 +3905,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -4127,8 +4127,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9638144716839375831" + "version": "0.23.1.45101", + "templateHash": "5421737065579119324" }, "name": "Virtual Machine Extensions", "description": "This module deploys a Virtual Machine Extension.", @@ -4348,8 +4348,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "7148492251760573310" + "version": "0.23.1.45101", + "templateHash": "9921011786088905122" }, "name": "Recovery Service Vaults Protection Container Protected Item", "description": "This module deploys a Recovery Services Vault Protection Container Protected Item.", diff --git a/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep index abe9d3477e..4e53732a23 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep @@ -52,10 +52,9 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -121,4 +120,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep index abc4778738..4c3fffb43d 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep @@ -52,10 +52,9 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -100,4 +99,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep index bdbb80ac95..a0562afb0a 100644 --- a/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep @@ -67,10 +67,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}' @@ -289,7 +288,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -302,4 +301,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' dependsOn: [ nestedDependencies // Required to leverage `existing` SSH key reference ] -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep index 57fe099203..b1314bce14 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep @@ -48,10 +48,9 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -90,4 +89,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep index 65bb1d8a5d..68c34d8494 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep @@ -47,10 +47,9 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -83,4 +82,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' vmSize: 'Standard_DS2_v2' adminPassword: password } -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep index aab6f53a26..ff7c06d244 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep @@ -53,10 +53,9 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -108,4 +107,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep index cf3f774315..e095862d0d 100644 --- a/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep @@ -70,10 +70,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry location: location @@ -310,7 +309,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] managedIdentities: { systemAssigned: true - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -320,4 +319,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/container-service/managed-cluster/README.md b/modules/container-service/managed-cluster/README.md index f2de8470fa..aaf0d56ddb 100644 --- a/modules/container-service/managed-cluster/README.md +++ b/modules/container-service/managed-cluster/README.md @@ -215,7 +215,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' name: 'myCustomLockName' } managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -461,7 +461,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' }, "managedIdentities": { "value": { - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -680,7 +680,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' ] enableDefaultTelemetry: '' managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -813,7 +813,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' }, "managedIdentities": { "value": { - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -947,7 +947,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' enableDefaultTelemetry: '' enablePrivateCluster: true managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ '' ] } @@ -1084,7 +1084,7 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' }, "managedIdentities": { "value": { - "userAssignedResourcesIds": [ + "userAssignedResourceIds": [ "" ] } @@ -1880,7 +1880,7 @@ The managed identity definition for this resource. Only one type of identity is | Name | Required | Type | Description | | :-- | :-- | :--| :-- | | [`systemAssigned`](#parameter-managedidentitiessystemassigned) | No | bool | Optional. Enables system assigned managed identity on the resource. | -| [`userAssignedResourcesIds`](#parameter-managedidentitiesuserassignedresourcesids) | No | array | Optional. The resource ID(s) to assign to the resource. | +| [`userAssignedResourceIds`](#parameter-managedidentitiesuserassignedresourceids) | No | array | Optional. The resource ID(s) to assign to the resource. | ### Parameter: `managedIdentities.systemAssigned` @@ -1889,7 +1889,7 @@ Optional. Enables system assigned managed identity on the resource. - Required: No - Type: bool -### Parameter: `managedIdentities.userAssignedResourcesIds` +### Parameter: `managedIdentities.userAssignedResourceIds` Optional. The resource ID(s) to assign to the resource. diff --git a/modules/container-service/managed-cluster/main.bicep b/modules/container-service/managed-cluster/main.bicep index aa3216df86..efb5974f2d 100644 --- a/modules/container-service/managed-cluster/main.bicep +++ b/modules/container-service/managed-cluster/main.bicep @@ -348,10 +348,10 @@ param httpProxyConfig object = {} @description('Optional. Identities associated with the cluster.') param identityProfile object = {} -var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourcesIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } +var formattedUserAssignedIdentities = reduce(map((managedIdentities.?userAssignedResourceIds ?? []), (id) => { '${id}': {} }), {}, (cur, next) => union(cur, next)) // Converts the flat array to an object like { '${id1}': {}, '${id2}': {} } var identity = !empty(managedIdentities) ? { - type: (managedIdentities.?systemAssigned ?? false) ? 'SystemAssigned' : (!empty(managedIdentities.?userAssignedResourcesIds ?? {}) ? 'UserAssigned' : null) + type: (managedIdentities.?systemAssigned ?? false) ? 'SystemAssigned' : (!empty(managedIdentities.?userAssignedResourceIds ?? {}) ? 'UserAssigned' : null) userAssignedIdentities: !empty(formattedUserAssignedIdentities) ? formattedUserAssignedIdentities : null } : null @@ -735,7 +735,7 @@ type managedIdentitiesType = { systemAssigned: bool? @description('Optional. The resource ID(s) to assign to the resource.') - userAssignedResourcesIds: string[]? + userAssignedResourceIds: string[]? }? type lockType = { diff --git a/modules/container-service/managed-cluster/main.json b/modules/container-service/managed-cluster/main.json index 552037b85f..55eb6b6a7c 100644 --- a/modules/container-service/managed-cluster/main.json +++ b/modules/container-service/managed-cluster/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "15042684995150005891" + "version": "0.23.1.45101", + "templateHash": "10758692765653328788" }, "name": "Azure Kubernetes Service (AKS) Managed Clusters", "description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster.", @@ -23,7 +23,7 @@ "description": "Optional. Enables system assigned managed identity on the resource." } }, - "userAssignedResourcesIds": { + "userAssignedResourceIds": { "type": "array", "items": { "type": "string" @@ -941,8 +941,8 @@ } }, "variables": { - "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", - "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false()), 'SystemAssigned', if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourcesIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", + "formattedUserAssignedIdentities": "[reduce(map(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createArray()), lambda('id', createObject(format('{0}', lambdaVariables('id')), createObject()))), createObject(), lambda('cur', 'next', union(lambdaVariables('cur'), lambdaVariables('next'))))]", + "identity": "[if(not(empty(parameters('managedIdentities'))), createObject('type', if(coalesce(tryGet(parameters('managedIdentities'), 'systemAssigned'), false()), 'SystemAssigned', if(not(empty(coalesce(tryGet(parameters('managedIdentities'), 'userAssignedResourceIds'), createObject()))), 'UserAssigned', null())), 'userAssignedIdentities', if(not(empty(variables('formattedUserAssignedIdentities'))), variables('formattedUserAssignedIdentities'), null())), null())]", "linuxProfile": { "adminUsername": "[parameters('adminUsername')]", "ssh": { @@ -1285,8 +1285,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "15823498371287518640" + "version": "0.23.1.45101", + "templateHash": "13811832596066396545" }, "name": "Azure Kubernetes Service (AKS) Managed Cluster Agent Pools", "description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster Agent Pool.", @@ -1737,8 +1737,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5002606439705018990" + "version": "0.23.1.45101", + "templateHash": "18265527122738367400" }, "name": "Kubernetes Configuration Extensions", "description": "This module deploys a Kubernetes Configuration Extension.", @@ -1900,8 +1900,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "6686104224333946371" + "version": "0.23.1.45101", + "templateHash": "8985718648814286209" }, "name": "Kubernetes Configuration Flux Configurations", "description": "This module deploys a Kubernetes Configuration Flux Configuration.", diff --git a/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep index 3478814ed8..7776f4752f 100644 --- a/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep @@ -68,10 +68,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -176,7 +175,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' enableStorageProfileFileCSIDriver: true enableStorageProfileSnapshotController: true managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -265,4 +264,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] } } -}] +} diff --git a/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep index e152e775ae..833719b5e2 100644 --- a/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep @@ -34,10 +34,9 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { location: location } -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' enableDefaultTelemetry: enableDefaultTelemetry @@ -53,4 +52,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] } -}] +} diff --git a/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep index ac7a497a78..9c91011d20 100644 --- a/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep @@ -58,10 +58,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -158,7 +157,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } ] managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -168,4 +167,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} diff --git a/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep index cd287517a6..8d911c5cc9 100644 --- a/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep @@ -59,10 +59,9 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { +module testDeployment '../../../main.bicep' = { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -159,7 +158,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ] privateDNSZone: nestedDependencies.outputs.privateDnsZoneResourceId managedIdentities: { - userAssignedResourcesIds: [ + userAssignedResourceIds: [ nestedDependencies.outputs.managedIdentityResourceId ] } @@ -169,4 +168,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' Role: 'DeploymentValidation' } } -}] +} From 410c7d1ffedd43767cac6c8f1be08bb6e23a4187 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 14 Nov 2023 18:36:20 +0100 Subject: [PATCH 5/5] Refreshed json --- modules/analysis-services/server/main.json | 4 +- modules/app/managed-environment/main.json | 4 +- modules/cache/redis-enterprise/main.json | 16 +++---- modules/cdn/profile/main.json | 44 +++++++++---------- modules/compute/availability-set/main.json | 4 +- modules/compute/disk/main.json | 4 +- modules/compute/gallery/main.json | 12 ++--- modules/compute/image/main.json | 4 +- .../proximity-placement-group/main.json | 4 +- modules/compute/ssh-public-key/main.json | 4 +- modules/consumption/budget/main.json | 4 +- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/modules/analysis-services/server/main.json b/modules/analysis-services/server/main.json index 3066c30ae2..cb62fdcfee 100644 --- a/modules/analysis-services/server/main.json +++ b/modules/analysis-services/server/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "17464709928355207715" + "version": "0.23.1.45101", + "templateHash": "11444956126966610005" }, "name": "Analysis Services Servers", "description": "This module deploys an Analysis Services Server.", diff --git a/modules/app/managed-environment/main.json b/modules/app/managed-environment/main.json index d8bb5e7173..cd7af31c94 100644 --- a/modules/app/managed-environment/main.json +++ b/modules/app/managed-environment/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5686402227763337334" + "version": "0.23.1.45101", + "templateHash": "17510800738142190994" }, "name": "App ManagedEnvironments", "description": "This module deploys an App Managed Environment (also known as a Container App Environment).", diff --git a/modules/cache/redis-enterprise/main.json b/modules/cache/redis-enterprise/main.json index c18ec7b248..27f647f9e5 100644 --- a/modules/cache/redis-enterprise/main.json +++ b/modules/cache/redis-enterprise/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12509329417393938084" + "version": "0.23.1.45101", + "templateHash": "9202709558148407604" }, "name": "Redis Cache Enterprise", "description": "This module deploys a Redis Cache Enterprise.", @@ -602,8 +602,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "8155705065039005753" + "version": "0.23.1.45101", + "templateHash": "2473493174520406257" }, "name": "Redis Cache Enterprise Databases", "description": "This module deploys a Redis Cache Enterprise Database.", @@ -866,8 +866,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.", @@ -1269,8 +1269,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/cdn/profile/main.json b/modules/cdn/profile/main.json index de8d882e50..e8a03d38c8 100644 --- a/modules/cdn/profile/main.json +++ b/modules/cdn/profile/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "2807663755404362270" + "version": "0.23.1.45101", + "templateHash": "17584746093289526242" }, "name": "CDN Profiles", "description": "This module deploys a CDN Profile.", @@ -333,8 +333,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "4870857598190177606" + "version": "0.23.1.45101", + "templateHash": "15779750813347176502" }, "name": "CDN Profiles Endpoints", "description": "This module deploys a CDN Profile Endpoint.", @@ -463,8 +463,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5759722302271159823" + "version": "0.23.1.45101", + "templateHash": "7311789591820295360" }, "name": "CDN Profiles Endpoints Origins", "description": "This module deploys a CDN Profile Endpoint Origin.", @@ -706,8 +706,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "10634340039151667854" + "version": "0.23.1.45101", + "templateHash": "7448367317152547669" }, "name": "CDN Profiles Secret", "description": "This module deploys a CDN Profile Secret.", @@ -869,8 +869,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "1547160911539181378" + "version": "0.23.1.45101", + "templateHash": "16926903089536842323" }, "name": "CDN Profiles Custom Domains", "description": "This module deploys a CDN Profile Custom Domains.", @@ -1053,8 +1053,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "5730470112775090005" + "version": "0.23.1.45101", + "templateHash": "11717674362000061520" }, "name": "CDN Profiles Origin Group", "description": "This module deploys a CDN Profile Origin Group.", @@ -1192,8 +1192,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "6401260748375374430" + "version": "0.23.1.45101", + "templateHash": "6315538909881747607" }, "name": "CDN Profiles Origin", "description": "This module deploys a CDN Profile Origin.", @@ -1423,8 +1423,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "2165712570349315066" + "version": "0.23.1.45101", + "templateHash": "14060531422180532953" }, "name": "CDN Profiles Rule Sets", "description": "This module deploys a CDN Profile rule set.", @@ -1522,8 +1522,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "17627422900186578144" + "version": "0.23.1.45101", + "templateHash": "7170380293485699276" }, "name": "CDN Profiles Rules", "description": "This module deploys a CDN Profile rule.", @@ -1709,8 +1709,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "14944467223785761559" + "version": "0.23.1.45101", + "templateHash": "10217508381442897285" }, "name": "CDN Profiles AFD Endpoints", "description": "This module deploys a CDN Profile AFD Endpoint.", @@ -1864,8 +1864,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "13253134886056545686" + "version": "0.23.1.45101", + "templateHash": "6429015991033675991" }, "name": "CDN Profiles AFD Endpoint Route", "description": "This module deploys a CDN Profile AFD Endpoint route.", diff --git a/modules/compute/availability-set/main.json b/modules/compute/availability-set/main.json index fec33868ce..b95d3d6e5b 100644 --- a/modules/compute/availability-set/main.json +++ b/modules/compute/availability-set/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "1732304861308894467" + "version": "0.23.1.45101", + "templateHash": "10273034762819706688" }, "name": "Availability Sets", "description": "This module deploys an Availability Set.", diff --git a/modules/compute/disk/main.json b/modules/compute/disk/main.json index 83bb0e27a3..efff55288f 100644 --- a/modules/compute/disk/main.json +++ b/modules/compute/disk/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "4197028586802526466" + "version": "0.23.1.45101", + "templateHash": "13415296044159532527" }, "name": "Compute Disks", "description": "This module deploys a Compute Disk", diff --git a/modules/compute/gallery/main.json b/modules/compute/gallery/main.json index 3994fa8cb5..988b6b53a7 100644 --- a/modules/compute/gallery/main.json +++ b/modules/compute/gallery/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "3058018993104486515" + "version": "0.23.1.45101", + "templateHash": "8907363611903070816" }, "name": "Azure Compute Galleries", "description": "This module deploys an Azure Compute Gallery (formerly known as Shared Image Gallery).", @@ -283,8 +283,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "4468420728204112478" + "version": "0.23.1.45101", + "templateHash": "8232745966352037801" }, "name": "Compute Galleries Applications", "description": "This module deploys an Azure Compute Gallery Application.", @@ -617,8 +617,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12640831453229356933" + "version": "0.23.1.45101", + "templateHash": "3383509605637851908" }, "name": "Compute Galleries Image Definitions", "description": "This module deploys an Azure Compute Gallery Image Definition.", diff --git a/modules/compute/image/main.json b/modules/compute/image/main.json index bcbe6df5a3..d559e8bc9b 100644 --- a/modules/compute/image/main.json +++ b/modules/compute/image/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "9558360786962697877" + "version": "0.23.1.45101", + "templateHash": "18345867974770384550" }, "name": "Images", "description": "This module deploys a Compute Image.", diff --git a/modules/compute/proximity-placement-group/main.json b/modules/compute/proximity-placement-group/main.json index 36747472f3..cf403363a2 100644 --- a/modules/compute/proximity-placement-group/main.json +++ b/modules/compute/proximity-placement-group/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "11278878938849478552" + "version": "0.23.1.45101", + "templateHash": "2277527270184526895" }, "name": "Proximity Placement Groups", "description": "This module deploys a Proximity Placement Group.", diff --git a/modules/compute/ssh-public-key/main.json b/modules/compute/ssh-public-key/main.json index d71da3411e..bf19a6c816 100644 --- a/modules/compute/ssh-public-key/main.json +++ b/modules/compute/ssh-public-key/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "12563605105819727190" + "version": "0.23.1.45101", + "templateHash": "5802465844150331034" }, "name": "Public SSH Keys", "description": "This module deploys a Public SSH Key.\r\n\r\n> Note: The resource does not auto-generate the key for you.", diff --git a/modules/consumption/budget/main.json b/modules/consumption/budget/main.json index a65a1bbfe8..31a5523934 100644 --- a/modules/consumption/budget/main.json +++ b/modules/consumption/budget/main.json @@ -4,8 +4,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "2760526032764483110" + "version": "0.23.1.45101", + "templateHash": "10861664842554589267" }, "name": "Consumption Budgets", "description": "This module deploys a Consumption Budget for Subscriptions.",