diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md index b3c95193c2..573c6549dc 100644 --- a/docs/wiki/The library - Module design.md +++ b/docs/wiki/The library - Module design.md @@ -629,7 +629,7 @@ Dependency file (`dependencies.bicep`) guidelines: > :scroll: [Example of test using purge protected Key Vault dependency](https://github.com/Azure/ResourceModules/tree/main/modules/batch/batch-account/.test/encr) - - If you need a Deployment Script to set additional non-template resources up (for example certificates/files, etc.), we recommend to store it as a file in the shared `modules/.shared/.scripts` folder and load it using the template function `loadTextContent()` (for example: `scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1')`). This approach makes it easier to test & validate the logic and further allows reusing the same logic across multiple test cases. + - If you need a Deployment Script to set additional non-template resources up (for example certificates/files, etc.), we recommend to store it as a file in the shared `modules/.shared/.scripts` folder and load it using the template function `loadTextContent()` (for example: `scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1')`). This approach makes it easier to test & validate the logic and further allows reusing the same logic across multiple test cases. # Telemetry diff --git a/modules/aad/domain-service/.test/common/dependencies.bicep b/modules/aad/domain-service/tests/e2e/common/dependencies.bicep similarity index 96% rename from modules/aad/domain-service/.test/common/dependencies.bicep rename to modules/aad/domain-service/tests/e2e/common/dependencies.bicep index 8a704f3be0..0767cf436a 100644 --- a/modules/aad/domain-service/.test/common/dependencies.bicep +++ b/modules/aad/domain-service/tests/e2e/common/dependencies.bicep @@ -84,7 +84,7 @@ resource certDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '3.0' retentionInterval: 'P1D' arguments: ' -KeyVaultName "${keyVault.name}" -ResourceGroupName "${resourceGroup().name}" -CertPWSecretName "${certPWSecretName}" -CertSecretName "${certSecretName}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-PfxCertificateInKeyVault.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-PfxCertificateInKeyVault.ps1') } } diff --git a/modules/aad/domain-service/.test/common/main.test.bicep b/modules/aad/domain-service/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/aad/domain-service/.test/common/main.test.bicep rename to modules/aad/domain-service/tests/e2e/common/main.test.bicep index 59577a7f74..147548bc20 100644 --- a/modules/aad/domain-service/.test/common/main.test.bicep +++ b/modules/aad/domain-service/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -68,7 +68,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { scope: resourceGroup } -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/analysis-services/server/.test/common/dependencies.bicep b/modules/analysis-services/server/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/analysis-services/server/.test/common/dependencies.bicep rename to modules/analysis-services/server/tests/e2e/common/dependencies.bicep diff --git a/modules/analysis-services/server/.test/common/main.test.bicep b/modules/analysis-services/server/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/analysis-services/server/.test/common/main.test.bicep rename to modules/analysis-services/server/tests/e2e/common/main.test.bicep index cbe024449b..f90426c6a4 100644 --- a/modules/analysis-services/server/.test/common/main.test.bicep +++ b/modules/analysis-services/server/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/analysis-services/server/.test/max/dependencies.bicep b/modules/analysis-services/server/tests/e2e/max/dependencies.bicep similarity index 100% rename from modules/analysis-services/server/.test/max/dependencies.bicep rename to modules/analysis-services/server/tests/e2e/max/dependencies.bicep diff --git a/modules/analysis-services/server/.test/max/main.test.bicep b/modules/analysis-services/server/tests/e2e/max/main.test.bicep similarity index 95% rename from modules/analysis-services/server/.test/max/main.test.bicep rename to modules/analysis-services/server/tests/e2e/max/main.test.bicep index 37ef2b9a70..41b6b1dcd0 100644 --- a/modules/analysis-services/server/.test/max/main.test.bicep +++ b/modules/analysis-services/server/tests/e2e/max/main.test.bicep @@ -41,7 +41,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -57,7 +57,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: az.resourceGroup(resourceGroupName) name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/analysis-services/server/.test/min/main.test.bicep b/modules/analysis-services/server/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/analysis-services/server/.test/min/main.test.bicep rename to modules/analysis-services/server/tests/e2e/min/main.test.bicep index 2c00bf27fd..195a66ec25 100644 --- a/modules/analysis-services/server/.test/min/main.test.bicep +++ b/modules/analysis-services/server/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/api-management/service/.test/common/dependencies.bicep b/modules/api-management/service/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/api-management/service/.test/common/dependencies.bicep rename to modules/api-management/service/tests/e2e/common/dependencies.bicep diff --git a/modules/api-management/service/.test/common/main.test.bicep b/modules/api-management/service/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/api-management/service/.test/common/main.test.bicep rename to modules/api-management/service/tests/e2e/common/main.test.bicep index b2435a08bf..36998d40bd 100644 --- a/modules/api-management/service/.test/common/main.test.bicep +++ b/modules/api-management/service/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/api-management/service/.test/max/dependencies.bicep b/modules/api-management/service/tests/e2e/max/dependencies.bicep similarity index 100% rename from modules/api-management/service/.test/max/dependencies.bicep rename to modules/api-management/service/tests/e2e/max/dependencies.bicep diff --git a/modules/api-management/service/.test/max/main.test.bicep b/modules/api-management/service/tests/e2e/max/main.test.bicep similarity index 97% rename from modules/api-management/service/.test/max/main.test.bicep rename to modules/api-management/service/tests/e2e/max/main.test.bicep index 4311cd5ebb..75ed04fb5a 100644 --- a/modules/api-management/service/.test/max/main.test.bicep +++ b/modules/api-management/service/tests/e2e/max/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/api-management/service/.test/min/main.test.bicep b/modules/api-management/service/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/api-management/service/.test/min/main.test.bicep rename to modules/api-management/service/tests/e2e/min/main.test.bicep index 0f6785d024..1e18f22439 100644 --- a/modules/api-management/service/.test/min/main.test.bicep +++ b/modules/api-management/service/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app-configuration/configuration-store/.test/common/dependencies.bicep b/modules/app-configuration/configuration-store/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/app-configuration/configuration-store/.test/common/dependencies.bicep rename to modules/app-configuration/configuration-store/tests/e2e/common/dependencies.bicep diff --git a/modules/app-configuration/configuration-store/.test/common/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/app-configuration/configuration-store/.test/common/main.test.bicep rename to modules/app-configuration/configuration-store/tests/e2e/common/main.test.bicep index 53df736af2..c78f7c1c25 100644 --- a/modules/app-configuration/configuration-store/.test/common/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app-configuration/configuration-store/.test/encr/dependencies.bicep b/modules/app-configuration/configuration-store/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/app-configuration/configuration-store/.test/encr/dependencies.bicep rename to modules/app-configuration/configuration-store/tests/e2e/encr/dependencies.bicep diff --git a/modules/app-configuration/configuration-store/.test/encr/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/app-configuration/configuration-store/.test/encr/main.test.bicep rename to modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep index a0e639988a..fbe976165f 100644 --- a/modules/app-configuration/configuration-store/.test/encr/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app-configuration/configuration-store/.test/min/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/app-configuration/configuration-store/.test/min/main.test.bicep rename to modules/app-configuration/configuration-store/tests/e2e/min/main.test.bicep index 05c1075df5..c791402a8d 100644 --- a/modules/app-configuration/configuration-store/.test/min/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep b/modules/app-configuration/configuration-store/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/app-configuration/configuration-store/.test/pe/dependencies.bicep rename to modules/app-configuration/configuration-store/tests/e2e/pe/dependencies.bicep diff --git a/modules/app-configuration/configuration-store/.test/pe/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/app-configuration/configuration-store/.test/pe/main.test.bicep rename to modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep index 8b5d2ee82c..a8367ca982 100644 --- a/modules/app-configuration/configuration-store/.test/pe/main.test.bicep +++ b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/container-app/.test/common/dependencies.bicep b/modules/app/container-app/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/app/container-app/.test/common/dependencies.bicep rename to modules/app/container-app/tests/e2e/common/dependencies.bicep diff --git a/modules/app/container-app/.test/common/main.test.bicep b/modules/app/container-app/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/app/container-app/.test/common/main.test.bicep rename to modules/app/container-app/tests/e2e/common/main.test.bicep index 70db0d5eef..9d5a65c93b 100644 --- a/modules/app/container-app/.test/common/main.test.bicep +++ b/modules/app/container-app/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/container-app/.test/min/dependencies.bicep b/modules/app/container-app/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/app/container-app/.test/min/dependencies.bicep rename to modules/app/container-app/tests/e2e/min/dependencies.bicep diff --git a/modules/app/container-app/.test/min/main.test.bicep b/modules/app/container-app/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/app/container-app/.test/min/main.test.bicep rename to modules/app/container-app/tests/e2e/min/main.test.bicep index ac2621ddef..33c8893ba4 100644 --- a/modules/app/container-app/.test/min/main.test.bicep +++ b/modules/app/container-app/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/job/.test/common/dependencies.bicep b/modules/app/job/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/app/job/.test/common/dependencies.bicep rename to modules/app/job/tests/e2e/common/dependencies.bicep diff --git a/modules/app/job/.test/common/main.test.bicep b/modules/app/job/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/app/job/.test/common/main.test.bicep rename to modules/app/job/tests/e2e/common/main.test.bicep index 5d608f7db8..2ec0467680 100644 --- a/modules/app/job/.test/common/main.test.bicep +++ b/modules/app/job/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/job/.test/min/dependencies.bicep b/modules/app/job/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/app/job/.test/min/dependencies.bicep rename to modules/app/job/tests/e2e/min/dependencies.bicep diff --git a/modules/app/job/.test/min/main.test.bicep b/modules/app/job/tests/e2e/min/main.test.bicep similarity index 98% rename from modules/app/job/.test/min/main.test.bicep rename to modules/app/job/tests/e2e/min/main.test.bicep index b1e06bbb23..d09eaa87c6 100644 --- a/modules/app/job/.test/min/main.test.bicep +++ b/modules/app/job/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/managed-environment/.test/common/dependencies.bicep b/modules/app/managed-environment/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/app/managed-environment/.test/common/dependencies.bicep rename to modules/app/managed-environment/tests/e2e/common/dependencies.bicep diff --git a/modules/app/managed-environment/.test/common/main.test.bicep b/modules/app/managed-environment/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/app/managed-environment/.test/common/main.test.bicep rename to modules/app/managed-environment/tests/e2e/common/main.test.bicep index cd936f208c..16b5f39842 100644 --- a/modules/app/managed-environment/.test/common/main.test.bicep +++ b/modules/app/managed-environment/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/app/managed-environment/.test/min/dependencies.bicep b/modules/app/managed-environment/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/app/managed-environment/.test/min/dependencies.bicep rename to modules/app/managed-environment/tests/e2e/min/dependencies.bicep diff --git a/modules/app/managed-environment/.test/min/main.test.bicep b/modules/app/managed-environment/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/app/managed-environment/.test/min/main.test.bicep rename to modules/app/managed-environment/tests/e2e/min/main.test.bicep index 63e784e123..89142b2b49 100644 --- a/modules/app/managed-environment/.test/min/main.test.bicep +++ b/modules/app/managed-environment/tests/e2e/min/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/authorization/lock/.test/common/main.test.bicep b/modules/authorization/lock/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/authorization/lock/.test/common/main.test.bicep rename to modules/authorization/lock/tests/e2e/common/main.test.bicep index 69c8663433..177e5f5000 100644 --- a/modules/authorization/lock/.test/common/main.test.bicep +++ b/modules/authorization/lock/tests/e2e/common/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-assignment/.test/mg.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep similarity index 98% rename from modules/authorization/policy-assignment/.test/mg.common/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep index 41534b09c2..95285f90ac 100644 --- a/modules/authorization/policy-assignment/.test/mg.common/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-assignment/.test/mg.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep similarity index 95% rename from modules/authorization/policy-assignment/.test/mg.min/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep index 52ec70dc45..d0d00c55f3 100644 --- a/modules/authorization/policy-assignment/.test/mg.min/main.test.bicep +++ b/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep @@ -17,7 +17,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/authorization/policy-assignment/.test/rg.common/dependencies.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.common/dependencies.bicep similarity index 100% rename from modules/authorization/policy-assignment/.test/rg.common/dependencies.bicep rename to modules/authorization/policy-assignment/tests/e2e/rg.common/dependencies.bicep diff --git a/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep similarity index 98% rename from modules/authorization/policy-assignment/.test/rg.common/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep index e32a642345..3c64f5e2c1 100644 --- a/modules/authorization/policy-assignment/.test/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/.test/rg.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep similarity index 96% rename from modules/authorization/policy-assignment/.test/rg.min/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep index f84a97178a..2953f4aace 100644 --- a/modules/authorization/policy-assignment/.test/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/.test/sub.common/dependencies.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.common/dependencies.bicep similarity index 100% rename from modules/authorization/policy-assignment/.test/sub.common/dependencies.bicep rename to modules/authorization/policy-assignment/tests/e2e/sub.common/dependencies.bicep diff --git a/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep similarity index 98% rename from modules/authorization/policy-assignment/.test/sub.common/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep index 5ac56a6167..cb3c088c6c 100644 --- a/modules/authorization/policy-assignment/.test/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/.test/sub.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep similarity index 94% rename from modules/authorization/policy-assignment/.test/sub.min/main.test.bicep rename to modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep index 3713ee147a..d9039eca58 100644 --- a/modules/authorization/policy-assignment/.test/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/.test/mg.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep similarity index 97% rename from modules/authorization/policy-definition/.test/mg.common/main.test.bicep rename to modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep index f6f17baa93..df669b50c3 100644 --- a/modules/authorization/policy-definition/.test/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/.test/mg.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep similarity index 94% rename from modules/authorization/policy-definition/.test/mg.min/main.test.bicep rename to modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep index c9ca91e9a3..26408738b1 100644 --- a/modules/authorization/policy-definition/.test/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/.test/sub.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep similarity index 97% rename from modules/authorization/policy-definition/.test/sub.common/main.test.bicep rename to modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep index 40f5feaa19..735058877b 100644 --- a/modules/authorization/policy-definition/.test/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/.test/sub.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep similarity index 94% rename from modules/authorization/policy-definition/.test/sub.min/main.test.bicep rename to modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep index 75854be68d..8e0f2c8c48 100644 --- a/modules/authorization/policy-definition/.test/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/.test/mg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep similarity index 97% rename from modules/authorization/policy-exemption/.test/mg.common/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep index 30ce7cd012..4832fa018c 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/mg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep similarity index 95% rename from modules/authorization/policy-exemption/.test/mg.min/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep index 05067f1656..d34ab40cdb 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/rg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep similarity index 98% rename from modules/authorization/policy-exemption/.test/rg.common/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep index af4faa0c25..650cefa0b3 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/rg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep similarity index 96% rename from modules/authorization/policy-exemption/.test/rg.min/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep index 9f2269817c..49828f611d 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/sub.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep similarity index 97% rename from modules/authorization/policy-exemption/.test/sub.common/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep index 8f51cf6dc9..ac0f4d16eb 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/sub.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep similarity index 95% rename from modules/authorization/policy-exemption/.test/sub.min/main.test.bicep rename to modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep index fdc51ea925..c3a5b57b44 100644 --- a/modules/authorization/policy-exemption/.test/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/.test/mg.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep similarity index 96% rename from modules/authorization/policy-set-definition/.test/mg.common/main.test.bicep rename to modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep index 7836687bb8..0f5653cc1f 100644 --- a/modules/authorization/policy-set-definition/.test/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/.test/mg.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep similarity index 94% rename from modules/authorization/policy-set-definition/.test/mg.min/main.test.bicep rename to modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep index 1f84c6e7a8..8ad45325f9 100644 --- a/modules/authorization/policy-set-definition/.test/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/.test/sub.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep similarity index 97% rename from modules/authorization/policy-set-definition/.test/sub.common/main.test.bicep rename to modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep index c685542166..dfe66dba51 100644 --- a/modules/authorization/policy-set-definition/.test/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/.test/sub.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep similarity index 94% rename from modules/authorization/policy-set-definition/.test/sub.min/main.test.bicep rename to modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep index 2e246457e9..9057a849b5 100644 --- a/modules/authorization/policy-set-definition/.test/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/.test/mg.common/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/mg.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/mg.common/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.common/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/mg.common/interim.dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/mg.common/interim.dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/mg.common/interim.dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.common/interim.dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/mg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/mg.common/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep index 7e87bc88b2..336f3cd4bd 100644 --- a/modules/authorization/role-assignment/.test/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/.test/mg.min/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/mg.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/mg.min/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.min/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/mg.min/interim.dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/mg.min/interim.dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/mg.min/interim.dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.min/interim.dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/mg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/mg.min/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep index 96d88fc845..62cc16085c 100644 --- a/modules/authorization/role-assignment/.test/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/.test/rg.common/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/rg.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/rg.common/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/rg.common/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/rg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/rg.common/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep index 57afbad937..c4a6b7ea07 100644 --- a/modules/authorization/role-assignment/.test/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/.test/rg.min/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/rg.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/rg.min/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/rg.min/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/rg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/rg.min/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep index 62cdccccac..ca2f37a9ab 100644 --- a/modules/authorization/role-assignment/.test/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/.test/sub.common/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/sub.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/sub.common/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/sub.common/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/sub.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/sub.common/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep index 96f2dede38..77a6b7883c 100644 --- a/modules/authorization/role-assignment/.test/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/.test/sub.min/dependencies.bicep b/modules/authorization/role-assignment/tests/e2e/sub.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignment/.test/sub.min/dependencies.bicep rename to modules/authorization/role-assignment/tests/e2e/sub.min/dependencies.bicep diff --git a/modules/authorization/role-assignment/.test/sub.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep similarity index 96% rename from modules/authorization/role-assignment/.test/sub.min/main.test.bicep rename to modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep index 20fc2149a8..90242be1d0 100644 --- a/modules/authorization/role-assignment/.test/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/.test/mg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep similarity index 94% rename from modules/authorization/role-definition/.test/mg.common/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep index a8e253f92d..4a11b95b59 100644 --- a/modules/authorization/role-definition/.test/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/.test/mg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep similarity index 93% rename from modules/authorization/role-definition/.test/mg.min/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep index 88900f3816..67848fd6db 100644 --- a/modules/authorization/role-definition/.test/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/.test/rg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep similarity index 96% rename from modules/authorization/role-definition/.test/rg.common/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep index 56f0ddfaa3..b4f16419dc 100644 --- a/modules/authorization/role-definition/.test/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/.test/rg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep similarity index 95% rename from modules/authorization/role-definition/.test/rg.min/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep index 63ce946cc0..632a73d713 100644 --- a/modules/authorization/role-definition/.test/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/.test/sub.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep similarity index 95% rename from modules/authorization/role-definition/.test/sub.common/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep index d047b4a37d..9e7bdf1096 100644 --- a/modules/authorization/role-definition/.test/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/.test/sub.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep similarity index 93% rename from modules/authorization/role-definition/.test/sub.min/main.test.bicep rename to modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep index b91931fef3..e03ba0142c 100644 --- a/modules/authorization/role-definition/.test/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/modules/automation/automation-account/.test/common/dependencies.bicep b/modules/automation/automation-account/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/automation/automation-account/.test/common/dependencies.bicep rename to modules/automation/automation-account/tests/e2e/common/dependencies.bicep diff --git a/modules/automation/automation-account/.test/common/main.test.bicep b/modules/automation/automation-account/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/automation/automation-account/.test/common/main.test.bicep rename to modules/automation/automation-account/tests/e2e/common/main.test.bicep index 38861ec093..e21d40167d 100644 --- a/modules/automation/automation-account/.test/common/main.test.bicep +++ b/modules/automation/automation-account/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/automation/automation-account/.test/encr/dependencies.bicep b/modules/automation/automation-account/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/automation/automation-account/.test/encr/dependencies.bicep rename to modules/automation/automation-account/tests/e2e/encr/dependencies.bicep diff --git a/modules/automation/automation-account/.test/encr/main.test.bicep b/modules/automation/automation-account/tests/e2e/encr/main.test.bicep similarity index 97% rename from modules/automation/automation-account/.test/encr/main.test.bicep rename to modules/automation/automation-account/tests/e2e/encr/main.test.bicep index f417d2261d..4c72655f49 100644 --- a/modules/automation/automation-account/.test/encr/main.test.bicep +++ b/modules/automation/automation-account/tests/e2e/encr/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/automation/automation-account/.test/min/main.test.bicep b/modules/automation/automation-account/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/automation/automation-account/.test/min/main.test.bicep rename to modules/automation/automation-account/tests/e2e/min/main.test.bicep index 775f93260b..1c536702fe 100644 --- a/modules/automation/automation-account/.test/min/main.test.bicep +++ b/modules/automation/automation-account/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/batch/batch-account/.test/common/dependencies.bicep b/modules/batch/batch-account/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/batch/batch-account/.test/common/dependencies.bicep rename to modules/batch/batch-account/tests/e2e/common/dependencies.bicep diff --git a/modules/batch/batch-account/.test/common/main.test.bicep b/modules/batch/batch-account/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/batch/batch-account/.test/common/main.test.bicep rename to modules/batch/batch-account/tests/e2e/common/main.test.bicep index 8187f404f6..0da35a50a1 100644 --- a/modules/batch/batch-account/.test/common/main.test.bicep +++ b/modules/batch/batch-account/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/batch/batch-account/.test/encr/dependencies.bicep b/modules/batch/batch-account/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/batch/batch-account/.test/encr/dependencies.bicep rename to modules/batch/batch-account/tests/e2e/encr/dependencies.bicep diff --git a/modules/batch/batch-account/.test/encr/main.test.bicep b/modules/batch/batch-account/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/batch/batch-account/.test/encr/main.test.bicep rename to modules/batch/batch-account/tests/e2e/encr/main.test.bicep index c3ae0ef1cc..a50db3f7d6 100644 --- a/modules/batch/batch-account/.test/encr/main.test.bicep +++ b/modules/batch/batch-account/tests/e2e/encr/main.test.bicep @@ -50,7 +50,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/batch/batch-account/.test/min/dependencies.bicep b/modules/batch/batch-account/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/batch/batch-account/.test/min/dependencies.bicep rename to modules/batch/batch-account/tests/e2e/min/dependencies.bicep diff --git a/modules/batch/batch-account/.test/min/main.test.bicep b/modules/batch/batch-account/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/batch/batch-account/.test/min/main.test.bicep rename to modules/batch/batch-account/tests/e2e/min/main.test.bicep index 4e9f4bd0f4..dedd65a96c 100644 --- a/modules/batch/batch-account/.test/min/main.test.bicep +++ b/modules/batch/batch-account/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cache/redis-enterprise/.test/common/dependencies.bicep b/modules/cache/redis-enterprise/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/cache/redis-enterprise/.test/common/dependencies.bicep rename to modules/cache/redis-enterprise/tests/e2e/common/dependencies.bicep diff --git a/modules/cache/redis-enterprise/.test/common/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/cache/redis-enterprise/.test/common/main.test.bicep rename to modules/cache/redis-enterprise/tests/e2e/common/main.test.bicep index ec7d8af260..ee1edf7edf 100644 --- a/modules/cache/redis-enterprise/.test/common/main.test.bicep +++ b/modules/cache/redis-enterprise/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cache/redis-enterprise/.test/geo/dependencies.bicep b/modules/cache/redis-enterprise/tests/e2e/geo/dependencies.bicep similarity index 100% rename from modules/cache/redis-enterprise/.test/geo/dependencies.bicep rename to modules/cache/redis-enterprise/tests/e2e/geo/dependencies.bicep diff --git a/modules/cache/redis-enterprise/.test/geo/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep similarity index 98% rename from modules/cache/redis-enterprise/.test/geo/main.test.bicep rename to modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep index 6bf434e55f..f91f72b254 100644 --- a/modules/cache/redis-enterprise/.test/geo/main.test.bicep +++ b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { var redisCacheEnterpriseName = '${namePrefix}${serviceShort}001' var redisCacheEnterpriseExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Cache/redisEnterprise/${redisCacheEnterpriseName}' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cache/redis-enterprise/.test/min/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/cache/redis-enterprise/.test/min/main.test.bicep rename to modules/cache/redis-enterprise/tests/e2e/min/main.test.bicep index 768b4cb167..5ac671c1b6 100644 --- a/modules/cache/redis-enterprise/.test/min/main.test.bicep +++ b/modules/cache/redis-enterprise/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cache/redis/.test/common/dependencies.bicep b/modules/cache/redis/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/cache/redis/.test/common/dependencies.bicep rename to modules/cache/redis/tests/e2e/common/dependencies.bicep diff --git a/modules/cache/redis/.test/common/main.test.bicep b/modules/cache/redis/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/cache/redis/.test/common/main.test.bicep rename to modules/cache/redis/tests/e2e/common/main.test.bicep index eba4aadbe5..75f0cb1f22 100644 --- a/modules/cache/redis/.test/common/main.test.bicep +++ b/modules/cache/redis/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cache/redis/.test/min/main.test.bicep b/modules/cache/redis/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/cache/redis/.test/min/main.test.bicep rename to modules/cache/redis/tests/e2e/min/main.test.bicep index f2bdf186e7..4c8ef85da3 100644 --- a/modules/cache/redis/.test/min/main.test.bicep +++ b/modules/cache/redis/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cdn/profile/.test/afd/dependencies.bicep b/modules/cdn/profile/tests/e2e/afd/dependencies.bicep similarity index 100% rename from modules/cdn/profile/.test/afd/dependencies.bicep rename to modules/cdn/profile/tests/e2e/afd/dependencies.bicep diff --git a/modules/cdn/profile/.test/afd/main.test.bicep b/modules/cdn/profile/tests/e2e/afd/main.test.bicep similarity index 98% rename from modules/cdn/profile/.test/afd/main.test.bicep rename to modules/cdn/profile/tests/e2e/afd/main.test.bicep index 516f35298a..391920c781 100644 --- a/modules/cdn/profile/.test/afd/main.test.bicep +++ b/modules/cdn/profile/tests/e2e/afd/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cdn/profile/.test/common/dependencies.bicep b/modules/cdn/profile/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/cdn/profile/.test/common/dependencies.bicep rename to modules/cdn/profile/tests/e2e/common/dependencies.bicep diff --git a/modules/cdn/profile/.test/common/main.test.bicep b/modules/cdn/profile/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/cdn/profile/.test/common/main.test.bicep rename to modules/cdn/profile/tests/e2e/common/main.test.bicep index 1d6b703c01..9185beffba 100644 --- a/modules/cdn/profile/.test/common/main.test.bicep +++ b/modules/cdn/profile/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cognitive-services/account/.test/common/dependencies.bicep b/modules/cognitive-services/account/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/cognitive-services/account/.test/common/dependencies.bicep rename to modules/cognitive-services/account/tests/e2e/common/dependencies.bicep diff --git a/modules/cognitive-services/account/.test/common/main.test.bicep b/modules/cognitive-services/account/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/cognitive-services/account/.test/common/main.test.bicep rename to modules/cognitive-services/account/tests/e2e/common/main.test.bicep index a4c6701e77..0820e443b1 100644 --- a/modules/cognitive-services/account/.test/common/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cognitive-services/account/.test/encr/dependencies.bicep b/modules/cognitive-services/account/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/cognitive-services/account/.test/encr/dependencies.bicep rename to modules/cognitive-services/account/tests/e2e/encr/dependencies.bicep diff --git a/modules/cognitive-services/account/.test/encr/main.test.bicep b/modules/cognitive-services/account/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/cognitive-services/account/.test/encr/main.test.bicep rename to modules/cognitive-services/account/tests/e2e/encr/main.test.bicep index 442d5c02fb..aa2163900a 100644 --- a/modules/cognitive-services/account/.test/encr/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/encr/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cognitive-services/account/.test/min/main.test.bicep b/modules/cognitive-services/account/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/cognitive-services/account/.test/min/main.test.bicep rename to modules/cognitive-services/account/tests/e2e/min/main.test.bicep index 82892d7e39..e597ad984c 100644 --- a/modules/cognitive-services/account/.test/min/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/cognitive-services/account/.test/speech/dependencies.bicep b/modules/cognitive-services/account/tests/e2e/speech/dependencies.bicep similarity index 100% rename from modules/cognitive-services/account/.test/speech/dependencies.bicep rename to modules/cognitive-services/account/tests/e2e/speech/dependencies.bicep diff --git a/modules/cognitive-services/account/.test/speech/main.test.bicep b/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep similarity index 98% rename from modules/cognitive-services/account/.test/speech/main.test.bicep rename to modules/cognitive-services/account/tests/e2e/speech/main.test.bicep index d131eefbec..0ec0c858c4 100644 --- a/modules/cognitive-services/account/.test/speech/main.test.bicep +++ b/modules/cognitive-services/account/tests/e2e/speech/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/availability-set/.test/common/dependencies.bicep b/modules/compute/availability-set/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/compute/availability-set/.test/common/dependencies.bicep rename to modules/compute/availability-set/tests/e2e/common/dependencies.bicep diff --git a/modules/compute/availability-set/.test/common/main.test.bicep b/modules/compute/availability-set/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/compute/availability-set/.test/common/main.test.bicep rename to modules/compute/availability-set/tests/e2e/common/main.test.bicep index 17f56e1c0f..16687f42ea 100644 --- a/modules/compute/availability-set/.test/common/main.test.bicep +++ b/modules/compute/availability-set/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/availability-set/.test/min/main.test.bicep b/modules/compute/availability-set/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/compute/availability-set/.test/min/main.test.bicep rename to modules/compute/availability-set/tests/e2e/min/main.test.bicep index 0881b94536..d2e69aba00 100644 --- a/modules/compute/availability-set/.test/min/main.test.bicep +++ b/modules/compute/availability-set/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk-encryption-set/.test/accessPolicies/dependencies.bicep b/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/dependencies.bicep similarity index 100% rename from modules/compute/disk-encryption-set/.test/accessPolicies/dependencies.bicep rename to modules/compute/disk-encryption-set/tests/e2e/accessPolicies/dependencies.bicep diff --git a/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep b/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep similarity index 98% rename from modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep rename to modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep index be6f6c5b35..7baafd495c 100644 --- a/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep +++ b/modules/compute/disk-encryption-set/tests/e2e/accessPolicies/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk-encryption-set/.test/common/dependencies.bicep b/modules/compute/disk-encryption-set/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/compute/disk-encryption-set/.test/common/dependencies.bicep rename to modules/compute/disk-encryption-set/tests/e2e/common/dependencies.bicep diff --git a/modules/compute/disk-encryption-set/.test/common/main.test.bicep b/modules/compute/disk-encryption-set/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/compute/disk-encryption-set/.test/common/main.test.bicep rename to modules/compute/disk-encryption-set/tests/e2e/common/main.test.bicep index f1dbf22a72..608b7921c7 100644 --- a/modules/compute/disk-encryption-set/.test/common/main.test.bicep +++ b/modules/compute/disk-encryption-set/tests/e2e/common/main.test.bicep @@ -51,7 +51,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk/.test/common/dependencies.bicep b/modules/compute/disk/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/compute/disk/.test/common/dependencies.bicep rename to modules/compute/disk/tests/e2e/common/dependencies.bicep diff --git a/modules/compute/disk/.test/common/main.test.bicep b/modules/compute/disk/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/compute/disk/.test/common/main.test.bicep rename to modules/compute/disk/tests/e2e/common/main.test.bicep index 7a5b019c2d..ecbf2ab2d9 100644 --- a/modules/compute/disk/.test/common/main.test.bicep +++ b/modules/compute/disk/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk/.test/image/dependencies.bicep b/modules/compute/disk/tests/e2e/image/dependencies.bicep similarity index 100% rename from modules/compute/disk/.test/image/dependencies.bicep rename to modules/compute/disk/tests/e2e/image/dependencies.bicep diff --git a/modules/compute/disk/.test/image/main.test.bicep b/modules/compute/disk/tests/e2e/image/main.test.bicep similarity index 97% rename from modules/compute/disk/.test/image/main.test.bicep rename to modules/compute/disk/tests/e2e/image/main.test.bicep index 3038d1b07b..27dd941489 100644 --- a/modules/compute/disk/.test/image/main.test.bicep +++ b/modules/compute/disk/tests/e2e/image/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk/.test/import/dependencies.bicep b/modules/compute/disk/tests/e2e/import/dependencies.bicep similarity index 95% rename from modules/compute/disk/.test/import/dependencies.bicep rename to modules/compute/disk/tests/e2e/import/dependencies.bicep index ceb6c9f6db..aa2912f2ec 100644 --- a/modules/compute/disk/.test/import/dependencies.bicep +++ b/modules/compute/disk/tests/e2e/import/dependencies.bicep @@ -108,7 +108,7 @@ resource triggerImageDeploymentScript 'Microsoft.Resources/deploymentScripts@202 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-ImageTemplateName \\"${imageTemplate.name}\\" -ImageTemplateResourceGroup \\"${resourceGroup().name}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Start-ImageTemplate.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Start-ImageTemplate.ps1') cleanupPreference: 'OnSuccess' forceUpdateTag: baseTime } @@ -132,7 +132,7 @@ resource copyVhdDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10- azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-ImageTemplateName \\"${imageTemplate.name}\\" -ImageTemplateResourceGroup \\"${resourceGroup().name}\\" -DestinationStorageAccountName \\"${storageAccount.name}\\" -VhdName \\"${imageTemplateNamePrefix}\\" -WaitForComplete' - scriptContent: loadTextContent('../../../../.shared/.scripts/Copy-VhdToStorageAccount.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Copy-VhdToStorageAccount.ps1') cleanupPreference: 'OnSuccess' forceUpdateTag: baseTime } diff --git a/modules/compute/disk/.test/import/dependencies_rbac.bicep b/modules/compute/disk/tests/e2e/import/dependencies_rbac.bicep similarity index 100% rename from modules/compute/disk/.test/import/dependencies_rbac.bicep rename to modules/compute/disk/tests/e2e/import/dependencies_rbac.bicep diff --git a/modules/compute/disk/.test/import/main.test.bicep b/modules/compute/disk/tests/e2e/import/main.test.bicep similarity index 98% rename from modules/compute/disk/.test/import/main.test.bicep rename to modules/compute/disk/tests/e2e/import/main.test.bicep index 7acdeafcbe..d3f891d57f 100644 --- a/modules/compute/disk/.test/import/main.test.bicep +++ b/modules/compute/disk/tests/e2e/import/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/disk/.test/min/main.test.bicep b/modules/compute/disk/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/compute/disk/.test/min/main.test.bicep rename to modules/compute/disk/tests/e2e/min/main.test.bicep index 00ddc7f8c9..68c1b85ac6 100644 --- a/modules/compute/disk/.test/min/main.test.bicep +++ b/modules/compute/disk/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/gallery/.test/common/dependencies.bicep b/modules/compute/gallery/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/compute/gallery/.test/common/dependencies.bicep rename to modules/compute/gallery/tests/e2e/common/dependencies.bicep diff --git a/modules/compute/gallery/.test/common/main.test.bicep b/modules/compute/gallery/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/compute/gallery/.test/common/main.test.bicep rename to modules/compute/gallery/tests/e2e/common/main.test.bicep index ca9db82385..063c8b4719 100644 --- a/modules/compute/gallery/.test/common/main.test.bicep +++ b/modules/compute/gallery/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/gallery/.test/min/main.test.bicep b/modules/compute/gallery/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/compute/gallery/.test/min/main.test.bicep rename to modules/compute/gallery/tests/e2e/min/main.test.bicep index 86f8f257b5..690725cdd9 100644 --- a/modules/compute/gallery/.test/min/main.test.bicep +++ b/modules/compute/gallery/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/image/.test/common/dependencies.bicep b/modules/compute/image/tests/e2e/common/dependencies.bicep similarity index 97% rename from modules/compute/image/.test/common/dependencies.bicep rename to modules/compute/image/tests/e2e/common/dependencies.bicep index 94c7ebd169..2a31d8730b 100644 --- a/modules/compute/image/.test/common/dependencies.bicep +++ b/modules/compute/image/tests/e2e/common/dependencies.bicep @@ -115,7 +115,7 @@ resource triggerImageDeploymentScript 'Microsoft.Resources/deploymentScripts@202 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-ImageTemplateName \\"${imageTemplate.name}\\" -ImageTemplateResourceGroup \\"${resourceGroup().name}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Start-ImageTemplate.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Start-ImageTemplate.ps1') cleanupPreference: 'OnSuccess' forceUpdateTag: baseTime } @@ -139,7 +139,7 @@ resource copyVhdDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10- azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-ImageTemplateName \\"${imageTemplate.name}\\" -ImageTemplateResourceGroup \\"${resourceGroup().name}\\" -DestinationStorageAccountName \\"${storageAccount.name}\\" -VhdName \\"${imageTemplateNamePrefix}\\" -WaitForComplete' - scriptContent: loadTextContent('../../../../.shared/.scripts/Copy-VhdToStorageAccount.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Copy-VhdToStorageAccount.ps1') cleanupPreference: 'OnSuccess' forceUpdateTag: baseTime } diff --git a/modules/compute/image/.test/common/dependencies_rbac.bicep b/modules/compute/image/tests/e2e/common/dependencies_rbac.bicep similarity index 100% rename from modules/compute/image/.test/common/dependencies_rbac.bicep rename to modules/compute/image/tests/e2e/common/dependencies_rbac.bicep diff --git a/modules/compute/image/.test/common/main.test.bicep b/modules/compute/image/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/compute/image/.test/common/main.test.bicep rename to modules/compute/image/tests/e2e/common/main.test.bicep index edb30dddbc..8d1d8cea78 100644 --- a/modules/compute/image/.test/common/main.test.bicep +++ b/modules/compute/image/tests/e2e/common/main.test.bicep @@ -55,7 +55,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/proximity-placement-group/.test/common/dependencies.bicep b/modules/compute/proximity-placement-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/compute/proximity-placement-group/.test/common/dependencies.bicep rename to modules/compute/proximity-placement-group/tests/e2e/common/dependencies.bicep diff --git a/modules/compute/proximity-placement-group/.test/common/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/compute/proximity-placement-group/.test/common/main.test.bicep rename to modules/compute/proximity-placement-group/tests/e2e/common/main.test.bicep index a4dcb9881d..0256dec55a 100644 --- a/modules/compute/proximity-placement-group/.test/common/main.test.bicep +++ b/modules/compute/proximity-placement-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/proximity-placement-group/.test/min/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/compute/proximity-placement-group/.test/min/main.test.bicep rename to modules/compute/proximity-placement-group/tests/e2e/min/main.test.bicep index 1805333d13..47ce68a6d6 100644 --- a/modules/compute/proximity-placement-group/.test/min/main.test.bicep +++ b/modules/compute/proximity-placement-group/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/ssh-public-key/.test/common/dependencies.bicep b/modules/compute/ssh-public-key/tests/e2e/common/dependencies.bicep similarity index 96% rename from modules/compute/ssh-public-key/.test/common/dependencies.bicep rename to modules/compute/ssh-public-key/tests/e2e/common/dependencies.bicep index 4fba7f9e81..13a584595b 100644 --- a/modules/compute/ssh-public-key/.test/common/dependencies.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/common/dependencies.bicep @@ -42,7 +42,7 @@ resource createPubKeyScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-ResourceGroupName ${resourceGroup().name} -SSHKeyName ${sshKeyName}' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') cleanupPreference: 'OnExpiration' forceUpdateTag: utcValue } diff --git a/modules/compute/ssh-public-key/.test/common/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/compute/ssh-public-key/.test/common/main.test.bicep rename to modules/compute/ssh-public-key/tests/e2e/common/main.test.bicep index f40946b0cf..420a4d9f6d 100644 --- a/modules/compute/ssh-public-key/.test/common/main.test.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/ssh-public-key/.test/min/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/compute/ssh-public-key/.test/min/main.test.bicep rename to modules/compute/ssh-public-key/tests/e2e/min/main.test.bicep index 02a014853b..a44d0b7d0c 100644 --- a/modules/compute/ssh-public-key/.test/min/main.test.bicep +++ b/modules/compute/ssh-public-key/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.min/dependencies.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/dependencies.bicep similarity index 96% rename from modules/compute/virtual-machine-scale-set/.test/linux.min/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/dependencies.bicep index 16cf8889d8..b302bdc0c9 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux.min/dependencies.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/dependencies.bicep @@ -64,7 +64,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep index 3e94abd26d..110a696ad0 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/dependencies.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/dependencies.bicep similarity index 98% rename from modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/dependencies.bicep index a328f1decc..db780eec3b 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/dependencies.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/dependencies.bicep @@ -123,7 +123,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep index e78d392469..a574e6b411 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep @@ -52,7 +52,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine-scale-set/.test/linux/dependencies.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/dependencies.bicep similarity index 97% rename from modules/compute/virtual-machine-scale-set/.test/linux/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux/dependencies.bicep index 037c0420ca..556eb44538 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux/dependencies.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/dependencies.bicep @@ -126,7 +126,7 @@ resource storageUpload 'Microsoft.Resources/deploymentScripts@2020-10-01' = { azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-StorageAccountName "${storageAccount.name}" -ResourceGroupName "${resourceGroup().name}" -ContainerName "${storageAccount::blobService::container.name}" -FileName "${storageAccountCSEFileName}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-BlobContent.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-BlobContent.ps1') } dependsOn: [ msiRGContrRoleAssignment @@ -147,7 +147,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep similarity index 97% rename from modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep index 76e6e02285..3ba0990f66 100644 --- a/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine-scale-set/.test/windows.min/dependencies.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-set/.test/windows.min/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep index 9beeb880a2..6afe0758de 100644 --- a/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine-scale-set/.test/windows/dependencies.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/dependencies.bicep similarity index 98% rename from modules/compute/virtual-machine-scale-set/.test/windows/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/windows/dependencies.bicep index 756b22af61..b205e4d85c 100644 --- a/modules/compute/virtual-machine-scale-set/.test/windows/dependencies.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/dependencies.bicep @@ -123,7 +123,7 @@ resource storageUpload 'Microsoft.Resources/deploymentScripts@2020-10-01' = { azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-StorageAccountName "${storageAccount.name}" -ResourceGroupName "${resourceGroup().name}" -ContainerName "${storageAccount::blobService::container.name}" -FileName "${storageAccountCSEFileName}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-BlobContent.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-BlobContent.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep similarity index 97% rename from modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep rename to modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep index 705d245b20..2269ee9558 100644 --- a/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep +++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep @@ -50,7 +50,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -66,7 +66,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/linux.atmg/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/linux.atmg/dependencies.bicep similarity index 96% rename from modules/compute/virtual-machine/.test/linux.atmg/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/linux.atmg/dependencies.bicep index 567643dfac..d8b2e100e0 100644 --- a/modules/compute/virtual-machine/.test/linux.atmg/dependencies.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.atmg/dependencies.bicep @@ -64,7 +64,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: ' -SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep index 5bb0690a4e..4e53732a23 100644 --- a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.atmg/main.test.bicep @@ -52,7 +52,7 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/linux.min/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/linux.min/dependencies.bicep similarity index 96% rename from modules/compute/virtual-machine/.test/linux.min/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/linux.min/dependencies.bicep index 7bf89c0cdc..c88f2b1230 100644 --- a/modules/compute/virtual-machine/.test/linux.min/dependencies.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.min/dependencies.bicep @@ -64,7 +64,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/linux.min/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep index 6b00f10652..4c3fffb43d 100644 --- a/modules/compute/virtual-machine/.test/linux.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux.min/main.test.bicep @@ -52,7 +52,7 @@ module nestedDependencies 'dependencies.bicep' = { // scope: resourceGroup // } -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/linux/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/linux/dependencies.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/linux/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/linux/dependencies.bicep index b1e78465cf..4dbd74b07b 100644 --- a/modules/compute/virtual-machine/.test/linux/dependencies.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux/dependencies.bicep @@ -255,7 +255,7 @@ resource storageUpload 'Microsoft.Resources/deploymentScripts@2020-10-01' = { azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-StorageAccountName "${storageAccount.name}" -ResourceGroupName "${resourceGroup().name}" -ContainerName "${storageAccount::blobService::container.name}" -FileName "${storageAccountCSEFileName}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-BlobContent.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-BlobContent.ps1') } dependsOn: [ msiRGContrRoleAssignment @@ -276,7 +276,7 @@ resource sshDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-SSHKeyName "${sshKeyName}" -ResourceGroupName "${resourceGroup().name}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/New-SSHKey.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine/.test/linux/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/linux/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep index 7832d8e74d..1e0d29b188 100644 --- a/modules/compute/virtual-machine/.test/linux/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/linux/main.test.bicep @@ -51,7 +51,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -67,7 +67,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/windows.atmg/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/windows.atmg/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine/.test/windows.atmg/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.atmg/dependencies.bicep diff --git a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep index ccee52176b..b1314bce14 100644 --- a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.atmg/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/windows.min/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/windows.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine/.test/windows.min/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.min/dependencies.bicep diff --git a/modules/compute/virtual-machine/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep similarity index 97% rename from modules/compute/virtual-machine/.test/windows.min/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep index 0d2a846d66..68c34d8494 100644 --- a/modules/compute/virtual-machine/.test/windows.min/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/windows.ssecmk/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine/.test/windows.ssecmk/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.ssecmk/dependencies.bicep diff --git a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep index d20da897b7..ff7c06d244 100644 --- a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows.ssecmk/main.test.bicep @@ -53,7 +53,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/compute/virtual-machine/.test/windows/dependencies.bicep b/modules/compute/virtual-machine/tests/e2e/windows/dependencies.bicep similarity index 99% rename from modules/compute/virtual-machine/.test/windows/dependencies.bicep rename to modules/compute/virtual-machine/tests/e2e/windows/dependencies.bicep index 22df299a8e..6a1f5fcc13 100644 --- a/modules/compute/virtual-machine/.test/windows/dependencies.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows/dependencies.bicep @@ -252,7 +252,7 @@ resource storageUpload 'Microsoft.Resources/deploymentScripts@2020-10-01' = { azPowerShellVersion: '9.0' retentionInterval: 'P1D' arguments: '-StorageAccountName "${storageAccount.name}" -ResourceGroupName "${resourceGroup().name}" -ContainerName "${storageAccount::blobService::container.name}" -FileName "${storageAccountCSEFileName}"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-BlobContent.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-BlobContent.ps1') } dependsOn: [ msiRGContrRoleAssignment diff --git a/modules/compute/virtual-machine/.test/windows/main.test.bicep b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep similarity index 98% rename from modules/compute/virtual-machine/.test/windows/main.test.bicep rename to modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep index 4d171f578e..795e801f7e 100644 --- a/modules/compute/virtual-machine/.test/windows/main.test.bicep +++ b/modules/compute/virtual-machine/tests/e2e/windows/main.test.bicep @@ -54,7 +54,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -70,7 +70,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/consumption/budget/.test/common/main.test.bicep b/modules/consumption/budget/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/consumption/budget/.test/common/main.test.bicep rename to modules/consumption/budget/tests/e2e/common/main.test.bicep index 7668018aae..a696b0b40e 100644 --- a/modules/consumption/budget/.test/common/main.test.bicep +++ b/modules/consumption/budget/tests/e2e/common/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/consumption/budget/.test/min/main.test.bicep b/modules/consumption/budget/tests/e2e/min/main.test.bicep similarity index 95% rename from modules/consumption/budget/.test/min/main.test.bicep rename to modules/consumption/budget/tests/e2e/min/main.test.bicep index a76b439216..e9d47202bb 100644 --- a/modules/consumption/budget/.test/min/main.test.bicep +++ b/modules/consumption/budget/tests/e2e/min/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/container-instance/container-group/.test/common/dependencies.bicep b/modules/container-instance/container-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/container-instance/container-group/.test/common/dependencies.bicep rename to modules/container-instance/container-group/tests/e2e/common/dependencies.bicep diff --git a/modules/container-instance/container-group/.test/common/main.test.bicep b/modules/container-instance/container-group/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/container-instance/container-group/.test/common/main.test.bicep rename to modules/container-instance/container-group/tests/e2e/common/main.test.bicep index 6ba2e16a9d..6aa1e5adc8 100644 --- a/modules/container-instance/container-group/.test/common/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-instance/container-group/.test/encr/dependencies.bicep b/modules/container-instance/container-group/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/container-instance/container-group/.test/encr/dependencies.bicep rename to modules/container-instance/container-group/tests/e2e/encr/dependencies.bicep diff --git a/modules/container-instance/container-group/.test/encr/main.test.bicep b/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/container-instance/container-group/.test/encr/main.test.bicep rename to modules/container-instance/container-group/tests/e2e/encr/main.test.bicep index df9bcfd467..2417490304 100644 --- a/modules/container-instance/container-group/.test/encr/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-instance/container-group/.test/min/main.test.bicep b/modules/container-instance/container-group/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/container-instance/container-group/.test/min/main.test.bicep rename to modules/container-instance/container-group/tests/e2e/min/main.test.bicep index 55144600d3..e498caa1d5 100644 --- a/modules/container-instance/container-group/.test/min/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-instance/container-group/.test/private/dependencies.bicep b/modules/container-instance/container-group/tests/e2e/private/dependencies.bicep similarity index 100% rename from modules/container-instance/container-group/.test/private/dependencies.bicep rename to modules/container-instance/container-group/tests/e2e/private/dependencies.bicep diff --git a/modules/container-instance/container-group/.test/private/main.test.bicep b/modules/container-instance/container-group/tests/e2e/private/main.test.bicep similarity index 98% rename from modules/container-instance/container-group/.test/private/main.test.bicep rename to modules/container-instance/container-group/tests/e2e/private/main.test.bicep index 8ca06b9dae..56ed91d9c9 100644 --- a/modules/container-instance/container-group/.test/private/main.test.bicep +++ b/modules/container-instance/container-group/tests/e2e/private/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-registry/registry/.test/common/dependencies.bicep b/modules/container-registry/registry/tests/e2e/common/dependencies.bicep similarity index 97% rename from modules/container-registry/registry/.test/common/dependencies.bicep rename to modules/container-registry/registry/tests/e2e/common/dependencies.bicep index acb54c6443..4e89a810a0 100644 --- a/modules/container-registry/registry/.test/common/dependencies.bicep +++ b/modules/container-registry/registry/tests/e2e/common/dependencies.bicep @@ -76,7 +76,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/container-registry/registry/.test/common/main.test.bicep b/modules/container-registry/registry/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/container-registry/registry/.test/common/main.test.bicep rename to modules/container-registry/registry/tests/e2e/common/main.test.bicep index ff37a24ff3..6dc873af77 100644 --- a/modules/container-registry/registry/.test/common/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -64,7 +64,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-registry/registry/.test/encr/dependencies.bicep b/modules/container-registry/registry/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/container-registry/registry/.test/encr/dependencies.bicep rename to modules/container-registry/registry/tests/e2e/encr/dependencies.bicep diff --git a/modules/container-registry/registry/.test/encr/main.test.bicep b/modules/container-registry/registry/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/container-registry/registry/.test/encr/main.test.bicep rename to modules/container-registry/registry/tests/e2e/encr/main.test.bicep index 0e804e410a..9c93b863b2 100644 --- a/modules/container-registry/registry/.test/encr/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/encr/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-registry/registry/.test/min/main.test.bicep b/modules/container-registry/registry/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/container-registry/registry/.test/min/main.test.bicep rename to modules/container-registry/registry/tests/e2e/min/main.test.bicep index 3d4f3030e4..4646019d7f 100644 --- a/modules/container-registry/registry/.test/min/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-registry/registry/.test/pe/dependencies.bicep b/modules/container-registry/registry/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/container-registry/registry/.test/pe/dependencies.bicep rename to modules/container-registry/registry/tests/e2e/pe/dependencies.bicep diff --git a/modules/container-registry/registry/.test/pe/main.test.bicep b/modules/container-registry/registry/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/container-registry/registry/.test/pe/main.test.bicep rename to modules/container-registry/registry/tests/e2e/pe/main.test.bicep index f3f4cf3339..e114baa09b 100644 --- a/modules/container-registry/registry/.test/pe/main.test.bicep +++ b/modules/container-registry/registry/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-service/managed-cluster/.test/azure/dependencies.bicep b/modules/container-service/managed-cluster/tests/e2e/azure/dependencies.bicep similarity index 100% rename from modules/container-service/managed-cluster/.test/azure/dependencies.bicep rename to modules/container-service/managed-cluster/tests/e2e/azure/dependencies.bicep diff --git a/modules/container-service/managed-cluster/.test/azure/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep similarity index 98% rename from modules/container-service/managed-cluster/.test/azure/main.test.bicep rename to modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep index f1d65fbe4b..51b7cf66bd 100644 --- a/modules/container-service/managed-cluster/.test/azure/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/azure/main.test.bicep @@ -52,7 +52,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -68,7 +68,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-service/managed-cluster/.test/kubenet/dependencies.bicep b/modules/container-service/managed-cluster/tests/e2e/kubenet/dependencies.bicep similarity index 100% rename from modules/container-service/managed-cluster/.test/kubenet/dependencies.bicep rename to modules/container-service/managed-cluster/tests/e2e/kubenet/dependencies.bicep diff --git a/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep similarity index 96% rename from modules/container-service/managed-cluster/.test/kubenet/main.test.bicep rename to modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep index e0881cd6d5..9183f19294 100644 --- a/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-service/managed-cluster/.test/min/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/container-service/managed-cluster/.test/min/main.test.bicep rename to modules/container-service/managed-cluster/tests/e2e/min/main.test.bicep index dc349e269b..833719b5e2 100644 --- a/modules/container-service/managed-cluster/.test/min/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/min/main.test.bicep @@ -34,7 +34,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { location: location } -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/container-service/managed-cluster/.test/priv/dependencies.bicep b/modules/container-service/managed-cluster/tests/e2e/priv/dependencies.bicep similarity index 100% rename from modules/container-service/managed-cluster/.test/priv/dependencies.bicep rename to modules/container-service/managed-cluster/tests/e2e/priv/dependencies.bicep diff --git a/modules/container-service/managed-cluster/.test/priv/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep similarity index 97% rename from modules/container-service/managed-cluster/.test/priv/main.test.bicep rename to modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep index 90f3de3f7d..46d56ddb63 100644 --- a/modules/container-service/managed-cluster/.test/priv/main.test.bicep +++ b/modules/container-service/managed-cluster/tests/e2e/priv/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -59,7 +59,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/data-factory/factory/.test/common/dependencies.bicep b/modules/data-factory/factory/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/data-factory/factory/.test/common/dependencies.bicep rename to modules/data-factory/factory/tests/e2e/common/dependencies.bicep diff --git a/modules/data-factory/factory/.test/common/main.test.bicep b/modules/data-factory/factory/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/data-factory/factory/.test/common/main.test.bicep rename to modules/data-factory/factory/tests/e2e/common/main.test.bicep index 2c9eacb8ec..b88833eb68 100644 --- a/modules/data-factory/factory/.test/common/main.test.bicep +++ b/modules/data-factory/factory/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/data-factory/factory/.test/min/main.test.bicep b/modules/data-factory/factory/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/data-factory/factory/.test/min/main.test.bicep rename to modules/data-factory/factory/tests/e2e/min/main.test.bicep index b182ddfc97..a6d55d1d70 100644 --- a/modules/data-factory/factory/.test/min/main.test.bicep +++ b/modules/data-factory/factory/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/data-protection/backup-vault/.test/common/dependencies.bicep b/modules/data-protection/backup-vault/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/data-protection/backup-vault/.test/common/dependencies.bicep rename to modules/data-protection/backup-vault/tests/e2e/common/dependencies.bicep diff --git a/modules/data-protection/backup-vault/.test/common/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/data-protection/backup-vault/.test/common/main.test.bicep rename to modules/data-protection/backup-vault/tests/e2e/common/main.test.bicep index 5a9de2cea8..83f702d49a 100644 --- a/modules/data-protection/backup-vault/.test/common/main.test.bicep +++ b/modules/data-protection/backup-vault/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/data-protection/backup-vault/.test/min/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/data-protection/backup-vault/.test/min/main.test.bicep rename to modules/data-protection/backup-vault/tests/e2e/min/main.test.bicep index 28e222baca..c28874ad47 100644 --- a/modules/data-protection/backup-vault/.test/min/main.test.bicep +++ b/modules/data-protection/backup-vault/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/databricks/access-connector/.test/common/dependencies.bicep b/modules/databricks/access-connector/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/databricks/access-connector/.test/common/dependencies.bicep rename to modules/databricks/access-connector/tests/e2e/common/dependencies.bicep diff --git a/modules/databricks/access-connector/.test/common/main.test.bicep b/modules/databricks/access-connector/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/databricks/access-connector/.test/common/main.test.bicep rename to modules/databricks/access-connector/tests/e2e/common/main.test.bicep index c4d988caa7..e6714e44e1 100644 --- a/modules/databricks/access-connector/.test/common/main.test.bicep +++ b/modules/databricks/access-connector/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/databricks/access-connector/.test/min/main.test.bicep b/modules/databricks/access-connector/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/databricks/access-connector/.test/min/main.test.bicep rename to modules/databricks/access-connector/tests/e2e/min/main.test.bicep index b353cb47c5..815fc5ca3d 100644 --- a/modules/databricks/access-connector/.test/min/main.test.bicep +++ b/modules/databricks/access-connector/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/databricks/workspace/.test/common/dependencies.bicep b/modules/databricks/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/databricks/workspace/.test/common/dependencies.bicep rename to modules/databricks/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/databricks/workspace/.test/common/main.test.bicep b/modules/databricks/workspace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/databricks/workspace/.test/common/main.test.bicep rename to modules/databricks/workspace/tests/e2e/common/main.test.bicep index e331c84dec..02851de992 100644 --- a/modules/databricks/workspace/.test/common/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/common/main.test.bicep @@ -56,7 +56,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -72,7 +72,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/databricks/workspace/.test/min/main.test.bicep b/modules/databricks/workspace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/databricks/workspace/.test/min/main.test.bicep rename to modules/databricks/workspace/tests/e2e/min/main.test.bicep index 1ee4cd5c32..9735d40a22 100644 --- a/modules/databricks/workspace/.test/min/main.test.bicep +++ b/modules/databricks/workspace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/min/main.test.bicep index 55d2de2958..b127e422f4 100644 --- a/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/min/main.test.bicep @@ -42,7 +42,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-my-sql/flexible-server/.test/private/dependencies.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/private/dependencies.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-server/.test/private/dependencies.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/private/dependencies.bicep diff --git a/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep similarity index 96% rename from modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep index 13819511a9..27819b80b1 100644 --- a/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/private/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-my-sql/flexible-server/.test/public/dependencies1.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/public/dependencies1.bicep similarity index 94% rename from modules/db-for-my-sql/flexible-server/.test/public/dependencies1.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/public/dependencies1.bicep index 0daa2a8db4..82fbab799d 100644 --- a/modules/db-for-my-sql/flexible-server/.test/public/dependencies1.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/public/dependencies1.bicep @@ -35,7 +35,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/db-for-my-sql/flexible-server/.test/public/dependencies2.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/public/dependencies2.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-server/.test/public/dependencies2.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/public/dependencies2.bicep diff --git a/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep similarity index 97% rename from modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep rename to modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep index 2dac6609f6..affcf5e126 100644 --- a/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep +++ b/modules/db-for-my-sql/flexible-server/tests/e2e/public/main.test.bicep @@ -64,7 +64,7 @@ module nestedDependencies2 'dependencies2.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -80,7 +80,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/min/main.test.bicep index 6257b66663..bac3973754 100644 --- a/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/min/main.test.bicep @@ -42,7 +42,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-postgre-sql/flexible-server/.test/private/dependencies.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/dependencies.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/.test/private/dependencies.bicep rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/private/dependencies.bicep diff --git a/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep similarity index 96% rename from modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep index da9f902b2a..eb5a7ba144 100644 --- a/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/private/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/db-for-postgre-sql/flexible-server/.test/public/dependencies.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/dependencies.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/.test/public/dependencies.bicep rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/public/dependencies.bicep diff --git a/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep similarity index 96% rename from modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep index 3cbc9ecdbc..ac74978518 100644 --- a/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep +++ b/modules/db-for-postgre-sql/flexible-server/tests/e2e/public/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/application-group/.test/common/dependencies.bicep b/modules/desktop-virtualization/application-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/application-group/.test/common/dependencies.bicep rename to modules/desktop-virtualization/application-group/tests/e2e/common/dependencies.bicep diff --git a/modules/desktop-virtualization/application-group/.test/common/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/application-group/.test/common/main.test.bicep rename to modules/desktop-virtualization/application-group/tests/e2e/common/main.test.bicep index 682d39b734..65fd94ed94 100644 --- a/modules/desktop-virtualization/application-group/.test/common/main.test.bicep +++ b/modules/desktop-virtualization/application-group/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/application-group/.test/min/dependencies.bicep b/modules/desktop-virtualization/application-group/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/application-group/.test/min/dependencies.bicep rename to modules/desktop-virtualization/application-group/tests/e2e/min/dependencies.bicep diff --git a/modules/desktop-virtualization/application-group/.test/min/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/desktop-virtualization/application-group/.test/min/main.test.bicep rename to modules/desktop-virtualization/application-group/tests/e2e/min/main.test.bicep index dc7a01bd2d..0dcced5bab 100644 --- a/modules/desktop-virtualization/application-group/.test/min/main.test.bicep +++ b/modules/desktop-virtualization/application-group/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/host-pool/.test/common/dependencies.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/host-pool/.test/common/dependencies.bicep rename to modules/desktop-virtualization/host-pool/tests/e2e/common/dependencies.bicep diff --git a/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/host-pool/.test/common/main.test.bicep rename to modules/desktop-virtualization/host-pool/tests/e2e/common/main.test.bicep index 674d905c5c..85d73e62df 100644 --- a/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/host-pool/.test/min/main.test.bicep rename to modules/desktop-virtualization/host-pool/tests/e2e/min/main.test.bicep index 2f46ec4302..0675dbe11e 100644 --- a/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep +++ b/modules/desktop-virtualization/host-pool/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/scaling-plan/.test/common/dependencies.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plan/.test/common/dependencies.bicep rename to modules/desktop-virtualization/scaling-plan/tests/e2e/common/dependencies.bicep diff --git a/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep rename to modules/desktop-virtualization/scaling-plan/tests/e2e/common/main.test.bicep index e0e472ce62..105ce03868 100644 --- a/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep rename to modules/desktop-virtualization/scaling-plan/tests/e2e/min/main.test.bicep index edfaf01186..1ded6e5b55 100644 --- a/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep +++ b/modules/desktop-virtualization/scaling-plan/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/workspace/.test/common/dependencies.bicep b/modules/desktop-virtualization/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/workspace/.test/common/dependencies.bicep rename to modules/desktop-virtualization/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/desktop-virtualization/workspace/.test/common/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/desktop-virtualization/workspace/.test/common/main.test.bicep rename to modules/desktop-virtualization/workspace/tests/e2e/common/main.test.bicep index 72fe51a213..c79a1fa0ae 100644 --- a/modules/desktop-virtualization/workspace/.test/common/main.test.bicep +++ b/modules/desktop-virtualization/workspace/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/desktop-virtualization/workspace/.test/min/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/desktop-virtualization/workspace/.test/min/main.test.bicep rename to modules/desktop-virtualization/workspace/tests/e2e/min/main.test.bicep index 478c8a8f34..7fc5df6c67 100644 --- a/modules/desktop-virtualization/workspace/.test/min/main.test.bicep +++ b/modules/desktop-virtualization/workspace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/dev-test-lab/lab/.test/common/dependencies.bicep b/modules/dev-test-lab/lab/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/dev-test-lab/lab/.test/common/dependencies.bicep rename to modules/dev-test-lab/lab/tests/e2e/common/dependencies.bicep diff --git a/modules/dev-test-lab/lab/.test/common/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/dev-test-lab/lab/.test/common/main.test.bicep rename to modules/dev-test-lab/lab/tests/e2e/common/main.test.bicep index a6a84a65bf..149d0cf464 100644 --- a/modules/dev-test-lab/lab/.test/common/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/common/main.test.bicep @@ -54,7 +54,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/dev-test-lab/lab/.test/min/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/dev-test-lab/lab/.test/min/main.test.bicep rename to modules/dev-test-lab/lab/tests/e2e/min/main.test.bicep index d78c982d07..b74a10c49c 100644 --- a/modules/dev-test-lab/lab/.test/min/main.test.bicep +++ b/modules/dev-test-lab/lab/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/digital-twins/digital-twins-instance/.test/common/dependencies.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instance/.test/common/dependencies.bicep rename to modules/digital-twins/digital-twins-instance/tests/e2e/common/dependencies.bicep diff --git a/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep rename to modules/digital-twins/digital-twins-instance/tests/e2e/common/main.test.bicep index e6281b2d8d..73bf091495 100644 --- a/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -65,7 +65,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep rename to modules/digital-twins/digital-twins-instance/tests/e2e/min/main.test.bicep index 7d9b327dc3..4c2c58a0a8 100644 --- a/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep +++ b/modules/digital-twins/digital-twins-instance/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/document-db/database-account/.test/mongodb/dependencies.bicep b/modules/document-db/database-account/tests/e2e/gremlindb/dependencies.bicep similarity index 94% rename from modules/document-db/database-account/.test/mongodb/dependencies.bicep rename to modules/document-db/database-account/tests/e2e/gremlindb/dependencies.bicep index 76d19a4b2d..f92185e3e8 100644 --- a/modules/document-db/database-account/.test/mongodb/dependencies.bicep +++ b/modules/document-db/database-account/tests/e2e/gremlindb/dependencies.bicep @@ -35,7 +35,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/document-db/database-account/.test/gremlindb/main.test.bicep b/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep similarity index 96% rename from modules/document-db/database-account/.test/gremlindb/main.test.bicep rename to modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep index f1120061d4..44f12410b3 100644 --- a/modules/document-db/database-account/.test/gremlindb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/gremlindb/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/document-db/database-account/.test/plain/dependencies.bicep b/modules/document-db/database-account/tests/e2e/mongodb/dependencies.bicep similarity index 94% rename from modules/document-db/database-account/.test/plain/dependencies.bicep rename to modules/document-db/database-account/tests/e2e/mongodb/dependencies.bicep index 76d19a4b2d..f92185e3e8 100644 --- a/modules/document-db/database-account/.test/plain/dependencies.bicep +++ b/modules/document-db/database-account/tests/e2e/mongodb/dependencies.bicep @@ -35,7 +35,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/document-db/database-account/.test/mongodb/main.test.bicep b/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep similarity index 98% rename from modules/document-db/database-account/.test/mongodb/main.test.bicep rename to modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep index e554588b54..ddb9ac1a75 100644 --- a/modules/document-db/database-account/.test/mongodb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/mongodb/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/document-db/database-account/.test/gremlindb/dependencies.bicep b/modules/document-db/database-account/tests/e2e/plain/dependencies.bicep similarity index 94% rename from modules/document-db/database-account/.test/gremlindb/dependencies.bicep rename to modules/document-db/database-account/tests/e2e/plain/dependencies.bicep index 76d19a4b2d..f92185e3e8 100644 --- a/modules/document-db/database-account/.test/gremlindb/dependencies.bicep +++ b/modules/document-db/database-account/tests/e2e/plain/dependencies.bicep @@ -35,7 +35,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/document-db/database-account/.test/plain/main.test.bicep b/modules/document-db/database-account/tests/e2e/plain/main.test.bicep similarity index 95% rename from modules/document-db/database-account/.test/plain/main.test.bicep rename to modules/document-db/database-account/tests/e2e/plain/main.test.bicep index ceb6b2fecb..c8dbd06e37 100644 --- a/modules/document-db/database-account/.test/plain/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/plain/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/document-db/database-account/.test/sqldb/dependencies.bicep b/modules/document-db/database-account/tests/e2e/sqldb/dependencies.bicep similarity index 97% rename from modules/document-db/database-account/.test/sqldb/dependencies.bicep rename to modules/document-db/database-account/tests/e2e/sqldb/dependencies.bicep index c3dd593b88..61dec739a6 100644 --- a/modules/document-db/database-account/.test/sqldb/dependencies.bicep +++ b/modules/document-db/database-account/tests/e2e/sqldb/dependencies.bicep @@ -76,7 +76,7 @@ resource getPairedRegionScript 'Microsoft.Resources/deploymentScripts@2020-10-01 azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-Location \\"${location}\\"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Get-PairedRegion.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Get-PairedRegion.ps1') } dependsOn: [ roleAssignment diff --git a/modules/document-db/database-account/.test/sqldb/main.test.bicep b/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep similarity index 97% rename from modules/document-db/database-account/.test/sqldb/main.test.bicep rename to modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep index 2f9254da17..eb14ddcb9b 100644 --- a/modules/document-db/database-account/.test/sqldb/main.test.bicep +++ b/modules/document-db/database-account/tests/e2e/sqldb/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -59,7 +59,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/domain/.test/common/dependencies.bicep b/modules/event-grid/domain/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/event-grid/domain/.test/common/dependencies.bicep rename to modules/event-grid/domain/tests/e2e/common/dependencies.bicep diff --git a/modules/event-grid/domain/.test/common/main.test.bicep b/modules/event-grid/domain/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/event-grid/domain/.test/common/main.test.bicep rename to modules/event-grid/domain/tests/e2e/common/main.test.bicep index a6fc193fae..f96b8aba01 100644 --- a/modules/event-grid/domain/.test/common/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/domain/.test/min/main.test.bicep b/modules/event-grid/domain/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/event-grid/domain/.test/min/main.test.bicep rename to modules/event-grid/domain/tests/e2e/min/main.test.bicep index a531c4d003..e2d9be8663 100644 --- a/modules/event-grid/domain/.test/min/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/domain/.test/pe/dependencies.bicep b/modules/event-grid/domain/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/event-grid/domain/.test/pe/dependencies.bicep rename to modules/event-grid/domain/tests/e2e/pe/dependencies.bicep diff --git a/modules/event-grid/domain/.test/pe/main.test.bicep b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/event-grid/domain/.test/pe/main.test.bicep rename to modules/event-grid/domain/tests/e2e/pe/main.test.bicep index 43c759532a..ddaa562218 100644 --- a/modules/event-grid/domain/.test/pe/main.test.bicep +++ b/modules/event-grid/domain/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/system-topic/.test/common/dependencies.bicep b/modules/event-grid/system-topic/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/event-grid/system-topic/.test/common/dependencies.bicep rename to modules/event-grid/system-topic/tests/e2e/common/dependencies.bicep diff --git a/modules/event-grid/system-topic/.test/common/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/event-grid/system-topic/.test/common/main.test.bicep rename to modules/event-grid/system-topic/tests/e2e/common/main.test.bicep index 72a3551ad0..a6b9312e35 100644 --- a/modules/event-grid/system-topic/.test/common/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/system-topic/.test/min/dependencies.bicep b/modules/event-grid/system-topic/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/event-grid/system-topic/.test/min/dependencies.bicep rename to modules/event-grid/system-topic/tests/e2e/min/dependencies.bicep diff --git a/modules/event-grid/system-topic/.test/min/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/min/main.test.bicep similarity index 93% rename from modules/event-grid/system-topic/.test/min/main.test.bicep rename to modules/event-grid/system-topic/tests/e2e/min/main.test.bicep index c8767d484b..8bfe4a7feb 100644 --- a/modules/event-grid/system-topic/.test/min/main.test.bicep +++ b/modules/event-grid/system-topic/tests/e2e/min/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/topic/.test/common/dependencies.bicep b/modules/event-grid/topic/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/event-grid/topic/.test/common/dependencies.bicep rename to modules/event-grid/topic/tests/e2e/common/dependencies.bicep diff --git a/modules/event-grid/topic/.test/common/main.test.bicep b/modules/event-grid/topic/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/event-grid/topic/.test/common/main.test.bicep rename to modules/event-grid/topic/tests/e2e/common/main.test.bicep index 94d94440b7..8027740ab5 100644 --- a/modules/event-grid/topic/.test/common/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/topic/.test/min/main.test.bicep b/modules/event-grid/topic/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/event-grid/topic/.test/min/main.test.bicep rename to modules/event-grid/topic/tests/e2e/min/main.test.bicep index f8ec16cb64..89a79f1097 100644 --- a/modules/event-grid/topic/.test/min/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-grid/topic/.test/pe/dependencies.bicep b/modules/event-grid/topic/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/event-grid/topic/.test/pe/dependencies.bicep rename to modules/event-grid/topic/tests/e2e/pe/dependencies.bicep diff --git a/modules/event-grid/topic/.test/pe/main.test.bicep b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/event-grid/topic/.test/pe/main.test.bicep rename to modules/event-grid/topic/tests/e2e/pe/main.test.bicep index a70b97b936..99f3160297 100644 --- a/modules/event-grid/topic/.test/pe/main.test.bicep +++ b/modules/event-grid/topic/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-hub/namespace/.test/common/dependencies.bicep b/modules/event-hub/namespace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/event-hub/namespace/.test/common/dependencies.bicep rename to modules/event-hub/namespace/tests/e2e/common/dependencies.bicep diff --git a/modules/event-hub/namespace/.test/common/main.test.bicep b/modules/event-hub/namespace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/event-hub/namespace/.test/common/main.test.bicep rename to modules/event-hub/namespace/tests/e2e/common/main.test.bicep index b276b1734f..869463f5a9 100644 --- a/modules/event-hub/namespace/.test/common/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-hub/namespace/.test/encr/dependencies.bicep b/modules/event-hub/namespace/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/event-hub/namespace/.test/encr/dependencies.bicep rename to modules/event-hub/namespace/tests/e2e/encr/dependencies.bicep diff --git a/modules/event-hub/namespace/.test/encr/main.test.bicep b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/event-hub/namespace/.test/encr/main.test.bicep rename to modules/event-hub/namespace/tests/e2e/encr/main.test.bicep index b81e59b56c..a7a3e24d64 100644 --- a/modules/event-hub/namespace/.test/encr/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-hub/namespace/.test/min/main.test.bicep b/modules/event-hub/namespace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/event-hub/namespace/.test/min/main.test.bicep rename to modules/event-hub/namespace/tests/e2e/min/main.test.bicep index 5b731169d3..424ca90ffe 100644 --- a/modules/event-hub/namespace/.test/min/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/event-hub/namespace/.test/pe/dependencies.bicep b/modules/event-hub/namespace/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/event-hub/namespace/.test/pe/dependencies.bicep rename to modules/event-hub/namespace/tests/e2e/pe/dependencies.bicep diff --git a/modules/event-hub/namespace/.test/pe/main.test.bicep b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/event-hub/namespace/.test/pe/main.test.bicep rename to modules/event-hub/namespace/tests/e2e/pe/main.test.bicep index 69b842c06e..e55e3faf2f 100644 --- a/modules/event-hub/namespace/.test/pe/main.test.bicep +++ b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/health-bot/health-bot/.test/common/dependencies.bicep b/modules/health-bot/health-bot/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/health-bot/health-bot/.test/common/dependencies.bicep rename to modules/health-bot/health-bot/tests/e2e/common/dependencies.bicep diff --git a/modules/health-bot/health-bot/.test/common/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/health-bot/health-bot/.test/common/main.test.bicep rename to modules/health-bot/health-bot/tests/e2e/common/main.test.bicep index 36623909f7..04f770a16c 100644 --- a/modules/health-bot/health-bot/.test/common/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/health-bot/health-bot/.test/min/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/health-bot/health-bot/.test/min/main.test.bicep rename to modules/health-bot/health-bot/tests/e2e/min/main.test.bicep index 29b0984187..827853ed5b 100644 --- a/modules/health-bot/health-bot/.test/min/main.test.bicep +++ b/modules/health-bot/health-bot/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/healthcare-apis/workspace/.test/common/dependencies.bicep b/modules/healthcare-apis/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/healthcare-apis/workspace/.test/common/dependencies.bicep rename to modules/healthcare-apis/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/healthcare-apis/workspace/.test/common/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/healthcare-apis/workspace/.test/common/main.test.bicep rename to modules/healthcare-apis/workspace/tests/e2e/common/main.test.bicep index fcb3fac8fe..b3ee36aeea 100644 --- a/modules/healthcare-apis/workspace/.test/common/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/healthcare-apis/workspace/.test/min/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/healthcare-apis/workspace/.test/min/main.test.bicep rename to modules/healthcare-apis/workspace/tests/e2e/min/main.test.bicep index cc3b068314..4eb6a8dc85 100644 --- a/modules/healthcare-apis/workspace/.test/min/main.test.bicep +++ b/modules/healthcare-apis/workspace/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/action-group/.test/common/dependencies.bicep b/modules/insights/action-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/action-group/.test/common/dependencies.bicep rename to modules/insights/action-group/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/action-group/.test/common/main.test.bicep b/modules/insights/action-group/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/insights/action-group/.test/common/main.test.bicep rename to modules/insights/action-group/tests/e2e/common/main.test.bicep index 3e80b2db1b..094aef5dfd 100644 --- a/modules/insights/action-group/.test/common/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/action-group/.test/min/main.test.bicep b/modules/insights/action-group/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/insights/action-group/.test/min/main.test.bicep rename to modules/insights/action-group/tests/e2e/min/main.test.bicep index 51ccd12b5c..5ef4c9a8ef 100644 --- a/modules/insights/action-group/.test/min/main.test.bicep +++ b/modules/insights/action-group/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/activity-log-alert/.test/common/dependencies.bicep b/modules/insights/activity-log-alert/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/activity-log-alert/.test/common/dependencies.bicep rename to modules/insights/activity-log-alert/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/activity-log-alert/.test/common/main.test.bicep b/modules/insights/activity-log-alert/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/insights/activity-log-alert/.test/common/main.test.bicep rename to modules/insights/activity-log-alert/tests/e2e/common/main.test.bicep index 6810340316..75d80ea8b0 100644 --- a/modules/insights/activity-log-alert/.test/common/main.test.bicep +++ b/modules/insights/activity-log-alert/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/component/.test/common/dependencies.bicep b/modules/insights/component/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/component/.test/common/dependencies.bicep rename to modules/insights/component/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/component/.test/common/main.test.bicep b/modules/insights/component/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/insights/component/.test/common/main.test.bicep rename to modules/insights/component/tests/e2e/common/main.test.bicep index 979bd07090..c268fb2bff 100644 --- a/modules/insights/component/.test/common/main.test.bicep +++ b/modules/insights/component/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/component/.test/min/dependencies.bicep b/modules/insights/component/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/insights/component/.test/min/dependencies.bicep rename to modules/insights/component/tests/e2e/min/dependencies.bicep diff --git a/modules/insights/component/.test/min/main.test.bicep b/modules/insights/component/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/insights/component/.test/min/main.test.bicep rename to modules/insights/component/tests/e2e/min/main.test.bicep index 15a5d43c53..0e4fe18e1f 100644 --- a/modules/insights/component/.test/min/main.test.bicep +++ b/modules/insights/component/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-endpoint/.test/common/dependencies.bicep b/modules/insights/data-collection-endpoint/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-endpoint/.test/common/dependencies.bicep rename to modules/insights/data-collection-endpoint/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/data-collection-endpoint/.test/common/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/insights/data-collection-endpoint/.test/common/main.test.bicep rename to modules/insights/data-collection-endpoint/tests/e2e/common/main.test.bicep index d4518f92ad..048ae857f8 100644 --- a/modules/insights/data-collection-endpoint/.test/common/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-endpoint/.test/min/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/insights/data-collection-endpoint/.test/min/main.test.bicep rename to modules/insights/data-collection-endpoint/tests/e2e/min/main.test.bicep index 39a8e35586..296447c846 100644 --- a/modules/insights/data-collection-endpoint/.test/min/main.test.bicep +++ b/modules/insights/data-collection-endpoint/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/customadv/dependencies.bicep b/modules/insights/data-collection-rule/tests/e2e/customadv/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rule/.test/customadv/dependencies.bicep rename to modules/insights/data-collection-rule/tests/e2e/customadv/dependencies.bicep diff --git a/modules/insights/data-collection-rule/.test/customadv/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep similarity index 98% rename from modules/insights/data-collection-rule/.test/customadv/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep index 4006013380..2e2f2a7d14 100644 --- a/modules/insights/data-collection-rule/.test/customadv/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customadv/main.test.bicep @@ -45,7 +45,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/custombasic/dependencies.bicep b/modules/insights/data-collection-rule/tests/e2e/custombasic/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rule/.test/custombasic/dependencies.bicep rename to modules/insights/data-collection-rule/tests/e2e/custombasic/dependencies.bicep diff --git a/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep similarity index 98% rename from modules/insights/data-collection-rule/.test/custombasic/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep index a9cccb78d0..b0ae869187 100644 --- a/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/custombasic/main.test.bicep @@ -45,7 +45,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/customiis/dependencies.bicep b/modules/insights/data-collection-rule/tests/e2e/customiis/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rule/.test/customiis/dependencies.bicep rename to modules/insights/data-collection-rule/tests/e2e/customiis/dependencies.bicep diff --git a/modules/insights/data-collection-rule/.test/customiis/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep similarity index 98% rename from modules/insights/data-collection-rule/.test/customiis/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep index 5b6ddb4d3d..d157de08b6 100644 --- a/modules/insights/data-collection-rule/.test/customiis/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/customiis/main.test.bicep @@ -45,7 +45,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/linux/dependencies.bicep b/modules/insights/data-collection-rule/tests/e2e/linux/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rule/.test/linux/dependencies.bicep rename to modules/insights/data-collection-rule/tests/e2e/linux/dependencies.bicep diff --git a/modules/insights/data-collection-rule/.test/linux/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep similarity index 99% rename from modules/insights/data-collection-rule/.test/linux/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep index 30b9856a25..5b5664ffe9 100644 --- a/modules/insights/data-collection-rule/.test/linux/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/linux/main.test.bicep @@ -44,7 +44,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/min/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/min/main.test.bicep similarity index 98% rename from modules/insights/data-collection-rule/.test/min/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/min/main.test.bicep index 01cff01377..9ba5932555 100644 --- a/modules/insights/data-collection-rule/.test/min/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/data-collection-rule/.test/windows/dependencies.bicep b/modules/insights/data-collection-rule/tests/e2e/windows/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rule/.test/windows/dependencies.bicep rename to modules/insights/data-collection-rule/tests/e2e/windows/dependencies.bicep diff --git a/modules/insights/data-collection-rule/.test/windows/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep similarity index 99% rename from modules/insights/data-collection-rule/.test/windows/main.test.bicep rename to modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep index ba4727637a..9d2ee0f182 100644 --- a/modules/insights/data-collection-rule/.test/windows/main.test.bicep +++ b/modules/insights/data-collection-rule/tests/e2e/windows/main.test.bicep @@ -44,7 +44,7 @@ module resourceGroupResources 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/insights/diagnostic-setting/.test/common/main.test.bicep b/modules/insights/diagnostic-setting/tests/e2e/common/main.test.bicep similarity index 94% rename from modules/insights/diagnostic-setting/.test/common/main.test.bicep rename to modules/insights/diagnostic-setting/tests/e2e/common/main.test.bicep index dad01e9f0e..3452965065 100644 --- a/modules/insights/diagnostic-setting/.test/common/main.test.bicep +++ b/modules/insights/diagnostic-setting/tests/e2e/common/main.test.bicep @@ -36,7 +36,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -52,7 +52,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/insights/metric-alert/.test/common/dependencies.bicep b/modules/insights/metric-alert/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/metric-alert/.test/common/dependencies.bicep rename to modules/insights/metric-alert/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/metric-alert/.test/common/main.test.bicep b/modules/insights/metric-alert/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/insights/metric-alert/.test/common/main.test.bicep rename to modules/insights/metric-alert/tests/e2e/common/main.test.bicep index c8711dd79a..c692d0a28b 100644 --- a/modules/insights/metric-alert/.test/common/main.test.bicep +++ b/modules/insights/metric-alert/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/private-link-scope/.test/common/dependencies.bicep b/modules/insights/private-link-scope/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/private-link-scope/.test/common/dependencies.bicep rename to modules/insights/private-link-scope/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/private-link-scope/.test/common/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/insights/private-link-scope/.test/common/main.test.bicep rename to modules/insights/private-link-scope/tests/e2e/common/main.test.bicep index 1622c7b7a0..fe7ba8f897 100644 --- a/modules/insights/private-link-scope/.test/common/main.test.bicep +++ b/modules/insights/private-link-scope/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/private-link-scope/.test/min/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/insights/private-link-scope/.test/min/main.test.bicep rename to modules/insights/private-link-scope/tests/e2e/min/main.test.bicep index a9a01570d3..2ed54c7791 100644 --- a/modules/insights/private-link-scope/.test/min/main.test.bicep +++ b/modules/insights/private-link-scope/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/scheduled-query-rule/.test/common/dependencies.bicep b/modules/insights/scheduled-query-rule/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/scheduled-query-rule/.test/common/dependencies.bicep rename to modules/insights/scheduled-query-rule/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/scheduled-query-rule/.test/common/main.test.bicep b/modules/insights/scheduled-query-rule/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/insights/scheduled-query-rule/.test/common/main.test.bicep rename to modules/insights/scheduled-query-rule/tests/e2e/common/main.test.bicep index ece99e7a5d..ce46d28cf7 100644 --- a/modules/insights/scheduled-query-rule/.test/common/main.test.bicep +++ b/modules/insights/scheduled-query-rule/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/webtest/.test/common/dependencies.bicep b/modules/insights/webtest/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/insights/webtest/.test/common/dependencies.bicep rename to modules/insights/webtest/tests/e2e/common/dependencies.bicep diff --git a/modules/insights/webtest/.test/common/main.test.bicep b/modules/insights/webtest/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/insights/webtest/.test/common/main.test.bicep rename to modules/insights/webtest/tests/e2e/common/main.test.bicep index ec14cb0b5c..a40b41c1e6 100644 --- a/modules/insights/webtest/.test/common/main.test.bicep +++ b/modules/insights/webtest/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/insights/webtest/.test/min/dependencies.bicep b/modules/insights/webtest/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/insights/webtest/.test/min/dependencies.bicep rename to modules/insights/webtest/tests/e2e/min/dependencies.bicep diff --git a/modules/insights/webtest/.test/min/main.test.bicep b/modules/insights/webtest/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/insights/webtest/.test/min/main.test.bicep rename to modules/insights/webtest/tests/e2e/min/main.test.bicep index 7a0273b7e4..99e6969ed2 100644 --- a/modules/insights/webtest/.test/min/main.test.bicep +++ b/modules/insights/webtest/tests/e2e/min/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/key-vault/vault/.test/accesspolicies/dependencies.bicep b/modules/key-vault/vault/tests/e2e/accesspolicies/dependencies.bicep similarity index 100% rename from modules/key-vault/vault/.test/accesspolicies/dependencies.bicep rename to modules/key-vault/vault/tests/e2e/accesspolicies/dependencies.bicep diff --git a/modules/key-vault/vault/.test/accesspolicies/main.test.bicep b/modules/key-vault/vault/tests/e2e/accesspolicies/main.test.bicep similarity index 96% rename from modules/key-vault/vault/.test/accesspolicies/main.test.bicep rename to modules/key-vault/vault/tests/e2e/accesspolicies/main.test.bicep index 605b5ab57e..12e509a459 100644 --- a/modules/key-vault/vault/.test/accesspolicies/main.test.bicep +++ b/modules/key-vault/vault/tests/e2e/accesspolicies/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/key-vault/vault/.test/common/dependencies.bicep b/modules/key-vault/vault/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/key-vault/vault/.test/common/dependencies.bicep rename to modules/key-vault/vault/tests/e2e/common/dependencies.bicep diff --git a/modules/key-vault/vault/.test/common/main.test.bicep b/modules/key-vault/vault/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/key-vault/vault/.test/common/main.test.bicep rename to modules/key-vault/vault/tests/e2e/common/main.test.bicep index 56b1e03459..9ac36ee683 100644 --- a/modules/key-vault/vault/.test/common/main.test.bicep +++ b/modules/key-vault/vault/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/key-vault/vault/.test/min/main.test.bicep b/modules/key-vault/vault/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/key-vault/vault/.test/min/main.test.bicep rename to modules/key-vault/vault/tests/e2e/min/main.test.bicep index 0e27563ae4..351273f306 100644 --- a/modules/key-vault/vault/.test/min/main.test.bicep +++ b/modules/key-vault/vault/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/key-vault/vault/.test/pe/dependencies.bicep b/modules/key-vault/vault/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/key-vault/vault/.test/pe/dependencies.bicep rename to modules/key-vault/vault/tests/e2e/pe/dependencies.bicep diff --git a/modules/key-vault/vault/.test/pe/main.test.bicep b/modules/key-vault/vault/tests/e2e/pe/main.test.bicep similarity index 96% rename from modules/key-vault/vault/.test/pe/main.test.bicep rename to modules/key-vault/vault/tests/e2e/pe/main.test.bicep index 31787cf5d0..b1d0f9c89f 100644 --- a/modules/key-vault/vault/.test/pe/main.test.bicep +++ b/modules/key-vault/vault/tests/e2e/pe/main.test.bicep @@ -41,7 +41,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -57,7 +57,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/kubernetes-configuration/extension/.test/common/dependencies.bicep b/modules/kubernetes-configuration/extension/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/extension/.test/common/dependencies.bicep rename to modules/kubernetes-configuration/extension/tests/e2e/common/dependencies.bicep diff --git a/modules/kubernetes-configuration/extension/.test/common/main.test.bicep b/modules/kubernetes-configuration/extension/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/kubernetes-configuration/extension/.test/common/main.test.bicep rename to modules/kubernetes-configuration/extension/tests/e2e/common/main.test.bicep index 1d954e3c6a..18a74931cd 100644 --- a/modules/kubernetes-configuration/extension/.test/common/main.test.bicep +++ b/modules/kubernetes-configuration/extension/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/kubernetes-configuration/extension/.test/min/dependencies.bicep b/modules/kubernetes-configuration/extension/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/extension/.test/min/dependencies.bicep rename to modules/kubernetes-configuration/extension/tests/e2e/min/dependencies.bicep diff --git a/modules/kubernetes-configuration/extension/.test/min/main.test.bicep b/modules/kubernetes-configuration/extension/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/kubernetes-configuration/extension/.test/min/main.test.bicep rename to modules/kubernetes-configuration/extension/tests/e2e/min/main.test.bicep index 96b7926186..e423f75456 100644 --- a/modules/kubernetes-configuration/extension/.test/min/main.test.bicep +++ b/modules/kubernetes-configuration/extension/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/kubernetes-configuration/flux-configuration/.test/common/dependencies.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configuration/.test/common/dependencies.bicep rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/common/dependencies.bicep diff --git a/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/common/main.test.bicep index 4f1883372b..356c8be9f9 100644 --- a/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep +++ b/modules/kubernetes-configuration/flux-configuration/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/kubernetes-configuration/flux-configuration/.test/min/dependencies.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configuration/.test/min/dependencies.bicep rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/min/dependencies.bicep diff --git a/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/min/main.test.bicep index f7f5c7191b..2e22479c4a 100644 --- a/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep +++ b/modules/kubernetes-configuration/flux-configuration/tests/e2e/min/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/logic/workflow/.test/common/dependencies.bicep b/modules/logic/workflow/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/logic/workflow/.test/common/dependencies.bicep rename to modules/logic/workflow/tests/e2e/common/dependencies.bicep diff --git a/modules/logic/workflow/.test/common/main.test.bicep b/modules/logic/workflow/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/logic/workflow/.test/common/main.test.bicep rename to modules/logic/workflow/tests/e2e/common/main.test.bicep index f41202d4d8..62b7f8b0fb 100644 --- a/modules/logic/workflow/.test/common/main.test.bicep +++ b/modules/logic/workflow/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/machine-learning-services/workspace/.test/common/dependencies.bicep b/modules/machine-learning-services/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspace/.test/common/dependencies.bicep rename to modules/machine-learning-services/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/machine-learning-services/workspace/.test/common/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/machine-learning-services/workspace/.test/common/main.test.bicep rename to modules/machine-learning-services/workspace/tests/e2e/common/main.test.bicep index fa544e14f4..73b10cd0a9 100644 --- a/modules/machine-learning-services/workspace/.test/common/main.test.bicep +++ b/modules/machine-learning-services/workspace/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -64,7 +64,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/machine-learning-services/workspace/.test/encr/dependencies.bicep b/modules/machine-learning-services/workspace/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspace/.test/encr/dependencies.bicep rename to modules/machine-learning-services/workspace/tests/e2e/encr/dependencies.bicep diff --git a/modules/machine-learning-services/workspace/.test/encr/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/machine-learning-services/workspace/.test/encr/main.test.bicep rename to modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep index 784f07e453..42a9e51c69 100644 --- a/modules/machine-learning-services/workspace/.test/encr/main.test.bicep +++ b/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep @@ -51,7 +51,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/machine-learning-services/workspace/.test/min/dependencies.bicep b/modules/machine-learning-services/workspace/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspace/.test/min/dependencies.bicep rename to modules/machine-learning-services/workspace/tests/e2e/min/dependencies.bicep diff --git a/modules/machine-learning-services/workspace/.test/min/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/machine-learning-services/workspace/.test/min/main.test.bicep rename to modules/machine-learning-services/workspace/tests/e2e/min/main.test.bicep index 94dc5beaab..4ad340de5c 100644 --- a/modules/machine-learning-services/workspace/.test/min/main.test.bicep +++ b/modules/machine-learning-services/workspace/tests/e2e/min/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/maintenance/maintenance-configuration/.test/common/dependencies.bicep b/modules/maintenance/maintenance-configuration/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/maintenance/maintenance-configuration/.test/common/dependencies.bicep rename to modules/maintenance/maintenance-configuration/tests/e2e/common/dependencies.bicep diff --git a/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep b/modules/maintenance/maintenance-configuration/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/maintenance/maintenance-configuration/.test/common/main.test.bicep rename to modules/maintenance/maintenance-configuration/tests/e2e/common/main.test.bicep index 41ea585f30..fb851eaaad 100644 --- a/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep +++ b/modules/maintenance/maintenance-configuration/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep b/modules/maintenance/maintenance-configuration/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/maintenance/maintenance-configuration/.test/min/main.test.bicep rename to modules/maintenance/maintenance-configuration/tests/e2e/min/main.test.bicep index f23eada34d..fd4155b517 100644 --- a/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep +++ b/modules/maintenance/maintenance-configuration/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/managed-identity/user-assigned-identity/.test/common/dependencies.bicep b/modules/managed-identity/user-assigned-identity/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identity/.test/common/dependencies.bicep rename to modules/managed-identity/user-assigned-identity/tests/e2e/common/dependencies.bicep diff --git a/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep b/modules/managed-identity/user-assigned-identity/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep rename to modules/managed-identity/user-assigned-identity/tests/e2e/common/main.test.bicep index a382b213a5..52feac412b 100644 --- a/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep +++ b/modules/managed-identity/user-assigned-identity/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep b/modules/managed-identity/user-assigned-identity/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep rename to modules/managed-identity/user-assigned-identity/tests/e2e/min/main.test.bicep index d7da3a5c01..d0cb243b1f 100644 --- a/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep +++ b/modules/managed-identity/user-assigned-identity/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/managed-services/registration-definition/.test/common/main.test.bicep b/modules/managed-services/registration-definition/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/managed-services/registration-definition/.test/common/main.test.bicep rename to modules/managed-services/registration-definition/tests/e2e/common/main.test.bicep index 854fe9a70d..b67dda3414 100644 --- a/modules/managed-services/registration-definition/.test/common/main.test.bicep +++ b/modules/managed-services/registration-definition/tests/e2e/common/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/managed-services/registration-definition/.test/rg/main.test.bicep b/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep similarity index 97% rename from modules/managed-services/registration-definition/.test/rg/main.test.bicep rename to modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep index e6d5fe9145..8de69a8b4b 100644 --- a/modules/managed-services/registration-definition/.test/rg/main.test.bicep +++ b/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/management/management-group/.test/common/main.test.bicep b/modules/management/management-group/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/management/management-group/.test/common/main.test.bicep rename to modules/management/management-group/tests/e2e/common/main.test.bicep index 65122a5c04..f3102c6bd1 100644 --- a/modules/management/management-group/.test/common/main.test.bicep +++ b/modules/management/management-group/tests/e2e/common/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/management/management-group/.test/min/main.test.bicep b/modules/management/management-group/tests/e2e/min/main.test.bicep similarity index 94% rename from modules/management/management-group/.test/min/main.test.bicep rename to modules/management/management-group/tests/e2e/min/main.test.bicep index 471cd8cc08..bacde932d6 100644 --- a/modules/management/management-group/.test/min/main.test.bicep +++ b/modules/management/management-group/tests/e2e/min/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/net-app/net-app-account/.test/min/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/net-app/net-app-account/.test/min/main.test.bicep rename to modules/net-app/net-app-account/tests/e2e/min/main.test.bicep index 8c3ceb52c3..5a4111f482 100644 --- a/modules/net-app/net-app-account/.test/min/main.test.bicep +++ b/modules/net-app/net-app-account/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/net-app/net-app-account/.test/nfs3/dependencies.bicep b/modules/net-app/net-app-account/tests/e2e/nfs3/dependencies.bicep similarity index 100% rename from modules/net-app/net-app-account/.test/nfs3/dependencies.bicep rename to modules/net-app/net-app-account/tests/e2e/nfs3/dependencies.bicep diff --git a/modules/net-app/net-app-account/.test/nfs3/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/nfs3/main.test.bicep similarity index 98% rename from modules/net-app/net-app-account/.test/nfs3/main.test.bicep rename to modules/net-app/net-app-account/tests/e2e/nfs3/main.test.bicep index c1105a2b17..e1a7ed7917 100644 --- a/modules/net-app/net-app-account/.test/nfs3/main.test.bicep +++ b/modules/net-app/net-app-account/tests/e2e/nfs3/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/net-app/net-app-account/.test/nfs41/dependencies.bicep b/modules/net-app/net-app-account/tests/e2e/nfs41/dependencies.bicep similarity index 100% rename from modules/net-app/net-app-account/.test/nfs41/dependencies.bicep rename to modules/net-app/net-app-account/tests/e2e/nfs41/dependencies.bicep diff --git a/modules/net-app/net-app-account/.test/nfs41/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/nfs41/main.test.bicep similarity index 98% rename from modules/net-app/net-app-account/.test/nfs41/main.test.bicep rename to modules/net-app/net-app-account/tests/e2e/nfs41/main.test.bicep index c58995a201..f07c76bf7b 100644 --- a/modules/net-app/net-app-account/.test/nfs41/main.test.bicep +++ b/modules/net-app/net-app-account/tests/e2e/nfs41/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep rename to modules/network/application-gateway-web-application-firewall-policy/tests/e2e/common/main.test.bicep index 0c7f1fe7f3..840235eeab 100644 --- a/modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep +++ b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/common/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/application-gateway/.test/common/dependencies.bicep b/modules/network/application-gateway/tests/e2e/common/dependencies.bicep similarity index 97% rename from modules/network/application-gateway/.test/common/dependencies.bicep rename to modules/network/application-gateway/tests/e2e/common/dependencies.bicep index e2389b486b..2de1a81653 100644 --- a/modules/network/application-gateway/.test/common/dependencies.bicep +++ b/modules/network/application-gateway/tests/e2e/common/dependencies.bicep @@ -36,7 +36,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { } { name: 'privateLinkSubnet' - properties:{ + properties: { addressPrefix: cidrSubnet(addressPrefix, 24, 1) privateLinkServiceNetworkPolicies: 'Disabled' } @@ -120,7 +120,7 @@ resource certDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-KeyVaultName "${keyVault.name}" -CertName "applicationGatewaySslCertificate"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-CertificateInKeyVault.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-CertificateInKeyVault.ps1') } } diff --git a/modules/network/application-gateway/.test/common/main.test.bicep b/modules/network/application-gateway/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/application-gateway/.test/common/main.test.bicep rename to modules/network/application-gateway/tests/e2e/common/main.test.bicep index 8f81d6033f..0887af87a0 100644 --- a/modules/network/application-gateway/.test/common/main.test.bicep +++ b/modules/network/application-gateway/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -66,7 +66,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende var appGWName = '${namePrefix}${serviceShort}001' var appGWExpectedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/applicationGateways/${appGWName}' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/application-security-group/.test/common/dependencies.bicep b/modules/network/application-security-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/application-security-group/.test/common/dependencies.bicep rename to modules/network/application-security-group/tests/e2e/common/dependencies.bicep diff --git a/modules/network/application-security-group/.test/common/main.test.bicep b/modules/network/application-security-group/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/application-security-group/.test/common/main.test.bicep rename to modules/network/application-security-group/tests/e2e/common/main.test.bicep index 70aeed0b0d..f359964862 100644 --- a/modules/network/application-security-group/.test/common/main.test.bicep +++ b/modules/network/application-security-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/addpip/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/addpip/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/addpip/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/addpip/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/addpip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep similarity index 98% rename from modules/network/azure-firewall/.test/addpip/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep index f2a115cb3b..373c6489e0 100644 --- a/modules/network/azure-firewall/.test/addpip/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/common/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/common/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/common/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/common/main.test.bicep b/modules/network/azure-firewall/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/azure-firewall/.test/common/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/common/main.test.bicep index 219cdea813..f3df185bc3 100644 --- a/modules/network/azure-firewall/.test/common/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/custompip/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/custompip/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/custompip/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/custompip/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/custompip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep similarity index 95% rename from modules/network/azure-firewall/.test/custompip/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep index 29cd591ce0..0632d591fb 100644 --- a/modules/network/azure-firewall/.test/custompip/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/hubcommon/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/hubcommon/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/hubcommon/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/hubcommon/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/hubcommon/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep similarity index 97% rename from modules/network/azure-firewall/.test/hubcommon/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep index 24f9abf6d4..aeba7abd0e 100644 --- a/modules/network/azure-firewall/.test/hubcommon/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/hubmin/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/hubmin/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/hubmin/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/hubmin/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/hubmin/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep similarity index 97% rename from modules/network/azure-firewall/.test/hubmin/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep index 85056db679..362ff67a62 100644 --- a/modules/network/azure-firewall/.test/hubmin/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/azure-firewall/.test/min/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/azure-firewall/.test/min/dependencies.bicep rename to modules/network/azure-firewall/tests/e2e/min/dependencies.bicep diff --git a/modules/network/azure-firewall/.test/min/main.test.bicep b/modules/network/azure-firewall/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/azure-firewall/.test/min/main.test.bicep rename to modules/network/azure-firewall/tests/e2e/min/main.test.bicep index c0d9f84edc..9d5c870954 100644 --- a/modules/network/azure-firewall/.test/min/main.test.bicep +++ b/modules/network/azure-firewall/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/bastion-host/.test/common/dependencies.bicep b/modules/network/bastion-host/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/bastion-host/.test/common/dependencies.bicep rename to modules/network/bastion-host/tests/e2e/common/dependencies.bicep diff --git a/modules/network/bastion-host/.test/common/main.test.bicep b/modules/network/bastion-host/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/network/bastion-host/.test/common/main.test.bicep rename to modules/network/bastion-host/tests/e2e/common/main.test.bicep index 6f6a202a2b..7fe1474be5 100644 --- a/modules/network/bastion-host/.test/common/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/bastion-host/.test/custompip/dependencies.bicep b/modules/network/bastion-host/tests/e2e/custompip/dependencies.bicep similarity index 100% rename from modules/network/bastion-host/.test/custompip/dependencies.bicep rename to modules/network/bastion-host/tests/e2e/custompip/dependencies.bicep diff --git a/modules/network/bastion-host/.test/custompip/main.test.bicep b/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep similarity index 95% rename from modules/network/bastion-host/.test/custompip/main.test.bicep rename to modules/network/bastion-host/tests/e2e/custompip/main.test.bicep index 3ac4bb92df..500158ac2b 100644 --- a/modules/network/bastion-host/.test/custompip/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/custompip/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/bastion-host/.test/min/dependencies.bicep b/modules/network/bastion-host/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/bastion-host/.test/min/dependencies.bicep rename to modules/network/bastion-host/tests/e2e/min/dependencies.bicep diff --git a/modules/network/bastion-host/.test/min/main.test.bicep b/modules/network/bastion-host/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/bastion-host/.test/min/main.test.bicep rename to modules/network/bastion-host/tests/e2e/min/main.test.bicep index 0c178876f0..e150c3dd41 100644 --- a/modules/network/bastion-host/.test/min/main.test.bicep +++ b/modules/network/bastion-host/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/connection/.test/vnet2vnet/dependencies.bicep b/modules/network/connection/tests/e2e/vnet2vnet/dependencies.bicep similarity index 100% rename from modules/network/connection/.test/vnet2vnet/dependencies.bicep rename to modules/network/connection/tests/e2e/vnet2vnet/dependencies.bicep diff --git a/modules/network/connection/.test/vnet2vnet/main.test.bicep b/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep similarity index 98% rename from modules/network/connection/.test/vnet2vnet/main.test.bicep rename to modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep index 4a3da829cf..7512784f5f 100644 --- a/modules/network/connection/.test/vnet2vnet/main.test.bicep +++ b/modules/network/connection/tests/e2e/vnet2vnet/main.test.bicep @@ -52,7 +52,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/ddos-protection-plan/.test/common/dependencies.bicep b/modules/network/ddos-protection-plan/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/ddos-protection-plan/.test/common/dependencies.bicep rename to modules/network/ddos-protection-plan/tests/e2e/common/dependencies.bicep diff --git a/modules/network/ddos-protection-plan/.test/common/main.test.bicep b/modules/network/ddos-protection-plan/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/ddos-protection-plan/.test/common/main.test.bicep rename to modules/network/ddos-protection-plan/tests/e2e/common/main.test.bicep index 8324e7f8dc..2c1359047b 100644 --- a/modules/network/ddos-protection-plan/.test/common/main.test.bicep +++ b/modules/network/ddos-protection-plan/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/ddos-protection-plan/.test/min/main.test.bicep b/modules/network/ddos-protection-plan/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/ddos-protection-plan/.test/min/main.test.bicep rename to modules/network/ddos-protection-plan/tests/e2e/min/main.test.bicep index ca85cb56f0..1d0010eb9c 100644 --- a/modules/network/ddos-protection-plan/.test/min/main.test.bicep +++ b/modules/network/ddos-protection-plan/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/dns-forwarding-ruleset/.test/common/dependencies.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/dns-forwarding-ruleset/.test/common/dependencies.bicep rename to modules/network/dns-forwarding-ruleset/tests/e2e/common/dependencies.bicep diff --git a/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep rename to modules/network/dns-forwarding-ruleset/tests/e2e/common/main.test.bicep index b8cc208e18..913a1ce9c5 100644 --- a/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep +++ b/modules/network/dns-forwarding-ruleset/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/dns-forwarding-ruleset/.test/min/dependencies.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/dns-forwarding-ruleset/.test/min/dependencies.bicep rename to modules/network/dns-forwarding-ruleset/tests/e2e/min/dependencies.bicep diff --git a/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep rename to modules/network/dns-forwarding-ruleset/tests/e2e/min/main.test.bicep index ed1fc457c5..c43583ba3e 100644 --- a/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep +++ b/modules/network/dns-forwarding-ruleset/tests/e2e/min/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/dns-resolver/.test/common/dependencies.bicep b/modules/network/dns-resolver/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/dns-resolver/.test/common/dependencies.bicep rename to modules/network/dns-resolver/tests/e2e/common/dependencies.bicep diff --git a/modules/network/dns-resolver/.test/common/main.test.bicep b/modules/network/dns-resolver/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/dns-resolver/.test/common/main.test.bicep rename to modules/network/dns-resolver/tests/e2e/common/main.test.bicep index b7c060dd2f..d9faf2551d 100644 --- a/modules/network/dns-resolver/.test/common/main.test.bicep +++ b/modules/network/dns-resolver/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/dns-zone/.test/common/dependencies.bicep b/modules/network/dns-zone/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/dns-zone/.test/common/dependencies.bicep rename to modules/network/dns-zone/tests/e2e/common/dependencies.bicep diff --git a/modules/network/dns-zone/.test/common/main.test.bicep b/modules/network/dns-zone/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/network/dns-zone/.test/common/main.test.bicep rename to modules/network/dns-zone/tests/e2e/common/main.test.bicep index d7a20bd945..3e055fc5de 100644 --- a/modules/network/dns-zone/.test/common/main.test.bicep +++ b/modules/network/dns-zone/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/dns-zone/.test/min/main.test.bicep b/modules/network/dns-zone/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/dns-zone/.test/min/main.test.bicep rename to modules/network/dns-zone/tests/e2e/min/main.test.bicep index 3e13b00238..169bf08e48 100644 --- a/modules/network/dns-zone/.test/min/main.test.bicep +++ b/modules/network/dns-zone/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/express-route-circuit/.test/common/dependencies.bicep b/modules/network/express-route-circuit/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/express-route-circuit/.test/common/dependencies.bicep rename to modules/network/express-route-circuit/tests/e2e/common/dependencies.bicep diff --git a/modules/network/express-route-circuit/.test/common/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/network/express-route-circuit/.test/common/main.test.bicep rename to modules/network/express-route-circuit/tests/e2e/common/main.test.bicep index a1203ca39b..c53f6dd157 100644 --- a/modules/network/express-route-circuit/.test/common/main.test.bicep +++ b/modules/network/express-route-circuit/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/express-route-circuit/.test/min/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/express-route-circuit/.test/min/main.test.bicep rename to modules/network/express-route-circuit/tests/e2e/min/main.test.bicep index 6bc6b2b580..c6bc88b5d7 100644 --- a/modules/network/express-route-circuit/.test/min/main.test.bicep +++ b/modules/network/express-route-circuit/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/express-route-gateway/.test/common/dependencies.bicep b/modules/network/express-route-gateway/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/express-route-gateway/.test/common/dependencies.bicep rename to modules/network/express-route-gateway/tests/e2e/common/dependencies.bicep diff --git a/modules/network/express-route-gateway/.test/common/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/express-route-gateway/.test/common/main.test.bicep rename to modules/network/express-route-gateway/tests/e2e/common/main.test.bicep index cb8e6e36f5..e029342eaf 100644 --- a/modules/network/express-route-gateway/.test/common/main.test.bicep +++ b/modules/network/express-route-gateway/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/express-route-gateway/.test/min/dependencies.bicep b/modules/network/express-route-gateway/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/express-route-gateway/.test/min/dependencies.bicep rename to modules/network/express-route-gateway/tests/e2e/min/dependencies.bicep diff --git a/modules/network/express-route-gateway/.test/min/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/express-route-gateway/.test/min/main.test.bicep rename to modules/network/express-route-gateway/tests/e2e/min/main.test.bicep index 49b5c52596..e60a1ef9ca 100644 --- a/modules/network/express-route-gateway/.test/min/main.test.bicep +++ b/modules/network/express-route-gateway/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/firewall-policy/.test/common/main.test.bicep b/modules/network/firewall-policy/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/firewall-policy/.test/common/main.test.bicep rename to modules/network/firewall-policy/tests/e2e/common/main.test.bicep index f3447f4ce4..8d9b770926 100644 --- a/modules/network/firewall-policy/.test/common/main.test.bicep +++ b/modules/network/firewall-policy/tests/e2e/common/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/firewall-policy/.test/min/main.test.bicep b/modules/network/firewall-policy/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/firewall-policy/.test/min/main.test.bicep rename to modules/network/firewall-policy/tests/e2e/min/main.test.bicep index e5ce72720a..94f9f074c1 100644 --- a/modules/network/firewall-policy/.test/min/main.test.bicep +++ b/modules/network/firewall-policy/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/front-door-web-application-firewall-policy/.test/common/dependencies.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/front-door-web-application-firewall-policy/.test/common/dependencies.bicep rename to modules/network/front-door-web-application-firewall-policy/tests/e2e/common/dependencies.bicep diff --git a/modules/network/front-door-web-application-firewall-policy/.test/common/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/front-door-web-application-firewall-policy/.test/common/main.test.bicep rename to modules/network/front-door-web-application-firewall-policy/tests/e2e/common/main.test.bicep index 6cbf4d59eb..4018c29860 100644 --- a/modules/network/front-door-web-application-firewall-policy/.test/common/main.test.bicep +++ b/modules/network/front-door-web-application-firewall-policy/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/front-door-web-application-firewall-policy/.test/min/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/front-door-web-application-firewall-policy/.test/min/main.test.bicep rename to modules/network/front-door-web-application-firewall-policy/tests/e2e/min/main.test.bicep index 833631084c..779069f9bd 100644 --- a/modules/network/front-door-web-application-firewall-policy/.test/min/main.test.bicep +++ b/modules/network/front-door-web-application-firewall-policy/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/front-door/.test/common/dependencies.bicep b/modules/network/front-door/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/front-door/.test/common/dependencies.bicep rename to modules/network/front-door/tests/e2e/common/dependencies.bicep diff --git a/modules/network/front-door/.test/common/main.test.bicep b/modules/network/front-door/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/front-door/.test/common/main.test.bicep rename to modules/network/front-door/tests/e2e/common/main.test.bicep index 279bf41640..0aee4231e3 100644 --- a/modules/network/front-door/.test/common/main.test.bicep +++ b/modules/network/front-door/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/front-door/.test/min/main.test.bicep b/modules/network/front-door/tests/e2e/min/main.test.bicep similarity index 98% rename from modules/network/front-door/.test/min/main.test.bicep rename to modules/network/front-door/tests/e2e/min/main.test.bicep index 347cd6dbd1..ab263c6aaf 100644 --- a/modules/network/front-door/.test/min/main.test.bicep +++ b/modules/network/front-door/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/ip-group/.test/common/dependencies.bicep b/modules/network/ip-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/ip-group/.test/common/dependencies.bicep rename to modules/network/ip-group/tests/e2e/common/dependencies.bicep diff --git a/modules/network/ip-group/.test/common/main.test.bicep b/modules/network/ip-group/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/ip-group/.test/common/main.test.bicep rename to modules/network/ip-group/tests/e2e/common/main.test.bicep index 90aee1fac5..0b461e847f 100644 --- a/modules/network/ip-group/.test/common/main.test.bicep +++ b/modules/network/ip-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/ip-group/.test/min/main.test.bicep b/modules/network/ip-group/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/ip-group/.test/min/main.test.bicep rename to modules/network/ip-group/tests/e2e/min/main.test.bicep index e9bc5c3f60..9139a8b6b1 100644 --- a/modules/network/ip-group/.test/min/main.test.bicep +++ b/modules/network/ip-group/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/load-balancer/.test/common/dependencies.bicep b/modules/network/load-balancer/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/load-balancer/.test/common/dependencies.bicep rename to modules/network/load-balancer/tests/e2e/common/dependencies.bicep diff --git a/modules/network/load-balancer/.test/common/main.test.bicep b/modules/network/load-balancer/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/load-balancer/.test/common/main.test.bicep rename to modules/network/load-balancer/tests/e2e/common/main.test.bicep index fe358e8a25..b9098d6e39 100644 --- a/modules/network/load-balancer/.test/common/main.test.bicep +++ b/modules/network/load-balancer/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/load-balancer/.test/internal/dependencies.bicep b/modules/network/load-balancer/tests/e2e/internal/dependencies.bicep similarity index 100% rename from modules/network/load-balancer/.test/internal/dependencies.bicep rename to modules/network/load-balancer/tests/e2e/internal/dependencies.bicep diff --git a/modules/network/load-balancer/.test/internal/main.test.bicep b/modules/network/load-balancer/tests/e2e/internal/main.test.bicep similarity index 96% rename from modules/network/load-balancer/.test/internal/main.test.bicep rename to modules/network/load-balancer/tests/e2e/internal/main.test.bicep index fd8248a0ed..26784c8eb8 100644 --- a/modules/network/load-balancer/.test/internal/main.test.bicep +++ b/modules/network/load-balancer/tests/e2e/internal/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/load-balancer/.test/min/dependencies.bicep b/modules/network/load-balancer/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/load-balancer/.test/min/dependencies.bicep rename to modules/network/load-balancer/tests/e2e/min/dependencies.bicep diff --git a/modules/network/load-balancer/.test/min/main.test.bicep b/modules/network/load-balancer/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/load-balancer/.test/min/main.test.bicep rename to modules/network/load-balancer/tests/e2e/min/main.test.bicep index d5d20d4d72..412f7617c4 100644 --- a/modules/network/load-balancer/.test/min/main.test.bicep +++ b/modules/network/load-balancer/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/local-network-gateway/.test/common/dependencies.bicep b/modules/network/local-network-gateway/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/local-network-gateway/.test/common/dependencies.bicep rename to modules/network/local-network-gateway/tests/e2e/common/dependencies.bicep diff --git a/modules/network/local-network-gateway/.test/common/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/local-network-gateway/.test/common/main.test.bicep rename to modules/network/local-network-gateway/tests/e2e/common/main.test.bicep index 9b40213f0b..896cfd3547 100644 --- a/modules/network/local-network-gateway/.test/common/main.test.bicep +++ b/modules/network/local-network-gateway/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/local-network-gateway/.test/min/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/local-network-gateway/.test/min/main.test.bicep rename to modules/network/local-network-gateway/tests/e2e/min/main.test.bicep index 738c5439e1..ab43e878e1 100644 --- a/modules/network/local-network-gateway/.test/min/main.test.bicep +++ b/modules/network/local-network-gateway/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/nat-gateway/.test/common/dependencies.bicep b/modules/network/nat-gateway/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/nat-gateway/.test/common/dependencies.bicep rename to modules/network/nat-gateway/tests/e2e/common/dependencies.bicep diff --git a/modules/network/nat-gateway/.test/common/main.test.bicep b/modules/network/nat-gateway/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/network/nat-gateway/.test/common/main.test.bicep rename to modules/network/nat-gateway/tests/e2e/common/main.test.bicep index b4e844cece..eda394593d 100644 --- a/modules/network/nat-gateway/.test/common/main.test.bicep +++ b/modules/network/nat-gateway/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/nat-gateway/.test/prefixCombined/dependencies.bicep b/modules/network/nat-gateway/tests/e2e/prefixCombined/dependencies.bicep similarity index 100% rename from modules/network/nat-gateway/.test/prefixCombined/dependencies.bicep rename to modules/network/nat-gateway/tests/e2e/prefixCombined/dependencies.bicep diff --git a/modules/network/nat-gateway/.test/prefixCombined/main.test.bicep b/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep similarity index 95% rename from modules/network/nat-gateway/.test/prefixCombined/main.test.bicep rename to modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep index 1d98171653..13de1ef352 100644 --- a/modules/network/nat-gateway/.test/prefixCombined/main.test.bicep +++ b/modules/network/nat-gateway/tests/e2e/prefixCombined/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-interface/.test/common/dependencies.bicep b/modules/network/network-interface/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/network-interface/.test/common/dependencies.bicep rename to modules/network/network-interface/tests/e2e/common/dependencies.bicep diff --git a/modules/network/network-interface/.test/common/main.test.bicep b/modules/network/network-interface/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/network/network-interface/.test/common/main.test.bicep rename to modules/network/network-interface/tests/e2e/common/main.test.bicep index c5c0039691..e3db0da6eb 100644 --- a/modules/network/network-interface/.test/common/main.test.bicep +++ b/modules/network/network-interface/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-interface/.test/min/dependencies.bicep b/modules/network/network-interface/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/network-interface/.test/min/dependencies.bicep rename to modules/network/network-interface/tests/e2e/min/dependencies.bicep diff --git a/modules/network/network-interface/.test/min/main.test.bicep b/modules/network/network-interface/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/network-interface/.test/min/main.test.bicep rename to modules/network/network-interface/tests/e2e/min/main.test.bicep index a5d77cf3cb..3ba824eace 100644 --- a/modules/network/network-interface/.test/min/main.test.bicep +++ b/modules/network/network-interface/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-manager/.test/common/dependencies.bicep b/modules/network/network-manager/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/network-manager/.test/common/dependencies.bicep rename to modules/network/network-manager/tests/e2e/common/dependencies.bicep diff --git a/modules/network/network-manager/.test/common/main.test.bicep b/modules/network/network-manager/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/network/network-manager/.test/common/main.test.bicep rename to modules/network/network-manager/tests/e2e/common/main.test.bicep index b1376229e6..47dfe8e4c3 100644 --- a/modules/network/network-manager/.test/common/main.test.bicep +++ b/modules/network/network-manager/tests/e2e/common/main.test.bicep @@ -53,7 +53,7 @@ module nestedDependencies 'dependencies.bicep' = { var networkManagerName = '${namePrefix}${serviceShort}001' var networkManagerExpecetedResourceID = '${resourceGroup.id}/providers/Microsoft.Network/networkManagers/${networkManagerName}' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-security-group/.test/common/dependencies.bicep b/modules/network/network-security-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/network-security-group/.test/common/dependencies.bicep rename to modules/network/network-security-group/tests/e2e/common/dependencies.bicep diff --git a/modules/network/network-security-group/.test/common/main.test.bicep b/modules/network/network-security-group/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/network/network-security-group/.test/common/main.test.bicep rename to modules/network/network-security-group/tests/e2e/common/main.test.bicep index 6f4d0ca1e1..f0d32175ee 100644 --- a/modules/network/network-security-group/.test/common/main.test.bicep +++ b/modules/network/network-security-group/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-security-group/.test/min/main.test.bicep b/modules/network/network-security-group/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/network-security-group/.test/min/main.test.bicep rename to modules/network/network-security-group/tests/e2e/min/main.test.bicep index 5408cedcc5..0e74b84bbe 100644 --- a/modules/network/network-security-group/.test/min/main.test.bicep +++ b/modules/network/network-security-group/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/network-watcher/.test/common/dependencies.bicep b/modules/network/network-watcher/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/network-watcher/.test/common/dependencies.bicep rename to modules/network/network-watcher/tests/e2e/common/dependencies.bicep diff --git a/modules/network/network-watcher/.test/common/main.test.bicep b/modules/network/network-watcher/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/network-watcher/.test/common/main.test.bicep rename to modules/network/network-watcher/tests/e2e/common/main.test.bicep index 9730732a54..c990c50782 100644 --- a/modules/network/network-watcher/.test/common/main.test.bicep +++ b/modules/network/network-watcher/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -66,7 +66,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // ============== // #disable-next-line no-hardcoded-location // Disabled as the default RG & location are created in always one location, but each test has to deploy into a different one var testLocation = 'westeurope' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, testLocation)}-test-${serviceShort}' params: { diff --git a/modules/network/network-watcher/.test/min/main.test.bicep b/modules/network/network-watcher/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/network-watcher/.test/min/main.test.bicep rename to modules/network/network-watcher/tests/e2e/min/main.test.bicep index 026f230ae4..73452b204c 100644 --- a/modules/network/network-watcher/.test/min/main.test.bicep +++ b/modules/network/network-watcher/tests/e2e/min/main.test.bicep @@ -36,7 +36,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // ============== // #disable-next-line no-hardcoded-location // Disabled as the default RG & location are created in always one location, but each test has to deploy into a different one var testLocation = 'northeurope' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, testLocation)}-test-${serviceShort}' params: { diff --git a/modules/network/private-dns-zone/.test/common/dependencies.bicep b/modules/network/private-dns-zone/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/private-dns-zone/.test/common/dependencies.bicep rename to modules/network/private-dns-zone/tests/e2e/common/dependencies.bicep diff --git a/modules/network/private-dns-zone/.test/common/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/network/private-dns-zone/.test/common/main.test.bicep rename to modules/network/private-dns-zone/tests/e2e/common/main.test.bicep index 96d913639a..5e616bcc70 100644 --- a/modules/network/private-dns-zone/.test/common/main.test.bicep +++ b/modules/network/private-dns-zone/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/private-dns-zone/.test/min/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/private-dns-zone/.test/min/main.test.bicep rename to modules/network/private-dns-zone/tests/e2e/min/main.test.bicep index 0426b7b5d0..ac3e057214 100644 --- a/modules/network/private-dns-zone/.test/min/main.test.bicep +++ b/modules/network/private-dns-zone/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/private-endpoint/.test/common/dependencies.bicep b/modules/network/private-endpoint/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/private-endpoint/.test/common/dependencies.bicep rename to modules/network/private-endpoint/tests/e2e/common/dependencies.bicep diff --git a/modules/network/private-endpoint/.test/common/main.test.bicep b/modules/network/private-endpoint/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/private-endpoint/.test/common/main.test.bicep rename to modules/network/private-endpoint/tests/e2e/common/main.test.bicep index 3728621b84..7904b19335 100644 --- a/modules/network/private-endpoint/.test/common/main.test.bicep +++ b/modules/network/private-endpoint/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/private-endpoint/.test/min/dependencies.bicep b/modules/network/private-endpoint/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/private-endpoint/.test/min/dependencies.bicep rename to modules/network/private-endpoint/tests/e2e/min/dependencies.bicep diff --git a/modules/network/private-endpoint/.test/min/main.test.bicep b/modules/network/private-endpoint/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/private-endpoint/.test/min/main.test.bicep rename to modules/network/private-endpoint/tests/e2e/min/main.test.bicep index 95f011a2b2..c2f9894353 100644 --- a/modules/network/private-endpoint/.test/min/main.test.bicep +++ b/modules/network/private-endpoint/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/private-link-service/.test/common/dependencies.bicep b/modules/network/private-link-service/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/private-link-service/.test/common/dependencies.bicep rename to modules/network/private-link-service/tests/e2e/common/dependencies.bicep diff --git a/modules/network/private-link-service/.test/common/main.test.bicep b/modules/network/private-link-service/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/private-link-service/.test/common/main.test.bicep rename to modules/network/private-link-service/tests/e2e/common/main.test.bicep index ba974b6e46..dee87a5b50 100644 --- a/modules/network/private-link-service/.test/common/main.test.bicep +++ b/modules/network/private-link-service/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/private-link-service/.test/min/dependencies.bicep b/modules/network/private-link-service/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/private-link-service/.test/min/dependencies.bicep rename to modules/network/private-link-service/tests/e2e/min/dependencies.bicep diff --git a/modules/network/private-link-service/.test/min/main.test.bicep b/modules/network/private-link-service/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/private-link-service/.test/min/main.test.bicep rename to modules/network/private-link-service/tests/e2e/min/main.test.bicep index d7e063e3d4..6ecb49281d 100644 --- a/modules/network/private-link-service/.test/min/main.test.bicep +++ b/modules/network/private-link-service/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/public-ip-address/.test/common/dependencies.bicep b/modules/network/public-ip-address/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/public-ip-address/.test/common/dependencies.bicep rename to modules/network/public-ip-address/tests/e2e/common/dependencies.bicep diff --git a/modules/network/public-ip-address/.test/common/main.test.bicep b/modules/network/public-ip-address/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/network/public-ip-address/.test/common/main.test.bicep rename to modules/network/public-ip-address/tests/e2e/common/main.test.bicep index ac137bfc39..80217831e3 100644 --- a/modules/network/public-ip-address/.test/common/main.test.bicep +++ b/modules/network/public-ip-address/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/public-ip-address/.test/min/main.test.bicep b/modules/network/public-ip-address/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/public-ip-address/.test/min/main.test.bicep rename to modules/network/public-ip-address/tests/e2e/min/main.test.bicep index b759ba4dda..8b2bad4c9a 100644 --- a/modules/network/public-ip-address/.test/min/main.test.bicep +++ b/modules/network/public-ip-address/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/public-ip-prefix/.test/common/dependencies.bicep b/modules/network/public-ip-prefix/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/public-ip-prefix/.test/common/dependencies.bicep rename to modules/network/public-ip-prefix/tests/e2e/common/dependencies.bicep diff --git a/modules/network/public-ip-prefix/.test/common/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/public-ip-prefix/.test/common/main.test.bicep rename to modules/network/public-ip-prefix/tests/e2e/common/main.test.bicep index 60824222df..de01104fcb 100644 --- a/modules/network/public-ip-prefix/.test/common/main.test.bicep +++ b/modules/network/public-ip-prefix/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/public-ip-prefix/.test/min/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/public-ip-prefix/.test/min/main.test.bicep rename to modules/network/public-ip-prefix/tests/e2e/min/main.test.bicep index 979dc0e0af..5b412000e6 100644 --- a/modules/network/public-ip-prefix/.test/min/main.test.bicep +++ b/modules/network/public-ip-prefix/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/route-table/.test/common/dependencies.bicep b/modules/network/route-table/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/route-table/.test/common/dependencies.bicep rename to modules/network/route-table/tests/e2e/common/dependencies.bicep diff --git a/modules/network/route-table/.test/common/main.test.bicep b/modules/network/route-table/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/route-table/.test/common/main.test.bicep rename to modules/network/route-table/tests/e2e/common/main.test.bicep index 956148cbd0..9c832803bc 100644 --- a/modules/network/route-table/.test/common/main.test.bicep +++ b/modules/network/route-table/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/route-table/.test/min/main.test.bicep b/modules/network/route-table/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/route-table/.test/min/main.test.bicep rename to modules/network/route-table/tests/e2e/min/main.test.bicep index a5b93df8a8..8a237dfdcf 100644 --- a/modules/network/route-table/.test/min/main.test.bicep +++ b/modules/network/route-table/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/service-endpoint-policy/.test/common/dependencies.bicep b/modules/network/service-endpoint-policy/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/service-endpoint-policy/.test/common/dependencies.bicep rename to modules/network/service-endpoint-policy/tests/e2e/common/dependencies.bicep diff --git a/modules/network/service-endpoint-policy/.test/common/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/service-endpoint-policy/.test/common/main.test.bicep rename to modules/network/service-endpoint-policy/tests/e2e/common/main.test.bicep index 0dca71cf41..935e76388f 100644 --- a/modules/network/service-endpoint-policy/.test/common/main.test.bicep +++ b/modules/network/service-endpoint-policy/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/service-endpoint-policy/.test/min/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/service-endpoint-policy/.test/min/main.test.bicep rename to modules/network/service-endpoint-policy/tests/e2e/min/main.test.bicep index 154fe68b53..70ff126389 100644 --- a/modules/network/service-endpoint-policy/.test/min/main.test.bicep +++ b/modules/network/service-endpoint-policy/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/trafficmanagerprofile/.test/common/dependencies.bicep b/modules/network/trafficmanagerprofile/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/trafficmanagerprofile/.test/common/dependencies.bicep rename to modules/network/trafficmanagerprofile/tests/e2e/common/dependencies.bicep diff --git a/modules/network/trafficmanagerprofile/.test/common/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/network/trafficmanagerprofile/.test/common/main.test.bicep rename to modules/network/trafficmanagerprofile/tests/e2e/common/main.test.bicep index b66ca6b816..5b858058da 100644 --- a/modules/network/trafficmanagerprofile/.test/common/main.test.bicep +++ b/modules/network/trafficmanagerprofile/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/trafficmanagerprofile/.test/min/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/trafficmanagerprofile/.test/min/main.test.bicep rename to modules/network/trafficmanagerprofile/tests/e2e/min/main.test.bicep index 78292ead79..9f2602f94f 100644 --- a/modules/network/trafficmanagerprofile/.test/min/main.test.bicep +++ b/modules/network/trafficmanagerprofile/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var resourceName = '${namePrefix}${serviceShort}001' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-hub/.test/common/dependencies.bicep b/modules/network/virtual-hub/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-hub/.test/common/dependencies.bicep rename to modules/network/virtual-hub/tests/e2e/common/dependencies.bicep diff --git a/modules/network/virtual-hub/.test/common/main.test.bicep b/modules/network/virtual-hub/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/virtual-hub/.test/common/main.test.bicep rename to modules/network/virtual-hub/tests/e2e/common/main.test.bicep index 3686e52eb7..9c2433cc84 100644 --- a/modules/network/virtual-hub/.test/common/main.test.bicep +++ b/modules/network/virtual-hub/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-hub/.test/min/dependencies.bicep b/modules/network/virtual-hub/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/virtual-hub/.test/min/dependencies.bicep rename to modules/network/virtual-hub/tests/e2e/min/dependencies.bicep diff --git a/modules/network/virtual-hub/.test/min/main.test.bicep b/modules/network/virtual-hub/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/virtual-hub/.test/min/main.test.bicep rename to modules/network/virtual-hub/tests/e2e/min/main.test.bicep index be7e2a2955..1e6bb24c21 100644 --- a/modules/network/virtual-hub/.test/min/main.test.bicep +++ b/modules/network/virtual-hub/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network-gateway/.test/aadvpn/dependencies.bicep b/modules/network/virtual-network-gateway/tests/e2e/aadvpn/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateway/.test/aadvpn/dependencies.bicep rename to modules/network/virtual-network-gateway/tests/e2e/aadvpn/dependencies.bicep diff --git a/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep similarity index 96% rename from modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep rename to modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep index 678babb170..3c9305aa5b 100644 --- a/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/aadvpn/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network-gateway/.test/expressRoute/dependencies.bicep b/modules/network/virtual-network-gateway/tests/e2e/expressRoute/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateway/.test/expressRoute/dependencies.bicep rename to modules/network/virtual-network-gateway/tests/e2e/expressRoute/dependencies.bicep diff --git a/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep similarity index 95% rename from modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep rename to modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep index c65475e33c..9a22c3afa9 100644 --- a/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/expressRoute/main.test.bicep @@ -42,7 +42,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -58,7 +58,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network-gateway/.test/vpn/dependencies.bicep b/modules/network/virtual-network-gateway/tests/e2e/vpn/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateway/.test/vpn/dependencies.bicep rename to modules/network/virtual-network-gateway/tests/e2e/vpn/dependencies.bicep diff --git a/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep b/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep similarity index 96% rename from modules/network/virtual-network-gateway/.test/vpn/main.test.bicep rename to modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep index 85b6eca68f..903303e2af 100644 --- a/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep +++ b/modules/network/virtual-network-gateway/tests/e2e/vpn/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -59,7 +59,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network/.test/common/dependencies.bicep b/modules/network/virtual-network/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-network/.test/common/dependencies.bicep rename to modules/network/virtual-network/tests/e2e/common/dependencies.bicep diff --git a/modules/network/virtual-network/.test/common/main.test.bicep b/modules/network/virtual-network/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/network/virtual-network/.test/common/main.test.bicep rename to modules/network/virtual-network/tests/e2e/common/main.test.bicep index 57bdda036d..d3384de2e9 100644 --- a/modules/network/virtual-network/.test/common/main.test.bicep +++ b/modules/network/virtual-network/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // ============== // var addressPrefix = '10.0.0.0/16' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network/.test/min/main.test.bicep b/modules/network/virtual-network/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/virtual-network/.test/min/main.test.bicep rename to modules/network/virtual-network/tests/e2e/min/main.test.bicep index 5d77b3ccee..80ad958cf8 100644 --- a/modules/network/virtual-network/.test/min/main.test.bicep +++ b/modules/network/virtual-network/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-network/.test/vnetPeering/dependencies.bicep b/modules/network/virtual-network/tests/e2e/vnetPeering/dependencies.bicep similarity index 100% rename from modules/network/virtual-network/.test/vnetPeering/dependencies.bicep rename to modules/network/virtual-network/tests/e2e/vnetPeering/dependencies.bicep diff --git a/modules/network/virtual-network/.test/vnetPeering/main.test.bicep b/modules/network/virtual-network/tests/e2e/vnetPeering/main.test.bicep similarity index 97% rename from modules/network/virtual-network/.test/vnetPeering/main.test.bicep rename to modules/network/virtual-network/tests/e2e/vnetPeering/main.test.bicep index 34df29c754..ba786f42f1 100644 --- a/modules/network/virtual-network/.test/vnetPeering/main.test.bicep +++ b/modules/network/virtual-network/tests/e2e/vnetPeering/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-wan/.test/common/dependencies.bicep b/modules/network/virtual-wan/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-wan/.test/common/dependencies.bicep rename to modules/network/virtual-wan/tests/e2e/common/dependencies.bicep diff --git a/modules/network/virtual-wan/.test/common/main.test.bicep b/modules/network/virtual-wan/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/network/virtual-wan/.test/common/main.test.bicep rename to modules/network/virtual-wan/tests/e2e/common/main.test.bicep index 6f47c362b4..d9554d26d8 100644 --- a/modules/network/virtual-wan/.test/common/main.test.bicep +++ b/modules/network/virtual-wan/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/virtual-wan/.test/min/main.test.bicep b/modules/network/virtual-wan/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/network/virtual-wan/.test/min/main.test.bicep rename to modules/network/virtual-wan/tests/e2e/min/main.test.bicep index da77dcc8fc..9b861faa22 100644 --- a/modules/network/virtual-wan/.test/min/main.test.bicep +++ b/modules/network/virtual-wan/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/vpn-gateway/.test/common/dependencies.bicep b/modules/network/vpn-gateway/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/vpn-gateway/.test/common/dependencies.bicep rename to modules/network/vpn-gateway/tests/e2e/common/dependencies.bicep diff --git a/modules/network/vpn-gateway/.test/common/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/vpn-gateway/.test/common/main.test.bicep rename to modules/network/vpn-gateway/tests/e2e/common/main.test.bicep index 857d52c3a2..2d221b3379 100644 --- a/modules/network/vpn-gateway/.test/common/main.test.bicep +++ b/modules/network/vpn-gateway/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/vpn-gateway/.test/min/dependencies.bicep b/modules/network/vpn-gateway/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/vpn-gateway/.test/min/dependencies.bicep rename to modules/network/vpn-gateway/tests/e2e/min/dependencies.bicep diff --git a/modules/network/vpn-gateway/.test/min/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/vpn-gateway/.test/min/main.test.bicep rename to modules/network/vpn-gateway/tests/e2e/min/main.test.bicep index 959c3c8182..e79cff0f46 100644 --- a/modules/network/vpn-gateway/.test/min/main.test.bicep +++ b/modules/network/vpn-gateway/tests/e2e/min/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/vpn-site/.test/common/dependencies.bicep b/modules/network/vpn-site/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/network/vpn-site/.test/common/dependencies.bicep rename to modules/network/vpn-site/tests/e2e/common/dependencies.bicep diff --git a/modules/network/vpn-site/.test/common/main.test.bicep b/modules/network/vpn-site/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/network/vpn-site/.test/common/main.test.bicep rename to modules/network/vpn-site/tests/e2e/common/main.test.bicep index 3e40997a52..e7fdd0967f 100644 --- a/modules/network/vpn-site/.test/common/main.test.bicep +++ b/modules/network/vpn-site/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/network/vpn-site/.test/min/dependencies.bicep b/modules/network/vpn-site/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/network/vpn-site/.test/min/dependencies.bicep rename to modules/network/vpn-site/tests/e2e/min/dependencies.bicep diff --git a/modules/network/vpn-site/.test/min/main.test.bicep b/modules/network/vpn-site/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/network/vpn-site/.test/min/main.test.bicep rename to modules/network/vpn-site/tests/e2e/min/main.test.bicep index e452f365d1..2c805b566b 100644 --- a/modules/network/vpn-site/.test/min/main.test.bicep +++ b/modules/network/vpn-site/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operational-insights/workspace/.test/adv/dependencies.bicep b/modules/operational-insights/workspace/tests/e2e/adv/dependencies.bicep similarity index 100% rename from modules/operational-insights/workspace/.test/adv/dependencies.bicep rename to modules/operational-insights/workspace/tests/e2e/adv/dependencies.bicep diff --git a/modules/operational-insights/workspace/.test/adv/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep similarity index 98% rename from modules/operational-insights/workspace/.test/adv/main.test.bicep rename to modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep index 268d776147..04e0f54a59 100644 --- a/modules/operational-insights/workspace/.test/adv/main.test.bicep +++ b/modules/operational-insights/workspace/tests/e2e/adv/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operational-insights/workspace/.test/common/dependencies.bicep b/modules/operational-insights/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/operational-insights/workspace/.test/common/dependencies.bicep rename to modules/operational-insights/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/operational-insights/workspace/.test/common/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/operational-insights/workspace/.test/common/main.test.bicep rename to modules/operational-insights/workspace/tests/e2e/common/main.test.bicep index 607cbbae50..1cf9da26fa 100644 --- a/modules/operational-insights/workspace/.test/common/main.test.bicep +++ b/modules/operational-insights/workspace/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operational-insights/workspace/.test/min/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/operational-insights/workspace/.test/min/main.test.bicep rename to modules/operational-insights/workspace/tests/e2e/min/main.test.bicep index efb01b22ac..ad410db22f 100644 --- a/modules/operational-insights/workspace/.test/min/main.test.bicep +++ b/modules/operational-insights/workspace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operations-management/solution/.test/min/dependencies.bicep b/modules/operations-management/solution/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/operations-management/solution/.test/min/dependencies.bicep rename to modules/operations-management/solution/tests/e2e/min/dependencies.bicep diff --git a/modules/operations-management/solution/.test/min/main.test.bicep b/modules/operations-management/solution/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/operations-management/solution/.test/min/main.test.bicep rename to modules/operations-management/solution/tests/e2e/min/main.test.bicep index b59040e411..a82c4e54f3 100644 --- a/modules/operations-management/solution/.test/min/main.test.bicep +++ b/modules/operations-management/solution/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operations-management/solution/.test/ms/dependencies.bicep b/modules/operations-management/solution/tests/e2e/ms/dependencies.bicep similarity index 100% rename from modules/operations-management/solution/.test/ms/dependencies.bicep rename to modules/operations-management/solution/tests/e2e/ms/dependencies.bicep diff --git a/modules/operations-management/solution/.test/ms/main.test.bicep b/modules/operations-management/solution/tests/e2e/ms/main.test.bicep similarity index 97% rename from modules/operations-management/solution/.test/ms/main.test.bicep rename to modules/operations-management/solution/tests/e2e/ms/main.test.bicep index a055a0c15a..e3e03cbeec 100644 --- a/modules/operations-management/solution/.test/ms/main.test.bicep +++ b/modules/operations-management/solution/tests/e2e/ms/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/operations-management/solution/.test/nonms/dependencies.bicep b/modules/operations-management/solution/tests/e2e/nonms/dependencies.bicep similarity index 100% rename from modules/operations-management/solution/.test/nonms/dependencies.bicep rename to modules/operations-management/solution/tests/e2e/nonms/dependencies.bicep diff --git a/modules/operations-management/solution/.test/nonms/main.test.bicep b/modules/operations-management/solution/tests/e2e/nonms/main.test.bicep similarity index 97% rename from modules/operations-management/solution/.test/nonms/main.test.bicep rename to modules/operations-management/solution/tests/e2e/nonms/main.test.bicep index e3e4e9d126..39178e0f71 100644 --- a/modules/operations-management/solution/.test/nonms/main.test.bicep +++ b/modules/operations-management/solution/tests/e2e/nonms/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/policy-insights/remediation/.test/mg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep similarity index 97% rename from modules/policy-insights/remediation/.test/mg.common/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep index 49917865b8..ec5905b87e 100644 --- a/modules/policy-insights/remediation/.test/mg.common/main.test.bicep +++ b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep @@ -80,7 +80,7 @@ resource policySetAssignment 'Microsoft.Authorization/policyAssignments@2021-06- // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../management-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/policy-insights/remediation/.test/mg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep similarity index 95% rename from modules/policy-insights/remediation/.test/mg.min/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep index 9a1a8606b8..2fa5bd5533 100644 --- a/modules/policy-insights/remediation/.test/mg.min/main.test.bicep +++ b/modules/policy-insights/remediation/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/policy-insights/remediation/.test/rg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep similarity index 97% rename from modules/policy-insights/remediation/.test/rg.common/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep index 7052879293..932adf9c48 100644 --- a/modules/policy-insights/remediation/.test/rg.common/main.test.bicep +++ b/modules/policy-insights/remediation/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' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' scope: resourceGroup params: { diff --git a/modules/policy-insights/remediation/.test/rg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep similarity index 96% rename from modules/policy-insights/remediation/.test/rg.min/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep index 8d80250f13..86d6da3d11 100644 --- a/modules/policy-insights/remediation/.test/rg.min/main.test.bicep +++ b/modules/policy-insights/remediation/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' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' scope: resourceGroup params: { diff --git a/modules/policy-insights/remediation/.test/sub.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep similarity index 97% rename from modules/policy-insights/remediation/.test/sub.common/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep index 967baf0775..d884f232c9 100644 --- a/modules/policy-insights/remediation/.test/sub.common/main.test.bicep +++ b/modules/policy-insights/remediation/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/policy-insights/remediation/.test/sub.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep similarity index 95% rename from modules/policy-insights/remediation/.test/sub.min/main.test.bicep rename to modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep index 8bfbe9d9d1..cc3ef9248f 100644 --- a/modules/policy-insights/remediation/.test/sub.min/main.test.bicep +++ b/modules/policy-insights/remediation/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/power-bi-dedicated/capacity/.test/common/dependencies.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/power-bi-dedicated/capacity/.test/common/dependencies.bicep rename to modules/power-bi-dedicated/capacity/tests/e2e/common/dependencies.bicep diff --git a/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/power-bi-dedicated/capacity/.test/common/main.test.bicep rename to modules/power-bi-dedicated/capacity/tests/e2e/common/main.test.bicep index 67bba9fa1b..ac0f2e2e69 100644 --- a/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep +++ b/modules/power-bi-dedicated/capacity/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/power-bi-dedicated/capacity/.test/min/dependencies.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/power-bi-dedicated/capacity/.test/min/dependencies.bicep rename to modules/power-bi-dedicated/capacity/tests/e2e/min/dependencies.bicep diff --git a/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/power-bi-dedicated/capacity/.test/min/main.test.bicep rename to modules/power-bi-dedicated/capacity/tests/e2e/min/main.test.bicep index 3cbc57c794..7325d2ed89 100644 --- a/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep +++ b/modules/power-bi-dedicated/capacity/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/purview/account/.test/common/dependencies.bicep b/modules/purview/account/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/purview/account/.test/common/dependencies.bicep rename to modules/purview/account/tests/e2e/common/dependencies.bicep diff --git a/modules/purview/account/.test/common/main.test.bicep b/modules/purview/account/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/purview/account/.test/common/main.test.bicep rename to modules/purview/account/tests/e2e/common/main.test.bicep index 5dfc03d500..91aac7a244 100644 --- a/modules/purview/account/.test/common/main.test.bicep +++ b/modules/purview/account/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/purview/account/.test/min/main.test.bicep b/modules/purview/account/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/purview/account/.test/min/main.test.bicep rename to modules/purview/account/tests/e2e/min/main.test.bicep index 085922c251..b1205ff888 100644 --- a/modules/purview/account/.test/min/main.test.bicep +++ b/modules/purview/account/tests/e2e/min/main.test.bicep @@ -37,7 +37,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/recovery-services/vault/.test/common/dependencies.bicep b/modules/recovery-services/vault/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/recovery-services/vault/.test/common/dependencies.bicep rename to modules/recovery-services/vault/tests/e2e/common/dependencies.bicep diff --git a/modules/recovery-services/vault/.test/common/main.test.bicep b/modules/recovery-services/vault/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/recovery-services/vault/.test/common/main.test.bicep rename to modules/recovery-services/vault/tests/e2e/common/main.test.bicep index 81d25194c7..5e424fda60 100644 --- a/modules/recovery-services/vault/.test/common/main.test.bicep +++ b/modules/recovery-services/vault/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/recovery-services/vault/.test/dr/main.test.bicep b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep similarity index 98% rename from modules/recovery-services/vault/.test/dr/main.test.bicep rename to modules/recovery-services/vault/tests/e2e/dr/main.test.bicep index ab0df3f202..d2af04c07f 100644 --- a/modules/recovery-services/vault/.test/dr/main.test.bicep +++ b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // var rsvName = '${namePrefix}${serviceShort}001' -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/recovery-services/vault/.test/min/main.test.bicep b/modules/recovery-services/vault/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/recovery-services/vault/.test/min/main.test.bicep rename to modules/recovery-services/vault/tests/e2e/min/main.test.bicep index 84b52bfe7b..e64705c7a3 100644 --- a/modules/recovery-services/vault/.test/min/main.test.bicep +++ b/modules/recovery-services/vault/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/relay/namespace/.test/common/dependencies.bicep b/modules/relay/namespace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/relay/namespace/.test/common/dependencies.bicep rename to modules/relay/namespace/tests/e2e/common/dependencies.bicep diff --git a/modules/relay/namespace/.test/common/main.test.bicep b/modules/relay/namespace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/relay/namespace/.test/common/main.test.bicep rename to modules/relay/namespace/tests/e2e/common/main.test.bicep index 42d99dfca1..1145ec162b 100644 --- a/modules/relay/namespace/.test/common/main.test.bicep +++ b/modules/relay/namespace/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/relay/namespace/.test/min/main.test.bicep b/modules/relay/namespace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/relay/namespace/.test/min/main.test.bicep rename to modules/relay/namespace/tests/e2e/min/main.test.bicep index b58e52706a..689248719f 100644 --- a/modules/relay/namespace/.test/min/main.test.bicep +++ b/modules/relay/namespace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/relay/namespace/.test/pe/dependencies.bicep b/modules/relay/namespace/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/relay/namespace/.test/pe/dependencies.bicep rename to modules/relay/namespace/tests/e2e/pe/dependencies.bicep diff --git a/modules/relay/namespace/.test/pe/main.test.bicep b/modules/relay/namespace/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/relay/namespace/.test/pe/main.test.bicep rename to modules/relay/namespace/tests/e2e/pe/main.test.bicep index c982c0e55d..dd1352106e 100644 --- a/modules/relay/namespace/.test/pe/main.test.bicep +++ b/modules/relay/namespace/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/resource-graph/query/.test/common/dependencies.bicep b/modules/resource-graph/query/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/resource-graph/query/.test/common/dependencies.bicep rename to modules/resource-graph/query/tests/e2e/common/dependencies.bicep diff --git a/modules/resource-graph/query/.test/common/main.test.bicep b/modules/resource-graph/query/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/resource-graph/query/.test/common/main.test.bicep rename to modules/resource-graph/query/tests/e2e/common/main.test.bicep index 88223c9385..5ba6722c2e 100644 --- a/modules/resource-graph/query/.test/common/main.test.bicep +++ b/modules/resource-graph/query/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/resource-graph/query/.test/min/main.test.bicep b/modules/resource-graph/query/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/resource-graph/query/.test/min/main.test.bicep rename to modules/resource-graph/query/tests/e2e/min/main.test.bicep index 662a8d6a1b..da7b4e92f2 100644 --- a/modules/resource-graph/query/.test/min/main.test.bicep +++ b/modules/resource-graph/query/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/resources/deployment-script/.test/cli/dependencies.bicep b/modules/resources/deployment-script/tests/e2e/cli/dependencies.bicep similarity index 100% rename from modules/resources/deployment-script/.test/cli/dependencies.bicep rename to modules/resources/deployment-script/tests/e2e/cli/dependencies.bicep diff --git a/modules/resources/deployment-script/.test/cli/main.test.bicep b/modules/resources/deployment-script/tests/e2e/cli/main.test.bicep similarity index 98% rename from modules/resources/deployment-script/.test/cli/main.test.bicep rename to modules/resources/deployment-script/tests/e2e/cli/main.test.bicep index 6f72c40370..0de3a4dec5 100644 --- a/modules/resources/deployment-script/.test/cli/main.test.bicep +++ b/modules/resources/deployment-script/tests/e2e/cli/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/resources/deployment-script/.test/ps/dependencies.bicep b/modules/resources/deployment-script/tests/e2e/ps/dependencies.bicep similarity index 100% rename from modules/resources/deployment-script/.test/ps/dependencies.bicep rename to modules/resources/deployment-script/tests/e2e/ps/dependencies.bicep diff --git a/modules/resources/deployment-script/.test/ps/main.test.bicep b/modules/resources/deployment-script/tests/e2e/ps/main.test.bicep similarity index 97% rename from modules/resources/deployment-script/.test/ps/main.test.bicep rename to modules/resources/deployment-script/tests/e2e/ps/main.test.bicep index 96ae61a018..058b6ed59b 100644 --- a/modules/resources/deployment-script/.test/ps/main.test.bicep +++ b/modules/resources/deployment-script/tests/e2e/ps/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/resources/resource-group/.test/common/dependencies.bicep b/modules/resources/resource-group/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/resources/resource-group/.test/common/dependencies.bicep rename to modules/resources/resource-group/tests/e2e/common/dependencies.bicep diff --git a/modules/resources/resource-group/.test/common/main.test.bicep b/modules/resources/resource-group/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/resources/resource-group/.test/common/main.test.bicep rename to modules/resources/resource-group/tests/e2e/common/main.test.bicep index 00f3ec65a3..d18688107c 100644 --- a/modules/resources/resource-group/.test/common/main.test.bicep +++ b/modules/resources/resource-group/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/resources/resource-group/.test/min/main.test.bicep b/modules/resources/resource-group/tests/e2e/min/main.test.bicep similarity index 94% rename from modules/resources/resource-group/.test/min/main.test.bicep rename to modules/resources/resource-group/tests/e2e/min/main.test.bicep index 04d75955c0..22dbdd1d67 100644 --- a/modules/resources/resource-group/.test/min/main.test.bicep +++ b/modules/resources/resource-group/tests/e2e/min/main.test.bicep @@ -20,7 +20,7 @@ param namePrefix string = '[[namePrefix]]' // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/resources/tags/.test/min/main.test.bicep b/modules/resources/tags/tests/e2e/min/main.test.bicep similarity index 93% rename from modules/resources/tags/.test/min/main.test.bicep rename to modules/resources/tags/tests/e2e/min/main.test.bicep index 4afd22e26f..ab0a7599eb 100644 --- a/modules/resources/tags/.test/min/main.test.bicep +++ b/modules/resources/tags/tests/e2e/min/main.test.bicep @@ -17,7 +17,7 @@ param enableDefaultTelemetry bool = true // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/resources/tags/.test/rg/main.test.bicep b/modules/resources/tags/tests/e2e/rg/main.test.bicep similarity index 96% rename from modules/resources/tags/.test/rg/main.test.bicep rename to modules/resources/tags/tests/e2e/rg/main.test.bicep index ef95040057..0f08a5a281 100644 --- a/modules/resources/tags/.test/rg/main.test.bicep +++ b/modules/resources/tags/tests/e2e/rg/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/resources/tags/.test/sub/main.test.bicep b/modules/resources/tags/tests/e2e/sub/main.test.bicep similarity index 93% rename from modules/resources/tags/.test/sub/main.test.bicep rename to modules/resources/tags/tests/e2e/sub/main.test.bicep index 97394e4660..92c029e810 100644 --- a/modules/resources/tags/.test/sub/main.test.bicep +++ b/modules/resources/tags/tests/e2e/sub/main.test.bicep @@ -14,7 +14,7 @@ param enableDefaultTelemetry bool = true // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { onlyUpdate: true diff --git a/modules/search/search-service/.test/common/dependencies.bicep b/modules/search/search-service/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/search/search-service/.test/common/dependencies.bicep rename to modules/search/search-service/tests/e2e/common/dependencies.bicep diff --git a/modules/search/search-service/.test/common/main.test.bicep b/modules/search/search-service/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/search/search-service/.test/common/main.test.bicep rename to modules/search/search-service/tests/e2e/common/main.test.bicep index 1190190f6e..9e32c070da 100644 --- a/modules/search/search-service/.test/common/main.test.bicep +++ b/modules/search/search-service/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/search/search-service/.test/min/main.test.bicep b/modules/search/search-service/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/search/search-service/.test/min/main.test.bicep rename to modules/search/search-service/tests/e2e/min/main.test.bicep index 3383746985..a09caf4e8e 100644 --- a/modules/search/search-service/.test/min/main.test.bicep +++ b/modules/search/search-service/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/search/search-service/.test/pe/dependencies.bicep b/modules/search/search-service/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/search/search-service/.test/pe/dependencies.bicep rename to modules/search/search-service/tests/e2e/pe/dependencies.bicep diff --git a/modules/search/search-service/.test/pe/main.test.bicep b/modules/search/search-service/tests/e2e/pe/main.test.bicep similarity index 98% rename from modules/search/search-service/.test/pe/main.test.bicep rename to modules/search/search-service/tests/e2e/pe/main.test.bicep index 7fe335da8f..c18f872e76 100644 --- a/modules/search/search-service/.test/pe/main.test.bicep +++ b/modules/search/search-service/tests/e2e/pe/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/security/azure-security-center/.test/common/dependencies.bicep b/modules/security/azure-security-center/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/security/azure-security-center/.test/common/dependencies.bicep rename to modules/security/azure-security-center/tests/e2e/common/dependencies.bicep diff --git a/modules/security/azure-security-center/.test/common/main.test.bicep b/modules/security/azure-security-center/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/security/azure-security-center/.test/common/main.test.bicep rename to modules/security/azure-security-center/tests/e2e/common/main.test.bicep index e3621cd32f..da098c4a01 100644 --- a/modules/security/azure-security-center/.test/common/main.test.bicep +++ b/modules/security/azure-security-center/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/service-bus/namespace/.test/common/dependencies.bicep b/modules/service-bus/namespace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/service-bus/namespace/.test/common/dependencies.bicep rename to modules/service-bus/namespace/tests/e2e/common/dependencies.bicep diff --git a/modules/service-bus/namespace/.test/common/main.test.bicep b/modules/service-bus/namespace/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/service-bus/namespace/.test/common/main.test.bicep rename to modules/service-bus/namespace/tests/e2e/common/main.test.bicep index b5f4fed0fa..0cd5115423 100644 --- a/modules/service-bus/namespace/.test/common/main.test.bicep +++ b/modules/service-bus/namespace/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-bus/namespace/.test/encr/dependencies.bicep b/modules/service-bus/namespace/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/service-bus/namespace/.test/encr/dependencies.bicep rename to modules/service-bus/namespace/tests/e2e/encr/dependencies.bicep diff --git a/modules/service-bus/namespace/.test/encr/main.test.bicep b/modules/service-bus/namespace/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/service-bus/namespace/.test/encr/main.test.bicep rename to modules/service-bus/namespace/tests/e2e/encr/main.test.bicep index 961376bee9..f0e1671e0f 100644 --- a/modules/service-bus/namespace/.test/encr/main.test.bicep +++ b/modules/service-bus/namespace/tests/e2e/encr/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-bus/namespace/.test/min/main.test.bicep b/modules/service-bus/namespace/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/service-bus/namespace/.test/min/main.test.bicep rename to modules/service-bus/namespace/tests/e2e/min/main.test.bicep index b11f92b41e..f799f08ce9 100644 --- a/modules/service-bus/namespace/.test/min/main.test.bicep +++ b/modules/service-bus/namespace/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-bus/namespace/.test/pe/dependencies.bicep b/modules/service-bus/namespace/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/service-bus/namespace/.test/pe/dependencies.bicep rename to modules/service-bus/namespace/tests/e2e/pe/dependencies.bicep diff --git a/modules/service-bus/namespace/.test/pe/main.test.bicep b/modules/service-bus/namespace/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/service-bus/namespace/.test/pe/main.test.bicep rename to modules/service-bus/namespace/tests/e2e/pe/main.test.bicep index 90ad3f25ee..43e7f9de51 100644 --- a/modules/service-bus/namespace/.test/pe/main.test.bicep +++ b/modules/service-bus/namespace/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-fabric/cluster/.test/cert/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep similarity index 97% rename from modules/service-fabric/cluster/.test/cert/main.test.bicep rename to modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep index edd7a2d36a..b8f681a7e3 100644 --- a/modules/service-fabric/cluster/.test/cert/main.test.bicep +++ b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-fabric/cluster/.test/common/dependencies.bicep b/modules/service-fabric/cluster/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/service-fabric/cluster/.test/common/dependencies.bicep rename to modules/service-fabric/cluster/tests/e2e/common/dependencies.bicep diff --git a/modules/service-fabric/cluster/.test/common/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/common/main.test.bicep similarity index 99% rename from modules/service-fabric/cluster/.test/common/main.test.bicep rename to modules/service-fabric/cluster/tests/e2e/common/main.test.bicep index 2484550321..5bd1688211 100644 --- a/modules/service-fabric/cluster/.test/common/main.test.bicep +++ b/modules/service-fabric/cluster/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/service-fabric/cluster/.test/min/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/service-fabric/cluster/.test/min/main.test.bicep rename to modules/service-fabric/cluster/tests/e2e/min/main.test.bicep index 49d19006fd..abc24b2ed3 100644 --- a/modules/service-fabric/cluster/.test/min/main.test.bicep +++ b/modules/service-fabric/cluster/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/signal-r-service/signal-r/.test/common/dependencies.bicep b/modules/signal-r-service/signal-r/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/signal-r-service/signal-r/.test/common/dependencies.bicep rename to modules/signal-r-service/signal-r/tests/e2e/common/dependencies.bicep diff --git a/modules/signal-r-service/signal-r/.test/common/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/signal-r-service/signal-r/.test/common/main.test.bicep rename to modules/signal-r-service/signal-r/tests/e2e/common/main.test.bicep index ce4fae589c..df27118a70 100644 --- a/modules/signal-r-service/signal-r/.test/common/main.test.bicep +++ b/modules/signal-r-service/signal-r/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/signal-r-service/signal-r/.test/min/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/signal-r-service/signal-r/.test/min/main.test.bicep rename to modules/signal-r-service/signal-r/tests/e2e/min/main.test.bicep index b8d61468f3..3796aa1068 100644 --- a/modules/signal-r-service/signal-r/.test/min/main.test.bicep +++ b/modules/signal-r-service/signal-r/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { diff --git a/modules/signal-r-service/web-pub-sub/.test/common/dependencies.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/signal-r-service/web-pub-sub/.test/common/dependencies.bicep rename to modules/signal-r-service/web-pub-sub/tests/e2e/common/dependencies.bicep diff --git a/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep rename to modules/signal-r-service/web-pub-sub/tests/e2e/common/main.test.bicep index cc53d47085..9839ae68aa 100644 --- a/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/tests/e2e/common/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep rename to modules/signal-r-service/web-pub-sub/tests/e2e/min/main.test.bicep index ac0f2990f4..a888017c1b 100644 --- a/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/signal-r-service/web-pub-sub/.test/pe/dependencies.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/signal-r-service/web-pub-sub/.test/pe/dependencies.bicep rename to modules/signal-r-service/web-pub-sub/tests/e2e/pe/dependencies.bicep diff --git a/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep rename to modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep index 7a565e6ea8..25c2a4dfb3 100644 --- a/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep +++ b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/managed-instance/.test/common/dependencies.bicep b/modules/sql/managed-instance/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/sql/managed-instance/.test/common/dependencies.bicep rename to modules/sql/managed-instance/tests/e2e/common/dependencies.bicep diff --git a/modules/sql/managed-instance/.test/common/main.test.bicep b/modules/sql/managed-instance/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/sql/managed-instance/.test/common/main.test.bicep rename to modules/sql/managed-instance/tests/e2e/common/main.test.bicep index d5222b8617..40bb06b60a 100644 --- a/modules/sql/managed-instance/.test/common/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/common/main.test.bicep @@ -57,7 +57,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -73,7 +73,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/managed-instance/.test/min/dependencies.bicep b/modules/sql/managed-instance/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/sql/managed-instance/.test/min/dependencies.bicep rename to modules/sql/managed-instance/tests/e2e/min/dependencies.bicep diff --git a/modules/sql/managed-instance/.test/min/main.test.bicep b/modules/sql/managed-instance/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/sql/managed-instance/.test/min/main.test.bicep rename to modules/sql/managed-instance/tests/e2e/min/main.test.bicep index a9d1d45a88..9074fdeaf7 100644 --- a/modules/sql/managed-instance/.test/min/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/min/main.test.bicep @@ -53,7 +53,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/managed-instance/.test/vulnAssm/dependencies.bicep b/modules/sql/managed-instance/tests/e2e/vulnAssm/dependencies.bicep similarity index 100% rename from modules/sql/managed-instance/.test/vulnAssm/dependencies.bicep rename to modules/sql/managed-instance/tests/e2e/vulnAssm/dependencies.bicep diff --git a/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep b/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep similarity index 98% rename from modules/sql/managed-instance/.test/vulnAssm/main.test.bicep rename to modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep index bbe2806291..e6bb8787ca 100644 --- a/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep +++ b/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep @@ -51,7 +51,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/server/.test/admin/dependencies.bicep b/modules/sql/server/tests/e2e/admin/dependencies.bicep similarity index 100% rename from modules/sql/server/.test/admin/dependencies.bicep rename to modules/sql/server/tests/e2e/admin/dependencies.bicep diff --git a/modules/sql/server/.test/admin/main.test.bicep b/modules/sql/server/tests/e2e/admin/main.test.bicep similarity index 97% rename from modules/sql/server/.test/admin/main.test.bicep rename to modules/sql/server/tests/e2e/admin/main.test.bicep index 72d7db6de4..94c27ed0d9 100644 --- a/modules/sql/server/.test/admin/main.test.bicep +++ b/modules/sql/server/tests/e2e/admin/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/server/.test/common/dependencies.bicep b/modules/sql/server/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/sql/server/.test/common/dependencies.bicep rename to modules/sql/server/tests/e2e/common/dependencies.bicep diff --git a/modules/sql/server/.test/common/main.test.bicep b/modules/sql/server/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/sql/server/.test/common/main.test.bicep rename to modules/sql/server/tests/e2e/common/main.test.bicep index e5a989eec6..0c871563b6 100644 --- a/modules/sql/server/.test/common/main.test.bicep +++ b/modules/sql/server/tests/e2e/common/main.test.bicep @@ -51,7 +51,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -67,7 +67,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/server/.test/pe/dependencies.bicep b/modules/sql/server/tests/e2e/pe/dependencies.bicep similarity index 100% rename from modules/sql/server/.test/pe/dependencies.bicep rename to modules/sql/server/tests/e2e/pe/dependencies.bicep diff --git a/modules/sql/server/.test/pe/main.test.bicep b/modules/sql/server/tests/e2e/pe/main.test.bicep similarity index 97% rename from modules/sql/server/.test/pe/main.test.bicep rename to modules/sql/server/tests/e2e/pe/main.test.bicep index 13c246150b..9881236cfa 100644 --- a/modules/sql/server/.test/pe/main.test.bicep +++ b/modules/sql/server/tests/e2e/pe/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/server/.test/secondary/dependencies.bicep b/modules/sql/server/tests/e2e/secondary/dependencies.bicep similarity index 100% rename from modules/sql/server/.test/secondary/dependencies.bicep rename to modules/sql/server/tests/e2e/secondary/dependencies.bicep diff --git a/modules/sql/server/.test/secondary/main.test.bicep b/modules/sql/server/tests/e2e/secondary/main.test.bicep similarity index 97% rename from modules/sql/server/.test/secondary/main.test.bicep rename to modules/sql/server/tests/e2e/secondary/main.test.bicep index c88c13fcef..b5caa622c3 100644 --- a/modules/sql/server/.test/secondary/main.test.bicep +++ b/modules/sql/server/tests/e2e/secondary/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/sql/server/.test/vulnAssm/dependencies.bicep b/modules/sql/server/tests/e2e/vulnAssm/dependencies.bicep similarity index 100% rename from modules/sql/server/.test/vulnAssm/dependencies.bicep rename to modules/sql/server/tests/e2e/vulnAssm/dependencies.bicep diff --git a/modules/sql/server/.test/vulnAssm/main.test.bicep b/modules/sql/server/tests/e2e/vulnAssm/main.test.bicep similarity index 98% rename from modules/sql/server/.test/vulnAssm/main.test.bicep rename to modules/sql/server/tests/e2e/vulnAssm/main.test.bicep index 4ee3ba8505..1586facf7d 100644 --- a/modules/sql/server/.test/vulnAssm/main.test.bicep +++ b/modules/sql/server/tests/e2e/vulnAssm/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/storage/storage-account/.test/common/dependencies.bicep b/modules/storage/storage-account/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/storage/storage-account/.test/common/dependencies.bicep rename to modules/storage/storage-account/tests/e2e/common/dependencies.bicep diff --git a/modules/storage/storage-account/.test/common/main.test.bicep b/modules/storage/storage-account/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/storage/storage-account/.test/common/main.test.bicep rename to modules/storage/storage-account/tests/e2e/common/main.test.bicep index 2ca85cdb7f..202de04d91 100644 --- a/modules/storage/storage-account/.test/common/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/common/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/storage/storage-account/.test/encr/dependencies.bicep b/modules/storage/storage-account/tests/e2e/encr/dependencies.bicep similarity index 100% rename from modules/storage/storage-account/.test/encr/dependencies.bicep rename to modules/storage/storage-account/tests/e2e/encr/dependencies.bicep diff --git a/modules/storage/storage-account/.test/encr/main.test.bicep b/modules/storage/storage-account/tests/e2e/encr/main.test.bicep similarity index 98% rename from modules/storage/storage-account/.test/encr/main.test.bicep rename to modules/storage/storage-account/tests/e2e/encr/main.test.bicep index 9dc1ac8fc8..c4c76b8e9d 100644 --- a/modules/storage/storage-account/.test/encr/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/encr/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/storage/storage-account/.test/min/main.test.bicep b/modules/storage/storage-account/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/storage/storage-account/.test/min/main.test.bicep rename to modules/storage/storage-account/tests/e2e/min/main.test.bicep index 24b565b8b6..c5340263c1 100644 --- a/modules/storage/storage-account/.test/min/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/storage/storage-account/.test/nfs/dependencies.bicep b/modules/storage/storage-account/tests/e2e/nfs/dependencies.bicep similarity index 100% rename from modules/storage/storage-account/.test/nfs/dependencies.bicep rename to modules/storage/storage-account/tests/e2e/nfs/dependencies.bicep diff --git a/modules/storage/storage-account/.test/nfs/main.test.bicep b/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep similarity index 95% rename from modules/storage/storage-account/.test/nfs/main.test.bicep rename to modules/storage/storage-account/tests/e2e/nfs/main.test.bicep index 8dbf40c70a..7670f0c068 100644 --- a/modules/storage/storage-account/.test/nfs/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/nfs/main.test.bicep @@ -41,7 +41,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -57,7 +57,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/storage/storage-account/.test/v1/main.test.bicep b/modules/storage/storage-account/tests/e2e/v1/main.test.bicep similarity index 96% rename from modules/storage/storage-account/.test/v1/main.test.bicep rename to modules/storage/storage-account/tests/e2e/v1/main.test.bicep index 554750255f..aa1670b9c6 100644 --- a/modules/storage/storage-account/.test/v1/main.test.bicep +++ b/modules/storage/storage-account/tests/e2e/v1/main.test.bicep @@ -35,7 +35,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/private-link-hub/.test/common/dependencies.bicep b/modules/synapse/private-link-hub/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/synapse/private-link-hub/.test/common/dependencies.bicep rename to modules/synapse/private-link-hub/tests/e2e/common/dependencies.bicep diff --git a/modules/synapse/private-link-hub/.test/common/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/synapse/private-link-hub/.test/common/main.test.bicep rename to modules/synapse/private-link-hub/tests/e2e/common/main.test.bicep index 7b553d1f14..36f8efcc7d 100644 --- a/modules/synapse/private-link-hub/.test/common/main.test.bicep +++ b/modules/synapse/private-link-hub/tests/e2e/common/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/private-link-hub/.test/min/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/synapse/private-link-hub/.test/min/main.test.bicep rename to modules/synapse/private-link-hub/tests/e2e/min/main.test.bicep index 8256ac8c67..7ea78ed31d 100644 --- a/modules/synapse/private-link-hub/.test/min/main.test.bicep +++ b/modules/synapse/private-link-hub/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/workspace/.test/common/dependencies.bicep b/modules/synapse/workspace/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/synapse/workspace/.test/common/dependencies.bicep rename to modules/synapse/workspace/tests/e2e/common/dependencies.bicep diff --git a/modules/synapse/workspace/.test/common/main.test.bicep b/modules/synapse/workspace/tests/e2e/common/main.test.bicep similarity index 96% rename from modules/synapse/workspace/.test/common/main.test.bicep rename to modules/synapse/workspace/tests/e2e/common/main.test.bicep index 9cbb04d190..6c4567c98c 100644 --- a/modules/synapse/workspace/.test/common/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -62,7 +62,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/workspace/.test/encrwsai/dependencies.bicep b/modules/synapse/workspace/tests/e2e/encrwsai/dependencies.bicep similarity index 100% rename from modules/synapse/workspace/.test/encrwsai/dependencies.bicep rename to modules/synapse/workspace/tests/e2e/encrwsai/dependencies.bicep diff --git a/modules/synapse/workspace/.test/encrwsai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep similarity index 97% rename from modules/synapse/workspace/.test/encrwsai/main.test.bicep rename to modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep index 4c019dad24..48e6c94103 100644 --- a/modules/synapse/workspace/.test/encrwsai/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep @@ -48,7 +48,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/workspace/.test/encrwuai/dependencies.bicep b/modules/synapse/workspace/tests/e2e/encrwuai/dependencies.bicep similarity index 100% rename from modules/synapse/workspace/.test/encrwuai/dependencies.bicep rename to modules/synapse/workspace/tests/e2e/encrwuai/dependencies.bicep diff --git a/modules/synapse/workspace/.test/encrwuai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep similarity index 98% rename from modules/synapse/workspace/.test/encrwuai/main.test.bicep rename to modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep index f9da575edc..6049baaf1e 100644 --- a/modules/synapse/workspace/.test/encrwuai/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/workspace/.test/managedvnet/dependencies.bicep b/modules/synapse/workspace/tests/e2e/managedvnet/dependencies.bicep similarity index 100% rename from modules/synapse/workspace/.test/managedvnet/dependencies.bicep rename to modules/synapse/workspace/tests/e2e/managedvnet/dependencies.bicep diff --git a/modules/synapse/workspace/.test/managedvnet/main.test.bicep b/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep similarity index 97% rename from modules/synapse/workspace/.test/managedvnet/main.test.bicep rename to modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep index c057f7e2e6..8b1a2bb851 100644 --- a/modules/synapse/workspace/.test/managedvnet/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/synapse/workspace/.test/min/dependencies.bicep b/modules/synapse/workspace/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/synapse/workspace/.test/min/dependencies.bicep rename to modules/synapse/workspace/tests/e2e/min/dependencies.bicep diff --git a/modules/synapse/workspace/.test/min/main.test.bicep b/modules/synapse/workspace/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/synapse/workspace/.test/min/main.test.bicep rename to modules/synapse/workspace/tests/e2e/min/main.test.bicep index 66e9c02a88..0597e80b28 100644 --- a/modules/synapse/workspace/.test/min/main.test.bicep +++ b/modules/synapse/workspace/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/virtual-machine-images/image-template/.test/common/dependencies.bicep b/modules/virtual-machine-images/image-template/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/virtual-machine-images/image-template/.test/common/dependencies.bicep rename to modules/virtual-machine-images/image-template/tests/e2e/common/dependencies.bicep diff --git a/modules/virtual-machine-images/image-template/.test/common/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/virtual-machine-images/image-template/.test/common/main.test.bicep rename to modules/virtual-machine-images/image-template/tests/e2e/common/main.test.bicep index f70aa4df55..fe5eecd0a2 100644 --- a/modules/virtual-machine-images/image-template/.test/common/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/common/main.test.bicep @@ -65,7 +65,7 @@ resource msi_managedIdentityOperatorRoleAssignment 'Microsoft.Authorization/role // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/virtual-machine-images/image-template/.test/min/dependencies.bicep b/modules/virtual-machine-images/image-template/tests/e2e/min/dependencies.bicep similarity index 100% rename from modules/virtual-machine-images/image-template/.test/min/dependencies.bicep rename to modules/virtual-machine-images/image-template/tests/e2e/min/dependencies.bicep diff --git a/modules/virtual-machine-images/image-template/.test/min/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/min/main.test.bicep similarity index 97% rename from modules/virtual-machine-images/image-template/.test/min/main.test.bicep rename to modules/virtual-machine-images/image-template/tests/e2e/min/main.test.bicep index ed5cb3f858..ea6acdfabf 100644 --- a/modules/virtual-machine-images/image-template/.test/min/main.test.bicep +++ b/modules/virtual-machine-images/image-template/tests/e2e/min/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/connection/.test/common/dependencies.bicep b/modules/web/connection/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/web/connection/.test/common/dependencies.bicep rename to modules/web/connection/tests/e2e/common/dependencies.bicep diff --git a/modules/web/connection/.test/common/main.test.bicep b/modules/web/connection/tests/e2e/common/main.test.bicep similarity index 97% rename from modules/web/connection/.test/common/main.test.bicep rename to modules/web/connection/tests/e2e/common/main.test.bicep index dd8de8af36..5975399c38 100644 --- a/modules/web/connection/.test/common/main.test.bicep +++ b/modules/web/connection/tests/e2e/common/main.test.bicep @@ -46,7 +46,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/hosting-environment/.test/asev2/dependencies.bicep b/modules/web/hosting-environment/tests/e2e/asev2/dependencies.bicep similarity index 100% rename from modules/web/hosting-environment/.test/asev2/dependencies.bicep rename to modules/web/hosting-environment/tests/e2e/asev2/dependencies.bicep diff --git a/modules/web/hosting-environment/.test/asev2/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep similarity index 95% rename from modules/web/hosting-environment/.test/asev2/main.test.bicep rename to modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep index 835d050137..d86885ab6b 100644 --- a/modules/web/hosting-environment/.test/asev2/main.test.bicep +++ b/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -59,7 +59,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/hosting-environment/.test/asev3/dependencies.bicep b/modules/web/hosting-environment/tests/e2e/asev3/dependencies.bicep similarity index 97% rename from modules/web/hosting-environment/.test/asev3/dependencies.bicep rename to modules/web/hosting-environment/tests/e2e/asev3/dependencies.bicep index 457eb4b012..eedd2e4e78 100644 --- a/modules/web/hosting-environment/.test/asev3/dependencies.bicep +++ b/modules/web/hosting-environment/tests/e2e/asev3/dependencies.bicep @@ -118,7 +118,7 @@ resource certDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' azPowerShellVersion: '8.0' retentionInterval: 'P1D' arguments: '-KeyVaultName "${keyVault.name}" -CertName "asev3certificate" -CertSubjectName "CN=*.internal.contoso.com"' - scriptContent: loadTextContent('../../../../.shared/.scripts/Set-CertificateInKeyVault.ps1') + scriptContent: loadTextContent('../../../../../.shared/.scripts/Set-CertificateInKeyVault.ps1') } } diff --git a/modules/web/hosting-environment/.test/asev3/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep similarity index 96% rename from modules/web/hosting-environment/.test/asev3/main.test.bicep rename to modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep index d7045c104e..52203b7f2f 100644 --- a/modules/web/hosting-environment/.test/asev3/main.test.bicep +++ b/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/serverfarm/.test/common/dependencies.bicep b/modules/web/serverfarm/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/web/serverfarm/.test/common/dependencies.bicep rename to modules/web/serverfarm/tests/e2e/common/dependencies.bicep diff --git a/modules/web/serverfarm/.test/common/main.test.bicep b/modules/web/serverfarm/tests/e2e/common/main.test.bicep similarity index 95% rename from modules/web/serverfarm/.test/common/main.test.bicep rename to modules/web/serverfarm/tests/e2e/common/main.test.bicep index 38af3a47f8..2eca5fc775 100644 --- a/modules/web/serverfarm/.test/common/main.test.bicep +++ b/modules/web/serverfarm/tests/e2e/common/main.test.bicep @@ -44,7 +44,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/site/.test/functionAppCommon/dependencies.bicep b/modules/web/site/tests/e2e/functionAppCommon/dependencies.bicep similarity index 100% rename from modules/web/site/.test/functionAppCommon/dependencies.bicep rename to modules/web/site/tests/e2e/functionAppCommon/dependencies.bicep diff --git a/modules/web/site/.test/functionAppCommon/main.test.bicep b/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep similarity index 97% rename from modules/web/site/.test/functionAppCommon/main.test.bicep rename to modules/web/site/tests/e2e/functionAppCommon/main.test.bicep index afc7ec0eec..9219cb3ccf 100644 --- a/modules/web/site/.test/functionAppCommon/main.test.bicep +++ b/modules/web/site/tests/e2e/functionAppCommon/main.test.bicep @@ -47,7 +47,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -63,7 +63,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // 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' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/site/.test/functionAppMin/dependencies.bicep b/modules/web/site/tests/e2e/functionAppMin/dependencies.bicep similarity index 100% rename from modules/web/site/.test/functionAppMin/dependencies.bicep rename to modules/web/site/tests/e2e/functionAppMin/dependencies.bicep diff --git a/modules/web/site/.test/functionAppMin/main.test.bicep b/modules/web/site/tests/e2e/functionAppMin/main.test.bicep similarity index 97% rename from modules/web/site/.test/functionAppMin/main.test.bicep rename to modules/web/site/tests/e2e/functionAppMin/main.test.bicep index 9fe64f0fdc..29a416992c 100644 --- a/modules/web/site/.test/functionAppMin/main.test.bicep +++ b/modules/web/site/tests/e2e/functionAppMin/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/site/.test/webAppCommon/dependencies.bicep b/modules/web/site/tests/e2e/webAppCommon/dependencies.bicep similarity index 100% rename from modules/web/site/.test/webAppCommon/dependencies.bicep rename to modules/web/site/tests/e2e/webAppCommon/dependencies.bicep diff --git a/modules/web/site/.test/webAppCommon/main.test.bicep b/modules/web/site/tests/e2e/webAppCommon/main.test.bicep similarity index 97% rename from modules/web/site/.test/webAppCommon/main.test.bicep rename to modules/web/site/tests/e2e/webAppCommon/main.test.bicep index e0b0545fc6..ddf1838032 100644 --- a/modules/web/site/.test/webAppCommon/main.test.bicep +++ b/modules/web/site/tests/e2e/webAppCommon/main.test.bicep @@ -45,7 +45,7 @@ module nestedDependencies 'dependencies.bicep' = { // Diagnostics // =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { +module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' params: { @@ -60,7 +60,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // ============== // // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/site/.test/webAppMin/dependencies.bicep b/modules/web/site/tests/e2e/webAppMin/dependencies.bicep similarity index 100% rename from modules/web/site/.test/webAppMin/dependencies.bicep rename to modules/web/site/tests/e2e/webAppMin/dependencies.bicep diff --git a/modules/web/site/.test/webAppMin/main.test.bicep b/modules/web/site/tests/e2e/webAppMin/main.test.bicep similarity index 97% rename from modules/web/site/.test/webAppMin/main.test.bicep rename to modules/web/site/tests/e2e/webAppMin/main.test.bicep index 1446d9d389..38c74f798e 100644 --- a/modules/web/site/.test/webAppMin/main.test.bicep +++ b/modules/web/site/tests/e2e/webAppMin/main.test.bicep @@ -43,7 +43,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/static-site/.test/common/dependencies.bicep b/modules/web/static-site/tests/e2e/common/dependencies.bicep similarity index 100% rename from modules/web/static-site/.test/common/dependencies.bicep rename to modules/web/static-site/tests/e2e/common/dependencies.bicep diff --git a/modules/web/static-site/.test/common/main.test.bicep b/modules/web/static-site/tests/e2e/common/main.test.bicep similarity index 98% rename from modules/web/static-site/.test/common/main.test.bicep rename to modules/web/static-site/tests/e2e/common/main.test.bicep index 4755385208..3e5f43bb03 100644 --- a/modules/web/static-site/.test/common/main.test.bicep +++ b/modules/web/static-site/tests/e2e/common/main.test.bicep @@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/web/static-site/.test/min/main.test.bicep b/modules/web/static-site/tests/e2e/min/main.test.bicep similarity index 96% rename from modules/web/static-site/.test/min/main.test.bicep rename to modules/web/static-site/tests/e2e/min/main.test.bicep index 9f31a0d7a0..97845e594d 100644 --- a/modules/web/static-site/.test/min/main.test.bicep +++ b/modules/web/static-site/tests/e2e/min/main.test.bicep @@ -38,7 +38,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../main.bicep' = { +module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 index e0cbac542b..7fb5b13699 100644 --- a/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 +++ b/utilities/pipelines/sharedScripts/Get-ModuleTestFileList.ps1 @@ -18,7 +18,7 @@ Optional. The pattern of test files to search for. For example '*.json' .EXAMPLE Get-ModuleTestFileList -ModulePath 'C:\ResourceModules\modules\compute\virtual-machine' -Returns the relative file paths of all test files of the virtual-machine module in the default test folder ('.test'). +Returns the relative file paths of all test files of the virtual-machine module in the default test folder ('tests'). .EXAMPLE Get-ModuleTestFileList -ModulePath 'C:\ResourceModules\modules\compute\virtual-machine' -SearchFolder 'parameters' @@ -33,7 +33,7 @@ function Get-ModuleTestFileList { [string] $ModulePath, [Parameter(Mandatory = $false)] - [string] $SearchFolder = '.test', + [string] $SearchFolder = 'tests', [Parameter(Mandatory = $false)] [string[]] $TestFilePattern = @('*.json', 'main.test.bicep') @@ -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) { diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 59805a7a6d..3e8ff1fe2e 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -81,7 +81,7 @@ Describe 'File/folder tests' -Tag 'Modules' { [string] $moduleFolderPath ) - $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath '.test') + $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath 'tests') $pathExisting | Should -Be $true }