Updated batch 4

Azure · Nov 12, 2023 · 0c31f44 · 0c31f44
1 parent a25fe09
commit 0c31f44
Show file tree

Hide file tree

Showing 114 changed files with 456 additions and 342 deletions.
diff --git a/modules/net-app/net-app-account/tests/e2e/defaults/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/defaults/main.test.bicep
@@ -38,11 +38,12 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
  }
-}
+}]
diff --git a/modules/net-app/net-app-account/tests/e2e/nfs3/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/nfs3/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'
@@ -133,4 +134,4 @@ module testDeployment '../../../main.bicep' = {
  ServiceName: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/net-app/net-app-account/tests/e2e/nfs41/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/nfs41/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'
@@ -144,4 +145,4 @@ module testDeployment '../../../main.bicep' = {
  ]
  }
  }
-}
+}]
diff --git a/...network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep b/...network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep
@@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/...application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep b/...application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep
@@ -38,9 +38,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/application-gateway/tests/e2e/max/main.test.bicep b/modules/network/application-gateway/tests/e2e/max/main.test.bicep
@@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 
 var appGWName = '${namePrefix}${serviceShort}001'
 var appGWExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/applicationGateways/${appGWName}'
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: appGWName
@@ -495,4 +496,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep
@@ -66,9 +66,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 
 var appGWName = '${namePrefix}${serviceShort}001'
 var appGWExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/applicationGateways/${appGWName}'
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: appGWName
@@ -495,4 +496,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/application-security-group/tests/e2e/max/main.test.bicep b/modules/network/application-security-group/tests/e2e/max/main.test.bicep
@@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-security-group/tests/e2e/waf-aligned/main.test.bicep
@@ -46,9 +46,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -69,4 +70,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep
@@ -45,9 +45,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -75,4 +76,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep
@@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -99,4 +100,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
@@ -46,12 +46,13 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
  vNetId: nestedDependencies.outputs.virtualNetworkResourceId
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep
@@ -45,9 +45,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -64,4 +65,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep
@@ -44,9 +44,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -57,4 +58,4 @@ module testDeployment '../../../main.bicep' = {
  }
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/max/main.test.bicep b/modules/network/azure-firewall/tests/e2e/max/main.test.bicep
@@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -187,4 +188,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep b/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep
@@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -187,4 +188,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep b/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep
@@ -58,9 +58,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -104,4 +105,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep b/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep
@@ -46,12 +46,13 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
  vNetId: nestedDependencies.outputs.virtualNetworkResourceId
  }
-}
+}]
diff --git a/modules/network/bastion-host/tests/e2e/max/main.test.bicep b/modules/network/bastion-host/tests/e2e/max/main.test.bicep
@@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep b/modules/network/bastion-host/tests/e2e/waf-aligned/main.test.bicep
@@ -62,9 +62,10 @@ module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.depe
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -102,4 +103,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]
diff --git a/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep b/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep
@@ -52,9 +52,10 @@ module nestedDependencies 'dependencies.bicep' = {
 // Test Execution //
 // ============== //
 
-module testDeployment '../../../main.bicep' = {
+@batchSize(1)
+module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' ]: {
  scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}'
  params: {
  enableDefaultTelemetry: enableDefaultTelemetry
  name: '${namePrefix}${serviceShort}001'
@@ -77,4 +78,4 @@ module testDeployment '../../../main.bicep' = {
  Role: 'DeploymentValidation'
  }
  }
-}
+}]