From 38ad8c4aa7f78e56bbe982a8599fff11d85d517e Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 18:57:00 +0100 Subject: [PATCH 1/7] Updated batch 5 --- .../workspace/tests/e2e/adv/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 ++++--- .../solution/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../solution/tests/e2e/ms/main.test.bicep | 7 ++++--- .../solution/tests/e2e/nonms/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/mg.common/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/mg.min/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/rg.common/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/rg.min/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/sub.common/main.test.bicep | 7 ++++--- .../remediation/tests/e2e/sub.min/main.test.bicep | 7 ++++--- .../capacity/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../capacity/tests/e2e/max/main.test.bicep | 7 ++++--- .../capacity/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/purview/account/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/purview/account/tests/e2e/max/main.test.bicep | 7 ++++--- .../purview/account/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../vault/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../recovery-services/vault/tests/e2e/dr/main.test.bicep | 7 ++++--- .../recovery-services/vault/tests/e2e/max/main.test.bicep | 7 ++++--- .../vault/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/relay/namespace/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/relay/namespace/tests/e2e/max/main.test.bicep | 7 ++++--- modules/relay/namespace/tests/e2e/pe/main.test.bicep | 7 ++++--- .../relay/namespace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../query/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/resource-graph/query/tests/e2e/max/main.test.bicep | 7 ++++--- .../query/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../deployment-script/tests/e2e/cli/main.test.bicep | 7 ++++--- .../deployment-script/tests/e2e/ps/main.test.bicep | 7 ++++--- .../resource-group/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../resources/resource-group/tests/e2e/max/main.test.bicep | 7 ++++--- .../resource-group/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/resources/tags/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/resources/tags/tests/e2e/rg/main.test.bicep | 7 ++++--- modules/resources/tags/tests/e2e/sub/main.test.bicep | 7 ++++--- .../search-service/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../search/search-service/tests/e2e/max/main.test.bicep | 7 ++++--- modules/search/search-service/tests/e2e/pe/main.test.bicep | 7 ++++--- .../search-service/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../azure-security-center/tests/e2e/max/main.test.bicep | 7 ++++--- .../tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../namespace/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../service-bus/namespace/tests/e2e/encr/main.test.bicep | 7 ++++--- .../service-bus/namespace/tests/e2e/max/main.test.bicep | 7 ++++--- modules/service-bus/namespace/tests/e2e/pe/main.test.bicep | 7 ++++--- .../namespace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../service-fabric/cluster/tests/e2e/cert/main.test.bicep | 7 ++++--- .../cluster/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../service-fabric/cluster/tests/e2e/max/main.test.bicep | 7 ++++--- .../cluster/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../signal-r/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../signal-r/tests/e2e/max/main.test.bicep | 7 ++++--- .../signal-r/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../web-pub-sub/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../web-pub-sub/tests/e2e/max/main.test.bicep | 7 ++++--- .../web-pub-sub/tests/e2e/pe/main.test.bicep | 7 ++++--- .../web-pub-sub/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../managed-instance/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/sql/managed-instance/tests/e2e/max/main.test.bicep | 7 ++++--- .../managed-instance/tests/e2e/vulnAssm/main.test.bicep | 7 ++++--- .../managed-instance/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/admin/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/max/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/pe/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/secondary/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/vulnAssm/main.test.bicep | 7 ++++--- modules/sql/server/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../storage-account/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../storage/storage-account/tests/e2e/encr/main.test.bicep | 7 ++++--- .../storage/storage-account/tests/e2e/max/main.test.bicep | 7 ++++--- .../storage/storage-account/tests/e2e/nfs/main.test.bicep | 7 ++++--- .../storage/storage-account/tests/e2e/v1/main.test.bicep | 7 ++++--- .../storage-account/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../private-link-hub/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../synapse/private-link-hub/tests/e2e/max/main.test.bicep | 7 ++++--- .../private-link-hub/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../synapse/workspace/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../synapse/workspace/tests/e2e/encrwsai/main.test.bicep | 7 ++++--- .../synapse/workspace/tests/e2e/encrwuai/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/managedvnet/main.test.bicep | 7 ++++--- modules/synapse/workspace/tests/e2e/max/main.test.bicep | 7 ++++--- .../workspace/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../image-template/tests/e2e/defaults/main.test.bicep | 7 ++++--- .../image-template/tests/e2e/max/main.test.bicep | 7 ++++--- .../image-template/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- modules/web/connection/tests/e2e/max/main.test.bicep | 7 ++++--- .../web/connection/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../hosting-environment/tests/e2e/asev2/main.test.bicep | 7 ++++--- .../hosting-environment/tests/e2e/asev3/main.test.bicep | 7 ++++--- modules/web/serverfarm/tests/e2e/max/main.test.bicep | 7 ++++--- .../web/serverfarm/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- .../web/site/tests/e2e/functionAppCommon/main.test.bicep | 7 ++++--- modules/web/site/tests/e2e/functionAppMin/main.test.bicep | 7 ++++--- modules/web/site/tests/e2e/webAppCommon/main.test.bicep | 7 ++++--- modules/web/site/tests/e2e/webAppMin/main.test.bicep | 7 ++++--- modules/web/static-site/tests/e2e/defaults/main.test.bicep | 7 ++++--- modules/web/static-site/tests/e2e/max/main.test.bicep | 7 ++++--- .../web/static-site/tests/e2e/waf-aligned/main.test.bicep | 7 ++++--- 101 files changed, 404 insertions(+), 303 deletions(-) diff --git a/modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep index 04e0f54a59..0d42eddf87 100644 --- a/modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep +++ b/modules/operational-insights/workspace/tests/e2e/adv/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' @@ -306,4 +307,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep index ad410db22f..90b6203eee 100644 --- a/modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep @@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' } -} +}] diff --git a/modules/operational-insights/workspace/tests/e2e/max/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/max/main.test.bicep index a3d86cf782..ad7165b0c2 100644 --- a/modules/operational-insights/workspace/tests/e2e/max/main.test.bicep +++ b/modules/operational-insights/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' @@ -234,4 +235,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep index 92f24e5733..e523244e4a 100644 --- a/modules/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/operational-insights/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' @@ -234,4 +235,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/operations-management/solution/tests/e2e/defaults/main.test.bicep b/modules/operations-management/solution/tests/e2e/defaults/main.test.bicep index a82c4e54f3..c3e69fd0ab 100644 --- a/modules/operations-management/solution/tests/e2e/defaults/main.test.bicep +++ b/modules/operations-management/solution/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: 'Updates' logAnalyticsWorkspaceName: nestedDependencies.outputs.logAnalyticsWorkspaceName } -} +}] diff --git a/modules/operations-management/solution/tests/e2e/ms/main.test.bicep b/modules/operations-management/solution/tests/e2e/ms/main.test.bicep index e3e03cbeec..1751e570b0 100644 --- a/modules/operations-management/solution/tests/e2e/ms/main.test.bicep +++ b/modules/operations-management/solution/tests/e2e/ms/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: 'AzureAutomation' @@ -53,4 +54,4 @@ module testDeployment '../../../main.bicep' = { product: 'OMSGallery' publisher: 'Microsoft' } -} +}] diff --git a/modules/operations-management/solution/tests/e2e/nonms/main.test.bicep b/modules/operations-management/solution/tests/e2e/nonms/main.test.bicep index 39178e0f71..1ddf6bddf8 100644 --- a/modules/operations-management/solution/tests/e2e/nonms/main.test.bicep +++ b/modules/operations-management/solution/tests/e2e/nonms/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' @@ -53,4 +54,4 @@ module testDeployment '../../../main.bicep' = { product: 'nonmsTestSolutionProduct' publisher: 'nonmsTestSolutionPublisher' } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep index ec5905b87e..b34f003368 100644 --- a/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep @@ -80,8 +80,9 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../../management-group/main.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../management-group/main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -96,4 +97,4 @@ module testDeployment '../../../management-group/main.bicep' = { parallelDeployments: 1 failureThresholdPercentage: '0.5' } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep index 2fa5bd5533..89336edd4a 100644 --- a/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep @@ -35,11 +35,12 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../../management-group/main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../management-group/main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' policyAssignmentId: policyAssignment.id } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep index 932adf9c48..ad8934beac 100644 --- a/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep @@ -89,9 +89,10 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../../resource-group/main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../resource-group/main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -106,4 +107,4 @@ module testDeployment '../../../resource-group/main.bicep' = { parallelDeployments: 1 failureThresholdPercentage: '0.5' } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep index 86d6da3d11..f176a984d7 100644 --- a/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep @@ -44,12 +44,13 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../../resource-group/main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../resource-group/main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' policyAssignmentId: policyAssignment.id } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep index d884f232c9..5ee1cd36da 100644 --- a/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep @@ -80,8 +80,9 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../../subscription/main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../subscription/main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -96,4 +97,4 @@ module testDeployment '../../../subscription/main.bicep' = { parallelDeployments: 1 failureThresholdPercentage: '0.5' } -} +}] diff --git a/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep index cc3ef9248f..7cd844eda5 100644 --- a/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep @@ -35,11 +35,12 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../../subscription/main.bicep' = { - name: '${uniqueString(deployment().name)}-test-${serviceShort}' +@batchSize(1) +module testDeployment '../../../subscription/main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' policyAssignmentId: policyAssignment.id } -} +}] diff --git a/modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep index 7325d2ed89..f8c3d8627e 100644 --- a/modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep +++ b/modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -57,4 +58,4 @@ module testDeployment '../../../main.bicep' = { nestedDependencies.outputs.managedIdentityPrincipalId ] } -} +}] diff --git a/modules/power-bi-dedicated/capacity/tests/e2e/max/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/max/main.test.bicep index fac442cdfe..c6fe16963e 100644 --- a/modules/power-bi-dedicated/capacity/tests/e2e/max/main.test.bicep +++ b/modules/power-bi-dedicated/capacity/tests/e2e/max/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/power-bi-dedicated/capacity/tests/e2e/waf-aligned/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/waf-aligned/main.test.bicep index 204d4c8d00..de6e04a1b0 100644 --- a/modules/power-bi-dedicated/capacity/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/power-bi-dedicated/capacity/tests/e2e/waf-aligned/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/purview/account/tests/e2e/defaults/main.test.bicep b/modules/purview/account/tests/e2e/defaults/main.test.bicep index b1205ff888..78ad70351f 100644 --- a/modules/purview/account/tests/e2e/defaults/main.test.bicep +++ b/modules/purview/account/tests/e2e/defaults/main.test.bicep @@ -37,12 +37,13 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' scope: resourceGroup - name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' managedResourceGroupName: '${namePrefix}${serviceShort}001-managed-rg' enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/purview/account/tests/e2e/max/main.test.bicep b/modules/purview/account/tests/e2e/max/main.test.bicep index aa24c189e1..6db809ee0b 100644 --- a/modules/purview/account/tests/e2e/max/main.test.bicep +++ b/modules/purview/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' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' scope: resourceGroup - name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' location: location @@ -176,4 +177,4 @@ module testDeployment '../../../main.bicep' = { name: 'myCustomLockName' } } -} +}] diff --git a/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep b/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep index 1fc2ee5e43..6ee1d342ef 100644 --- a/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/purview/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' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' scope: resourceGroup - name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '${namePrefix}${serviceShort}001' location: location @@ -176,4 +177,4 @@ module testDeployment '../../../main.bicep' = { name: 'myCustomLockName' } } -} +}] diff --git a/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep b/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep index e64705c7a3..8b9f40bfcb 100644 --- a/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep +++ b/modules/recovery-services/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/recovery-services/vault/tests/e2e/dr/main.test.bicep b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep index d2af04c07f..c76d0f632e 100644 --- a/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep +++ b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep @@ -35,9 +35,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var rsvName = '${namePrefix}${serviceShort}001' -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: rsvName @@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/recovery-services/vault/tests/e2e/max/main.test.bicep b/modules/recovery-services/vault/tests/e2e/max/main.test.bicep index 5184d05b9b..4f47ea5c19 100644 --- a/modules/recovery-services/vault/tests/e2e/max/main.test.bicep +++ b/modules/recovery-services/vault/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' @@ -375,4 +376,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep b/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep index c61f06f157..249a35afa2 100644 --- a/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/recovery-services/vault/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' @@ -375,4 +376,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/relay/namespace/tests/e2e/defaults/main.test.bicep b/modules/relay/namespace/tests/e2e/defaults/main.test.bicep index 689248719f..c35d68e568 100644 --- a/modules/relay/namespace/tests/e2e/defaults/main.test.bicep +++ b/modules/relay/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/relay/namespace/tests/e2e/max/main.test.bicep b/modules/relay/namespace/tests/e2e/max/main.test.bicep index d438ec09ec..9615d7ad26 100644 --- a/modules/relay/namespace/tests/e2e/max/main.test.bicep +++ b/modules/relay/namespace/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' @@ -178,4 +179,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/relay/namespace/tests/e2e/pe/main.test.bicep b/modules/relay/namespace/tests/e2e/pe/main.test.bicep index dd1352106e..cc38c87c6f 100644 --- a/modules/relay/namespace/tests/e2e/pe/main.test.bicep +++ b/modules/relay/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' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep index 2e3268af07..b8527deec2 100644 --- a/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/relay/namespace/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' @@ -178,4 +179,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/resource-graph/query/tests/e2e/defaults/main.test.bicep b/modules/resource-graph/query/tests/e2e/defaults/main.test.bicep index da7b4e92f2..8a0db8fccb 100644 --- a/modules/resource-graph/query/tests/e2e/defaults/main.test.bicep +++ b/modules/resource-graph/query/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' query: 'resources | take 10' } -} +}] diff --git a/modules/resource-graph/query/tests/e2e/max/main.test.bicep b/modules/resource-graph/query/tests/e2e/max/main.test.bicep index 8ff4e69568..25ac98145e 100644 --- a/modules/resource-graph/query/tests/e2e/max/main.test.bicep +++ b/modules/resource-graph/query/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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { query: 'resources | take 10' queryDescription: 'An example query to list first 10 resources in the subscription.' } -} +}] diff --git a/modules/resource-graph/query/tests/e2e/waf-aligned/main.test.bicep b/modules/resource-graph/query/tests/e2e/waf-aligned/main.test.bicep index 5858166d43..1209174e7c 100644 --- a/modules/resource-graph/query/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/resource-graph/query/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' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { query: 'resources | take 10' queryDescription: 'An example query to list first 10 resources in the subscription.' } -} +}] diff --git a/modules/resources/deployment-script/tests/e2e/cli/main.test.bicep b/modules/resources/deployment-script/tests/e2e/cli/main.test.bicep index 0de3a4dec5..5133fbb896 100644 --- a/modules/resources/deployment-script/tests/e2e/cli/main.test.bicep +++ b/modules/resources/deployment-script/tests/e2e/cli/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' @@ -81,4 +82,4 @@ module testDeployment '../../../main.bicep' = { ] } } -} +}] diff --git a/modules/resources/deployment-script/tests/e2e/ps/main.test.bicep b/modules/resources/deployment-script/tests/e2e/ps/main.test.bicep index 058b6ed59b..860035a02b 100644 --- a/modules/resources/deployment-script/tests/e2e/ps/main.test.bicep +++ b/modules/resources/deployment-script/tests/e2e/ps/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' @@ -73,4 +74,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/resources/resource-group/tests/e2e/defaults/main.test.bicep b/modules/resources/resource-group/tests/e2e/defaults/main.test.bicep index 22dbdd1d67..a36b5e90cc 100644 --- a/modules/resources/resource-group/tests/e2e/defaults/main.test.bicep +++ b/modules/resources/resource-group/tests/e2e/defaults/main.test.bicep @@ -20,10 +20,11 @@ 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' } -} +}] diff --git a/modules/resources/resource-group/tests/e2e/max/main.test.bicep b/modules/resources/resource-group/tests/e2e/max/main.test.bicep index 91f263f885..a110f2a5f4 100644 --- a/modules/resources/resource-group/tests/e2e/max/main.test.bicep +++ b/modules/resources/resource-group/tests/e2e/max/main.test.bicep @@ -46,8 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // 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' @@ -68,4 +69,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/resources/resource-group/tests/e2e/waf-aligned/main.test.bicep b/modules/resources/resource-group/tests/e2e/waf-aligned/main.test.bicep index d5e6d7df88..5818c0052f 100644 --- a/modules/resources/resource-group/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/resources/resource-group/tests/e2e/waf-aligned/main.test.bicep @@ -46,8 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // 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' @@ -68,4 +69,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/resources/tags/tests/e2e/defaults/main.test.bicep b/modules/resources/tags/tests/e2e/defaults/main.test.bicep index ab0a7599eb..521409ad0f 100644 --- a/modules/resources/tags/tests/e2e/defaults/main.test.bicep +++ b/modules/resources/tags/tests/e2e/defaults/main.test.bicep @@ -17,9 +17,10 @@ param enableDefaultTelemetry bool = true // 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 } -} +}] diff --git a/modules/resources/tags/tests/e2e/rg/main.test.bicep b/modules/resources/tags/tests/e2e/rg/main.test.bicep index 0f08a5a281..7660cc860c 100644 --- a/modules/resources/tags/tests/e2e/rg/main.test.bicep +++ b/modules/resources/tags/tests/e2e/rg/main.test.bicep @@ -35,8 +35,9 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // 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 onlyUpdate: false @@ -47,4 +48,4 @@ module testDeployment '../../../main.bicep' = { TestToo: 'No' } } -} +}] diff --git a/modules/resources/tags/tests/e2e/sub/main.test.bicep b/modules/resources/tags/tests/e2e/sub/main.test.bicep index 92c029e810..32eed379fe 100644 --- a/modules/resources/tags/tests/e2e/sub/main.test.bicep +++ b/modules/resources/tags/tests/e2e/sub/main.test.bicep @@ -14,8 +14,9 @@ param enableDefaultTelemetry bool = true // 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: { onlyUpdate: true tags: { @@ -25,4 +26,4 @@ module testDeployment '../../../main.bicep' = { } enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/search/search-service/tests/e2e/defaults/main.test.bicep b/modules/search/search-service/tests/e2e/defaults/main.test.bicep index a09caf4e8e..c655c3d657 100644 --- a/modules/search/search-service/tests/e2e/defaults/main.test.bicep +++ b/modules/search/search-service/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/search/search-service/tests/e2e/max/main.test.bicep b/modules/search/search-service/tests/e2e/max/main.test.bicep index 90a01b9be8..2edbeb312f 100644 --- a/modules/search/search-service/tests/e2e/max/main.test.bicep +++ b/modules/search/search-service/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/search/search-service/tests/e2e/pe/main.test.bicep b/modules/search/search-service/tests/e2e/pe/main.test.bicep index c18f872e76..2cd4bd7d52 100644 --- a/modules/search/search-service/tests/e2e/pe/main.test.bicep +++ b/modules/search/search-service/tests/e2e/pe/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' @@ -88,4 +89,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/search/search-service/tests/e2e/waf-aligned/main.test.bicep b/modules/search/search-service/tests/e2e/waf-aligned/main.test.bicep index c01e840d45..e5968a4f01 100644 --- a/modules/search/search-service/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/search/search-service/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' @@ -126,4 +127,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/security/azure-security-center/tests/e2e/max/main.test.bicep b/modules/security/azure-security-center/tests/e2e/max/main.test.bicep index 1118563116..e76028a93a 100644 --- a/modules/security/azure-security-center/tests/e2e/max/main.test.bicep +++ b/modules/security/azure-security-center/tests/e2e/max/main.test.bicep @@ -46,8 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // 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 scope: '/subscriptions/${subscription().subscriptionId}' @@ -59,4 +60,4 @@ module testDeployment '../../../main.bicep' = { phone: '+12345678' } } -} +}] diff --git a/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep b/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep index 1bb6ec0985..1e6b326548 100644 --- a/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep @@ -46,8 +46,9 @@ module nestedDependencies 'dependencies.bicep' = { // 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 scope: '/subscriptions/${subscription().subscriptionId}' @@ -59,4 +60,4 @@ module testDeployment '../../../main.bicep' = { phone: '+12345678' } } -} +}] diff --git a/modules/service-bus/namespace/tests/e2e/defaults/main.test.bicep b/modules/service-bus/namespace/tests/e2e/defaults/main.test.bicep index f799f08ce9..39c9f7941e 100644 --- a/modules/service-bus/namespace/tests/e2e/defaults/main.test.bicep +++ b/modules/service-bus/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/service-bus/namespace/tests/e2e/encr/main.test.bicep b/modules/service-bus/namespace/tests/e2e/encr/main.test.bicep index f0e1671e0f..9e6e5eb85f 100644 --- a/modules/service-bus/namespace/tests/e2e/encr/main.test.bicep +++ b/modules/service-bus/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' @@ -117,4 +118,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/service-bus/namespace/tests/e2e/max/main.test.bicep b/modules/service-bus/namespace/tests/e2e/max/main.test.bicep index 617b5a4832..df4f72b22b 100644 --- a/modules/service-bus/namespace/tests/e2e/max/main.test.bicep +++ b/modules/service-bus/namespace/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' @@ -223,4 +224,4 @@ module testDeployment '../../../main.bicep' = { publicNetworkAccess: 'Enabled' minimumTlsVersion: '1.2' } -} +}] diff --git a/modules/service-bus/namespace/tests/e2e/pe/main.test.bicep b/modules/service-bus/namespace/tests/e2e/pe/main.test.bicep index 43e7f9de51..ebc7250257 100644 --- a/modules/service-bus/namespace/tests/e2e/pe/main.test.bicep +++ b/modules/service-bus/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' @@ -70,4 +71,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/service-bus/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/service-bus/namespace/tests/e2e/waf-aligned/main.test.bicep index 2d7aac3873..7c15fdbb8e 100644 --- a/modules/service-bus/namespace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/service-bus/namespace/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' @@ -223,4 +224,4 @@ module testDeployment '../../../main.bicep' = { publicNetworkAccess: 'Enabled' minimumTlsVersion: '1.2' } -} +}] diff --git a/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep index b8f681a7e3..abdbb40a0c 100644 --- a/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep +++ b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep @@ -35,9 +35,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' @@ -70,4 +71,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep index abc24b2ed3..8a543b9681 100644 --- a/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep +++ b/modules/service-fabric/cluster/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' @@ -65,4 +66,4 @@ module testDeployment '../../../main.bicep' = { ] } -} +}] diff --git a/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep index c566919098..ed86853a2b 100644 --- a/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep +++ b/modules/service-fabric/cluster/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' @@ -222,4 +223,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep index 6b1ad668cc..e54b21fd94 100644 --- a/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/service-fabric/cluster/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' @@ -222,4 +223,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep index 3796aa1068..35db2f4406 100644 --- a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep +++ b/modules/signal-r-service/signal-r/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' ]: { + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' scope: resourceGroup - name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' } -} +}] diff --git a/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep index 751e1286fd..701bca066f 100644 --- a/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep +++ b/modules/signal-r-service/signal-r/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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' @@ -114,4 +115,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep index 5c88da4283..c07a791bbf 100644 --- a/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/signal-r-service/signal-r/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)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' @@ -114,4 +115,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep index a888017c1b..4e72d5a97b 100644 --- a/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/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/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep index 007c6f0032..7c9c967f3a 100644 --- a/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/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' @@ -116,4 +117,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep index 25c2a4dfb3..0483d13826 100644 --- a/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/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/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep index 2391c085b0..03b8af5643 100644 --- a/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/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' @@ -116,4 +117,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep b/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep index 9074fdeaf7..80ccb391bc 100644 --- a/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/defaults/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 name: '${namePrefix}-${serviceShort}' @@ -63,4 +64,4 @@ module testDeployment '../../../main.bicep' = { administratorLoginPassword: password subnetId: nestedDependencies.outputs.subnetResourceId } -} +}] diff --git a/modules/sql/managed-instance/tests/e2e/max/main.test.bicep b/modules/sql/managed-instance/tests/e2e/max/main.test.bicep index 401b4c47a9..f5d3fd6d28 100644 --- a/modules/sql/managed-instance/tests/e2e/max/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/max/main.test.bicep @@ -73,9 +73,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}' @@ -178,4 +179,4 @@ module testDeployment '../../../main.bicep' = { } } } -} +}] diff --git a/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep b/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep index e6bb8787ca..b93e5f73ec 100644 --- a/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/vulnAssm/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}' @@ -86,4 +87,4 @@ module testDeployment '../../../main.bicep' = { } } } -} +}] diff --git a/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep b/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep index c5846900f8..2c644b744b 100644 --- a/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep @@ -73,9 +73,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}' @@ -178,4 +179,4 @@ module testDeployment '../../../main.bicep' = { } } } -} +}] diff --git a/modules/sql/server/tests/e2e/admin/main.test.bicep b/modules/sql/server/tests/e2e/admin/main.test.bicep index 94c27ed0d9..9a30d64ae7 100644 --- a/modules/sql/server/tests/e2e/admin/main.test.bicep +++ b/modules/sql/server/tests/e2e/admin/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}' @@ -57,4 +58,4 @@ module testDeployment '../../../main.bicep' = { tenantId: tenant().tenantId } } -} +}] diff --git a/modules/sql/server/tests/e2e/max/main.test.bicep b/modules/sql/server/tests/e2e/max/main.test.bicep index bea350e17c..e90e04ed5d 100644 --- a/modules/sql/server/tests/e2e/max/main.test.bicep +++ b/modules/sql/server/tests/e2e/max/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}' @@ -194,4 +195,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/sql/server/tests/e2e/pe/main.test.bicep b/modules/sql/server/tests/e2e/pe/main.test.bicep index 9881236cfa..069d4f0e80 100644 --- a/modules/sql/server/tests/e2e/pe/main.test.bicep +++ b/modules/sql/server/tests/e2e/pe/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}' @@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/sql/server/tests/e2e/secondary/main.test.bicep b/modules/sql/server/tests/e2e/secondary/main.test.bicep index b5caa622c3..96bef59aa8 100644 --- a/modules/sql/server/tests/e2e/secondary/main.test.bicep +++ b/modules/sql/server/tests/e2e/secondary/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}-sec' @@ -71,4 +72,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/sql/server/tests/e2e/vulnAssm/main.test.bicep b/modules/sql/server/tests/e2e/vulnAssm/main.test.bicep index 1586facf7d..5fbb7c0192 100644 --- a/modules/sql/server/tests/e2e/vulnAssm/main.test.bicep +++ b/modules/sql/server/tests/e2e/vulnAssm/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}' @@ -90,4 +91,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/sql/server/tests/e2e/waf-aligned/main.test.bicep b/modules/sql/server/tests/e2e/waf-aligned/main.test.bicep index c9e7ee69cf..271aa97013 100644 --- a/modules/sql/server/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/sql/server/tests/e2e/waf-aligned/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}' @@ -194,4 +195,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/defaults/main.test.bicep b/modules/storage/storage-account/tests/e2e/defaults/main.test.bicep index c5340263c1..1a754ad2b7 100644 --- a/modules/storage/storage-account/tests/e2e/defaults/main.test.bicep +++ b/modules/storage/storage-account/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' allowBlobPublicAccess: false } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/encr/main.test.bicep b/modules/storage/storage-account/tests/e2e/encr/main.test.bicep index c4c76b8e9d..dd7ba3fe12 100644 --- a/modules/storage/storage-account/tests/e2e/encr/main.test.bicep +++ b/modules/storage/storage-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' @@ -110,4 +111,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/max/main.test.bicep b/modules/storage/storage-account/tests/e2e/max/main.test.bicep index 60b068d260..52efc5b12b 100644 --- a/modules/storage/storage-account/tests/e2e/max/main.test.bicep +++ b/modules/storage/storage-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' @@ -330,4 +331,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep b/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep index 7670f0c068..9705898d57 100644 --- a/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep @@ -57,9 +57,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' @@ -112,4 +113,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/v1/main.test.bicep b/modules/storage/storage-account/tests/e2e/v1/main.test.bicep index aa1670b9c6..057738ca6a 100644 --- a/modules/storage/storage-account/tests/e2e/v1/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/v1/main.test.bicep @@ -35,9 +35,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -49,4 +50,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/storage/storage-account/tests/e2e/waf-aligned/main.test.bicep b/modules/storage/storage-account/tests/e2e/waf-aligned/main.test.bicep index 0c03921624..0bc44e2bdb 100644 --- a/modules/storage/storage-account/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/storage/storage-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' @@ -330,4 +331,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep index 7ea78ed31d..d25afb53a7 100644 --- a/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep +++ b/modules/synapse/private-link-hub/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/synapse/private-link-hub/tests/e2e/max/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep index 5f1dc18c70..a4718d62b4 100644 --- a/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep +++ b/modules/synapse/private-link-hub/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' @@ -90,4 +91,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep index c5b50dbbd7..cda0f2510d 100644 --- a/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/synapse/private-link-hub/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' @@ -90,4 +91,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep b/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep index 0597e80b28..f6084c8e78 100644 --- a/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -56,4 +57,4 @@ module testDeployment '../../../main.bicep' = { sqlAdministratorLogin: 'synwsadmin' enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep index 48e6c94103..bc21173e2f 100644 --- a/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/encrwsai/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' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -63,4 +64,4 @@ module testDeployment '../../../main.bicep' = { encryptionActivateWorkspace: true enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep index 6049baaf1e..bad49f51aa 100644 --- a/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/encrwuai/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: { name: '${namePrefix}${serviceShort}001' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { } enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep b/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep index 8b1a2bb851..7d4f2b072c 100644 --- a/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/managedvnet/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: { name: '${namePrefix}${serviceShort}001' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -63,4 +64,4 @@ module testDeployment '../../../main.bicep' = { } enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/max/main.test.bicep b/modules/synapse/workspace/tests/e2e/max/main.test.bicep index 70526bbe29..83ba65e82f 100644 --- a/modules/synapse/workspace/tests/e2e/max/main.test.bicep +++ b/modules/synapse/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: { name: '${namePrefix}${serviceShort}001' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { ] enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep index cd02520ced..320aa27a4c 100644 --- a/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/synapse/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: { name: '${namePrefix}${serviceShort}001' defaultDataLakeStorageAccountResourceId: nestedDependencies.outputs.storageAccountResourceId @@ -121,4 +122,4 @@ module testDeployment '../../../main.bicep' = { ] enableDefaultTelemetry: enableDefaultTelemetry } -} +}] diff --git a/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep index ea6acdfabf..9a0168030e 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep @@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = { userMsiName: nestedDependencies.outputs.managedIdentityName userMsiResourceGroup: resourceGroupName } -} +}] diff --git a/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep index 254fadcce6..e53ffe37da 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep @@ -65,9 +65,10 @@ resource msi_managedIdentityOperatorRoleAssignment 'Microsoft.Authorization/role // 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/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep index 7e2e523fee..4dabec4226 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep @@ -65,9 +65,10 @@ resource msi_managedIdentityOperatorRoleAssignment 'Microsoft.Authorization/role // 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/web/connection/tests/e2e/max/main.test.bicep b/modules/web/connection/tests/e2e/max/main.test.bicep index 185384cf04..d57a2503f7 100644 --- a/modules/web/connection/tests/e2e/max/main.test.bicep +++ b/modules/web/connection/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 displayName: 'azuremonitorlogs' @@ -74,4 +75,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep b/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep index acc6afbcd9..a8d11dca02 100644 --- a/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/web/connection/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 displayName: 'azuremonitorlogs' @@ -74,4 +75,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep index d86885ab6b..7af7a63c86 100644 --- a/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep +++ b/modules/web/hosting-environment/tests/e2e/asev2/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' @@ -108,4 +109,4 @@ module testDeployment '../../../main.bicep' = { kind: 'ASEv2' multiSize: 'Standard_D1_V2' } -} +}] diff --git a/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep index 52203b7f2f..6757a86d0a 100644 --- a/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep +++ b/modules/web/hosting-environment/tests/e2e/asev3/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' = { customDnsSuffixCertificateUrl: nestedDependencies.outputs.certificateSecretUrl customDnsSuffixKeyVaultReferenceIdentity: nestedDependencies.outputs.managedIdentityResourceId } -} +}] diff --git a/modules/web/serverfarm/tests/e2e/max/main.test.bicep b/modules/web/serverfarm/tests/e2e/max/main.test.bicep index ab5b234c99..ce1c1ea9c1 100644 --- a/modules/web/serverfarm/tests/e2e/max/main.test.bicep +++ b/modules/web/serverfarm/tests/e2e/max/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep b/modules/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep index b6be6a4df6..24e51db825 100644 --- a/modules/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep @@ -60,9 +60,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep b/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep index aa00720f81..a90bc27591 100644 --- a/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep +++ b/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep @@ -63,9 +63,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe // Test Execution // // ============== // // For the below test case, please consider the guidelines described here: https://github.com/Azure/ResourceModules/wiki/Getting%20started%20-%20Scenario%202%20Onboard%20module%20library%20and%20CI%20environment#microsoftwebsites -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.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' @@ -208,4 +209,4 @@ module testDeployment '../../../main.bicep' = { } ] } -} +}] diff --git a/modules/web/site/tests/e2e/functionAppMin/main.test.bicep b/modules/web/site/tests/e2e/functionAppMin/main.test.bicep index 29a416992c..4b341b5be5 100644 --- a/modules/web/site/tests/e2e/functionAppMin/main.test.bicep +++ b/modules/web/site/tests/e2e/functionAppMin/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' @@ -55,4 +56,4 @@ module testDeployment '../../../main.bicep' = { alwaysOn: true } } -} +}] diff --git a/modules/web/site/tests/e2e/webAppCommon/main.test.bicep b/modules/web/site/tests/e2e/webAppCommon/main.test.bicep index 93c0fbb5e8..8a0cd44bff 100644 --- a/modules/web/site/tests/e2e/webAppCommon/main.test.bicep +++ b/modules/web/site/tests/e2e/webAppCommon/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' @@ -199,4 +200,4 @@ module testDeployment '../../../main.bicep' = { vnetRouteAllEnabled: true publicNetworkAccess: 'Disabled' } -} +}] diff --git a/modules/web/site/tests/e2e/webAppMin/main.test.bicep b/modules/web/site/tests/e2e/webAppMin/main.test.bicep index 38c74f798e..c173fb23e1 100644 --- a/modules/web/site/tests/e2e/webAppMin/main.test.bicep +++ b/modules/web/site/tests/e2e/webAppMin/main.test.bicep @@ -43,13 +43,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' kind: 'app' serverFarmResourceId: nestedDependencies.outputs.serverFarmResourceId } -} +}] diff --git a/modules/web/static-site/tests/e2e/defaults/main.test.bicep b/modules/web/static-site/tests/e2e/defaults/main.test.bicep index 97845e594d..4165b5c13e 100644 --- a/modules/web/static-site/tests/e2e/defaults/main.test.bicep +++ b/modules/web/static-site/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/web/static-site/tests/e2e/max/main.test.bicep b/modules/web/static-site/tests/e2e/max/main.test.bicep index 0a800c70a2..5dd920a61e 100644 --- a/modules/web/static-site/tests/e2e/max/main.test.bicep +++ b/modules/web/static-site/tests/e2e/max/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] diff --git a/modules/web/static-site/tests/e2e/waf-aligned/main.test.bicep b/modules/web/static-site/tests/e2e/waf-aligned/main.test.bicep index 0b1be9250e..78eaa5b464 100644 --- a/modules/web/static-site/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/web/static-site/tests/e2e/waf-aligned/main.test.bicep @@ -49,9 +49,10 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../../main.bicep' = { +@batchSize(1) +module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}${serviceShort}001' @@ -106,4 +107,4 @@ module testDeployment '../../../main.bicep' = { Role: 'DeploymentValidation' } } -} +}] From f0a01a21df8103742357843cdd0cfa0f1ab0243c Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 18:57:14 +0100 Subject: [PATCH 2/7] Update to latest --- .../signal-r/tests/e2e/defaults/main.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep index 35db2f4406..91c816bddf 100644 --- a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep +++ b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep @@ -40,8 +40,8 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { @batchSize(1) module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { enableDefaultTelemetry: enableDefaultTelemetry name: '${namePrefix}-${serviceShort}-001' From 8ca9c650bcf2046095bfee8bdade524d415d38e8 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 20:33:07 +0100 Subject: [PATCH 3/7] Refreshed outdated template --- modules/web/site/main.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/web/site/main.json b/modules/web/site/main.json index 4358ab448c..37e2690c86 100644 --- a/modules/web/site/main.json +++ b/modules/web/site/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.23.1.45101", - "templateHash": "18196957481129520546" + "templateHash": "5695441260963764068" }, "name": "Web/Function Apps", "description": "This module deploys a Web or Function App.", @@ -3169,7 +3169,7 @@ "_generator": { "name": "bicep", "version": "0.23.1.45101", - "templateHash": "12265634131995953652" + "templateHash": "12054216906297236281" }, "name": "Web Site Basic Publishing Credentials Policies", "description": "This module deploys a Web Site Basic Publishing Credentials Policy.", @@ -3190,7 +3190,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Set to true to allow access to or false to diable a publishing method." + "description": "Optional. Set to true to enable or false to disable a publishing method." } }, "webAppName": { From 651a7b2128436b2d783fb88c7e5fd8239a0f7211 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 20:34:34 +0100 Subject: [PATCH 4/7] Missing refresh --- modules/signal-r-service/signal-r/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/signal-r-service/signal-r/README.md b/modules/signal-r-service/signal-r/README.md index 0650ea90d4..88a6f92780 100644 --- a/modules/signal-r-service/signal-r/README.md +++ b/modules/signal-r-service/signal-r/README.md @@ -43,7 +43,7 @@ This instance deploys the module with the minimum set of required parameters. ```bicep module signalR 'br:bicep/modules/signal-r-service.signal-r:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-srsdrmin' + name: '${uniqueString(deployment().name, location)}-test-srsdrmin' params: { // Required parameters name: 'srsdrmin-001' @@ -91,7 +91,7 @@ This instance deploys the module with most of its features enabled. ```bicep module signalR 'br:bicep/modules/signal-r-service.signal-r:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-srssrmax' + name: '${uniqueString(deployment().name, location)}-test-srssrmax' params: { // Required parameters name: 'srssrmax-001' @@ -283,7 +283,7 @@ This instance deploys the module in alignment with the best-practices of the Azu ```bicep module signalR 'br:bicep/modules/signal-r-service.signal-r:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-srssrwaf' + name: '${uniqueString(deployment().name, location)}-test-srssrwaf' params: { // Required parameters name: 'srssrwaf-001' From 26eedd06010f0f6613cfa3fd212c4b547941c3bc Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 20:42:17 +0100 Subject: [PATCH 5/7] Refrehsed readme --- modules/purview/account/README.md | 6 ++--- modules/purview/account/main.json | 44 +++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/purview/account/README.md b/modules/purview/account/README.md index bf1e13c412..e05d7655e0 100644 --- a/modules/purview/account/README.md +++ b/modules/purview/account/README.md @@ -44,7 +44,7 @@ This instance deploys the module with the minimum set of required parameters. ```bicep module account 'br:bicep/modules/purview.account:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pvamin' + name: '${uniqueString(deployment().name, location)}-test-pvamin' params: { // Required parameters name: 'pvamin001' @@ -96,7 +96,7 @@ This instance deploys the module with most of its features enabled. ```bicep module account 'br:bicep/modules/purview.account:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pvamax' + name: '${uniqueString(deployment().name, location)}-test-pvamax' params: { // Required parameters name: 'pvamax001' @@ -386,7 +386,7 @@ This instance deploys the module in alignment with the best-practices of the Azu ```bicep module account 'br:bicep/modules/purview.account:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pvawaf' + name: '${uniqueString(deployment().name, location)}-test-pvawaf' params: { // Required parameters name: 'pvawaf001' diff --git a/modules/purview/account/main.json b/modules/purview/account/main.json index 6a680ef25a..7a80fa7f06 100644 --- a/modules/purview/account/main.json +++ b/modules/purview/account/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.22.6.54827", - "templateHash": "16148547066067055796" + "version": "0.23.1.45101", + "templateHash": "13114656057077056964" }, "name": "Purview Accounts", "description": "This module deploys a Purview Account.", @@ -491,8 +491,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.", @@ -894,8 +894,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.", @@ -1089,8 +1089,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.", @@ -1492,8 +1492,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.", @@ -1687,8 +1687,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.", @@ -2090,8 +2090,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.", @@ -2285,8 +2285,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.", @@ -2688,8 +2688,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.", @@ -2883,8 +2883,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.", @@ -3286,8 +3286,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.", From 47cca38c5f9be3ff6698f769e7d5fa9d2b039739 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Sun, 12 Nov 2023 20:43:23 +0100 Subject: [PATCH 6/7] Refrehsed readme --- modules/policy-insights/remediation/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/policy-insights/remediation/README.md b/modules/policy-insights/remediation/README.md index 1140dd6368..c22cb0aede 100644 --- a/modules/policy-insights/remediation/README.md +++ b/modules/policy-insights/remediation/README.md @@ -121,7 +121,7 @@ module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { ```bicep module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pirmgmin' + name: '${uniqueString(deployment().name, location)}-test-pirmgmin' params: { // Required parameters name: 'pirmgmin001' @@ -170,7 +170,7 @@ module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { ```bicep module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pirrgcom' + name: '${uniqueString(deployment().name, location)}-test-pirrgcom' params: { // Required parameters name: 'pirrgcom001' @@ -251,7 +251,7 @@ module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { ```bicep module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pirrgmin' + name: '${uniqueString(deployment().name, location)}-test-pirrgmin' params: { // Required parameters name: 'pirrgmin001' @@ -300,7 +300,7 @@ module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { ```bicep module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pirsubcom' + name: '${uniqueString(deployment().name, location)}-test-pirsubcom' params: { // Required parameters name: 'pirsubcom001' @@ -381,7 +381,7 @@ module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { ```bicep module remediation 'br:bicep/modules/policy-insights.remediation:1.0.0' = { - name: '${uniqueString(deployment().name)}-test-pirsubmin' + name: '${uniqueString(deployment().name, location)}-test-pirsubmin' params: { // Required parameters name: 'pirsubmin001' From 26201aef1261a9b372c7389a26557e4d4d26c18c Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 14 Nov 2023 22:17:09 +0100 Subject: [PATCH 7/7] Update to latest --- modules/resources/tags/tests/e2e/defaults/main.test.bicep | 7 +++---- modules/resources/tags/tests/e2e/rg/main.test.bicep | 7 +++---- modules/resources/tags/tests/e2e/sub/main.test.bicep | 7 +++---- .../image-template/tests/e2e/defaults/main.test.bicep | 7 +++---- .../image-template/tests/e2e/max/main.test.bicep | 7 +++---- .../image-template/tests/e2e/waf-aligned/main.test.bicep | 7 +++---- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/modules/resources/tags/tests/e2e/defaults/main.test.bicep b/modules/resources/tags/tests/e2e/defaults/main.test.bicep index 521409ad0f..ab0a7599eb 100644 --- a/modules/resources/tags/tests/e2e/defaults/main.test.bicep +++ b/modules/resources/tags/tests/e2e/defaults/main.test.bicep @@ -17,10 +17,9 @@ param enableDefaultTelemetry bool = true // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { - name: '${uniqueString(deployment().name)}-test-${serviceShort}-${iteration}' +module testDeployment '../../../main.bicep' = { + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry } -}] +} diff --git a/modules/resources/tags/tests/e2e/rg/main.test.bicep b/modules/resources/tags/tests/e2e/rg/main.test.bicep index 7660cc860c..0f08a5a281 100644 --- a/modules/resources/tags/tests/e2e/rg/main.test.bicep +++ b/modules/resources/tags/tests/e2e/rg/main.test.bicep @@ -35,9 +35,8 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // 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 onlyUpdate: false @@ -48,4 +47,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' TestToo: 'No' } } -}] +} diff --git a/modules/resources/tags/tests/e2e/sub/main.test.bicep b/modules/resources/tags/tests/e2e/sub/main.test.bicep index 32eed379fe..92c029e810 100644 --- a/modules/resources/tags/tests/e2e/sub/main.test.bicep +++ b/modules/resources/tags/tests/e2e/sub/main.test.bicep @@ -14,9 +14,8 @@ param enableDefaultTelemetry bool = true // Test Execution // // ============== // -@batchSize(1) -module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: { - name: '${uniqueString(deployment().name)}-test-${serviceShort}-${iteration}' +module testDeployment '../../../main.bicep' = { + name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { onlyUpdate: true tags: { @@ -26,4 +25,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' } enableDefaultTelemetry: enableDefaultTelemetry } -}] +} diff --git a/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep index 9a0168030e..ea6acdfabf 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/defaults/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' @@ -70,4 +69,4 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' userMsiName: nestedDependencies.outputs.managedIdentityName userMsiResourceGroup: resourceGroupName } -}] +} diff --git a/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep index e53ffe37da..254fadcce6 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/max/main.test.bicep @@ -65,10 +65,9 @@ resource msi_managedIdentityOperatorRoleAssignment 'Microsoft.Authorization/role // 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/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep index 4dabec4226..7e2e523fee 100644 --- a/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/waf-aligned/main.test.bicep @@ -65,10 +65,9 @@ resource msi_managedIdentityOperatorRoleAssignment 'Microsoft.Authorization/role // 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' } } -}] +}