diff --git a/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep index e32a642345..3c64f5e2c1 100644 --- a/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep index f84a97178a..2953f4aace 100644 --- a/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep index 5ac56a6167..cb3c088c6c 100644 --- a/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep index 3713ee147a..d9039eca58 100644 --- a/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep index f6f17baa93..df669b50c3 100644 --- a/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep +++ b/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep index c9ca91e9a3..26408738b1 100644 --- a/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep +++ b/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep index 40f5feaa19..735058877b 100644 --- a/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep index 75854be68d..8e0f2c8c48 100644 --- a/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep index 30ce7cd012..4832fa018c 100644 --- a/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep @@ -81,7 +81,7 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep index 05067f1656..d34ab40cdb 100644 --- a/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep @@ -35,7 +35,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep index af4faa0c25..650cefa0b3 100644 --- a/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep @@ -89,7 +89,7 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep index 9f2269817c..49828f611d 100644 --- a/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep @@ -44,7 +44,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep index 8f51cf6dc9..ac0f4d16eb 100644 --- a/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep @@ -80,7 +80,7 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep index fdc51ea925..c3a5b57b44 100644 --- a/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep @@ -35,7 +35,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep index 7836687bb8..0f5653cc1f 100644 --- a/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep +++ b/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep index 1f84c6e7a8..8ad45325f9 100644 --- a/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep +++ b/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep index c685542166..dfe66dba51 100644 --- a/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep index 2e246457e9..9057a849b5 100644 --- a/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep index 7e87bc88b2..336f3cd4bd 100644 --- a/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep @@ -40,7 +40,7 @@ module nestedDependencies 'interim.dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep index 96d88fc845..62cc16085c 100644 --- a/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep @@ -40,7 +40,7 @@ module nestedDependencies 'interim.dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep index 57afbad937..c4a6b7ea07 100644 --- a/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep index 62cdccccac..ca2f37a9ab 100644 --- a/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep index 96f2dede38..77a6b7883c 100644 --- a/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep index 20fc2149a8..90242be1d0 100644 --- a/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep index a8e253f92d..4a11b95b59 100644 --- a/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep index 88900f3816..67848fd6db 100644 --- a/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../management-group/main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep index 56f0ddfaa3..b4f16419dc 100644 --- a/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep index 63ce946cc0..632a73d713 100644 --- a/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../resource-group/main.bicep' = { +module testDeployment '../../../resource-group/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep index d047b4a37d..9e7bdf1096 100644 --- a/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep index b91931fef3..e03ba0142c 100644 --- a/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep +++ b/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../subscription/main.bicep' = { +module testDeployment '../../../subscription/main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 index 95529c0ff4..7fb5b13699 100644 --- a/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 +++ b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 @@ -41,9 +41,7 @@ function Get-ModuleTestFileList { $deploymentTests = @() if (Test-Path (Join-Path $ModulePath $SearchFolder)) { - $deploymentTests += (Get-ChildItem -Path (Join-Path $ModulePath $SearchFolder) -Recurse -Include $TestFilePattern -File).FullName | Where-Object { - $_ -ne (Join-Path (Join-Path $ModulePath $SearchFolder) 'main.test.bicep') # Excluding PBR test file - } + $deploymentTests += (Get-ChildItem -Path (Join-Path $ModulePath $SearchFolder) -Recurse -Include $TestFilePattern -File).FullName } if (-not $deploymentTests) {