diff --git a/modules/aad/domain-service/.test/common/main.test.bicep b/modules/aad/domain-service/.test/common/main.test.bicep
index 0575d1a848..51585097f2 100644
--- a/modules/aad/domain-service/.test/common/main.test.bicep
+++ b/modules/aad/domain-service/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.aad.domainservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-aad.domainservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/analysis-services/server/.test/common/main.test.bicep b/modules/analysis-services/server/.test/common/main.test.bicep
index 6addd17c94..91cf783f0e 100644
--- a/modules/analysis-services/server/.test/common/main.test.bicep
+++ b/modules/analysis-services/server/.test/common/main.test.bicep
@@ -1,92 +1,92 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.analysisservices.servers-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'asscom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- skuName: 'S0'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-analysisservices.servers-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'asscom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ skuName: 'S0'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/analysis-services/server/.test/max/main.test.bicep b/modules/analysis-services/server/.test/max/main.test.bicep
index dedb04408c..12d56eb4a5 100644
--- a/modules/analysis-services/server/.test/max/main.test.bicep
+++ b/modules/analysis-services/server/.test/max/main.test.bicep
@@ -1,102 +1,102 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.analysisservices.servers-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'assmax'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: az.resourceGroup(resourceGroupName)
- name: '${uniqueString(deployment().name)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- skuName: 'S0'
- skuCapacity: 1
- firewallSettings: {
- firewallRules: [
- {
- firewallRuleName: 'AllowFromAll'
- rangeStart: '0.0.0.0'
- rangeEnd: '255.255.255.255'
- }
- ]
- enablePowerBIService: true
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- diagnosticLogCategoriesToEnable: [
- 'Engine'
- 'Service'
- ]
- diagnosticMetricsToEnable: [
- 'AllMetrics'
- ]
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-analysisservices.servers-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'assmax'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: az.resourceGroup(resourceGroupName)
+ name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ skuName: 'S0'
+ skuCapacity: 1
+ firewallSettings: {
+ firewallRules: [
+ {
+ firewallRuleName: 'AllowFromAll'
+ rangeStart: '0.0.0.0'
+ rangeEnd: '255.255.255.255'
+ }
+ ]
+ enablePowerBIService: true
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ diagnosticLogCategoriesToEnable: [
+ 'Engine'
+ 'Service'
+ ]
+ diagnosticMetricsToEnable: [
+ 'AllMetrics'
+ ]
+ }
+}
diff --git a/modules/analysis-services/server/.test/min/main.test.bicep b/modules/analysis-services/server/.test/min/main.test.bicep
index e89ac48c07..2c00bf27fd 100644
--- a/modules/analysis-services/server/.test/min/main.test.bicep
+++ b/modules/analysis-services/server/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.analysisservices.servers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-analysisservices.servers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/api-management/service/.test/common/main.test.bicep b/modules/api-management/service/.test/common/main.test.bicep
index 217f502f87..178551760c 100644
--- a/modules/api-management/service/.test/common/main.test.bicep
+++ b/modules/api-management/service/.test/common/main.test.bicep
@@ -1,99 +1,99 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.apimanagement.service-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'apiscom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
- publisherName: '${namePrefix}-az-amorg-x-001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- policies: [
- {
- format: 'xml'
- value: ' '
- }
- ]
- portalsettings: [
- {
- name: 'signin'
- properties: {
- enabled: false
- }
- }
- {
- name: 'signup'
- properties: {
- enabled: false
- termsOfService: {
- consentRequired: false
- enabled: false
- }
- }
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-apimanagement.service-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'apiscom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
+ publisherName: '${namePrefix}-az-amorg-x-001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ policies: [
+ {
+ format: 'xml'
+ value: ' '
+ }
+ ]
+ portalsettings: [
+ {
+ name: 'signin'
+ properties: {
+ enabled: false
+ }
+ }
+ {
+ name: 'signup'
+ properties: {
+ enabled: false
+ termsOfService: {
+ consentRequired: false
+ enabled: false
+ }
+ }
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/api-management/service/.test/max/main.test.bicep b/modules/api-management/service/.test/max/main.test.bicep
index b5d444c517..762ae9bf2b 100644
--- a/modules/api-management/service/.test/max/main.test.bicep
+++ b/modules/api-management/service/.test/max/main.test.bicep
@@ -1,205 +1,205 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.apimanagement.service-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'apismax'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-@description('Optional. The secret to leverage for authorization server authentication.')
-@secure()
-param customSecret string = newGuid()
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
- publisherName: '${namePrefix}-az-amorg-x-001'
- apis: [
- {
- apiVersionSet: {
- name: 'echo-version-set'
- properties: {
- description: 'echo-version-set'
- displayName: 'echo-version-set'
- versioningScheme: 'Segment'
- }
- }
- displayName: 'Echo API'
- name: 'echo-api'
- path: 'echo'
- serviceUrl: 'http://echoapi.cloudapp.net/api'
- }
- ]
- authorizationServers: {
- secureList: [
- {
- authorizationEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/authorize'
- clientId: 'apimclientid'
- clientSecret: customSecret
- clientRegistrationEndpoint: 'http://localhost'
- grantTypes: [
- 'authorizationCode'
- ]
- name: 'AuthServer1'
- tokenEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/token'
- }
- ]
- }
- backends: [
- {
- name: 'backend'
- tls: {
- validateCertificateChain: false
- validateCertificateName: false
- }
- url: 'http://echoapi.cloudapp.net/api'
- }
- ]
- caches: [
- {
- connectionString: 'connectionstringtest'
- name: 'westeurope'
- useFromLocation: 'westeurope'
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- identityProviders: [
- {
- name: 'aadProvider'
- }
- ]
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- namedValues: [
- {
- displayName: 'apimkey'
- name: 'apimkey'
- secret: true
- }
- ]
- policies: [
- {
- format: 'xml'
- value: ' '
- }
- ]
- portalsettings: [
- {
- name: 'signin'
- properties: {
- enabled: false
- }
- }
- {
- name: 'signup'
- properties: {
- enabled: false
- termsOfService: {
- consentRequired: false
- enabled: false
- }
- }
- }
- ]
- products: [
- {
- apis: [
- {
- name: 'echo-api'
- }
- ]
- approvalRequired: false
- groups: [
- {
- name: 'developers'
- }
- ]
- name: 'Starter'
- subscriptionRequired: false
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- subscriptions: [
- {
- name: 'testArmSubscriptionAllApis'
- scope: '/apis'
- }
- ]
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-apimanagement.service-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'apismax'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+@description('Optional. The secret to leverage for authorization server authentication.')
+@secure()
+param customSecret string = newGuid()
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
+ publisherName: '${namePrefix}-az-amorg-x-001'
+ apis: [
+ {
+ apiVersionSet: {
+ name: 'echo-version-set'
+ properties: {
+ description: 'echo-version-set'
+ displayName: 'echo-version-set'
+ versioningScheme: 'Segment'
+ }
+ }
+ displayName: 'Echo API'
+ name: 'echo-api'
+ path: 'echo'
+ serviceUrl: 'http://echoapi.cloudapp.net/api'
+ }
+ ]
+ authorizationServers: {
+ secureList: [
+ {
+ authorizationEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/authorize'
+ clientId: 'apimclientid'
+ clientSecret: customSecret
+ clientRegistrationEndpoint: 'http://localhost'
+ grantTypes: [
+ 'authorizationCode'
+ ]
+ name: 'AuthServer1'
+ tokenEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/token'
+ }
+ ]
+ }
+ backends: [
+ {
+ name: 'backend'
+ tls: {
+ validateCertificateChain: false
+ validateCertificateName: false
+ }
+ url: 'http://echoapi.cloudapp.net/api'
+ }
+ ]
+ caches: [
+ {
+ connectionString: 'connectionstringtest'
+ name: 'westeurope'
+ useFromLocation: 'westeurope'
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ identityProviders: [
+ {
+ name: 'aadProvider'
+ }
+ ]
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ namedValues: [
+ {
+ displayName: 'apimkey'
+ name: 'apimkey'
+ secret: true
+ }
+ ]
+ policies: [
+ {
+ format: 'xml'
+ value: ' '
+ }
+ ]
+ portalsettings: [
+ {
+ name: 'signin'
+ properties: {
+ enabled: false
+ }
+ }
+ {
+ name: 'signup'
+ properties: {
+ enabled: false
+ termsOfService: {
+ consentRequired: false
+ enabled: false
+ }
+ }
+ }
+ ]
+ products: [
+ {
+ apis: [
+ {
+ name: 'echo-api'
+ }
+ ]
+ approvalRequired: false
+ groups: [
+ {
+ name: 'developers'
+ }
+ ]
+ name: 'Starter'
+ subscriptionRequired: false
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ subscriptions: [
+ {
+ name: 'testArmSubscriptionAllApis'
+ scope: '/apis'
+ }
+ ]
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/api-management/service/.test/min/main.test.bicep b/modules/api-management/service/.test/min/main.test.bicep
index f4e9fd87a5..0f6785d024 100644
--- a/modules/api-management/service/.test/min/main.test.bicep
+++ b/modules/api-management/service/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.apimanagement.service-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-apimanagement.service-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app-configuration/configuration-store/.test/common/main.test.bicep b/modules/app-configuration/configuration-store/.test/common/main.test.bicep
index 3c93d1fb33..fcf880f426 100644
--- a/modules/app-configuration/configuration-store/.test/common/main.test.bicep
+++ b/modules/app-configuration/configuration-store/.test/common/main.test.bicep
@@ -1,113 +1,114 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'acccom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- createMode: 'Default'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- disableLocalAuth: false
- enablePurgeProtection: false
- keyValues: [
- {
- contentType: 'contentType'
- name: 'keyName'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- value: 'valueName'
- }
- ]
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- softDeleteRetentionInDays: 1
- systemAssignedIdentity: false
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-appconfiguration.configurationstores-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'acccom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ createMode: 'Default'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ disableLocalAuth: false
+ enablePurgeProtection: false
+ keyValues: [
+ {
+ contentType: 'contentType'
+ name: 'keyName'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ value: 'valueName'
+ }
+ ]
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ softDeleteRetentionInDays: 1
+ systemAssignedIdentity: false
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/app-configuration/configuration-store/.test/min/main.test.bicep b/modules/app-configuration/configuration-store/.test/min/main.test.bicep
index 8770a7a8ca..05c1075df5 100644
--- a/modules/app-configuration/configuration-store/.test/min/main.test.bicep
+++ b/modules/app-configuration/configuration-store/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-appconfiguration.configurationstores-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app-configuration/configuration-store/.test/pe/main.test.bicep b/modules/app-configuration/configuration-store/.test/pe/main.test.bicep
index b38ce56091..967fb336b2 100644
--- a/modules/app-configuration/configuration-store/.test/pe/main.test.bicep
+++ b/modules/app-configuration/configuration-store/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-appconfiguration.configurationstores-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app/container-app/.test/common/main.test.bicep b/modules/app/container-app/.test/common/main.test.bicep
index 9e032bfcd3..19585fed16 100644
--- a/modules/app/container-app/.test/common/main.test.bicep
+++ b/modules/app/container-app/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.app.containerApps-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-app.containerApps-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app/container-app/.test/min/main.test.bicep b/modules/app/container-app/.test/min/main.test.bicep
index 8969d7e6e3..ac2621ddef 100644
--- a/modules/app/container-app/.test/min/main.test.bicep
+++ b/modules/app/container-app/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.app.containerApps-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-app.containerApps-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app/managed-environment/.test/common/main.test.bicep b/modules/app/managed-environment/.test/common/main.test.bicep
index 84b3e08239..cd936f208c 100644
--- a/modules/app/managed-environment/.test/common/main.test.bicep
+++ b/modules/app/managed-environment/.test/common/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with most of its featur
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.app.managedenvironments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/app/managed-environment/.test/min/main.test.bicep b/modules/app/managed-environment/.test/min/main.test.bicep
index ceab992425..63e784e123 100644
--- a/modules/app/managed-environment/.test/min/main.test.bicep
+++ b/modules/app/managed-environment/.test/min/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with the minimum set of
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.app.managedenvironments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/lock/.test/common/main.test.bicep b/modules/authorization/lock/.test/common/main.test.bicep
index aa9099f4a9..69c8663433 100644
--- a/modules/authorization/lock/.test/common/main.test.bicep
+++ b/modules/authorization/lock/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.locks-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.locks-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
@@ -20,6 +20,9 @@ param serviceShort string = 'alcom'
@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
// ============ //
// Dependencies //
// ============ //
diff --git a/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep b/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep
index 064a7646e2..e32a642345 100644
--- a/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep
+++ b/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.policyassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.policyassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/policy-assignment/.test/rg.min/main.test.bicep b/modules/authorization/policy-assignment/.test/rg.min/main.test.bicep
index 16a4076f5c..f84a97178a 100644
--- a/modules/authorization/policy-assignment/.test/rg.min/main.test.bicep
+++ b/modules/authorization/policy-assignment/.test/rg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.policyassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.policyassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep b/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep
index 46e6a39420..5ac56a6167 100644
--- a/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep
+++ b/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.policyassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.policyassignments-${serviceShort}-rg'
@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
param serviceShort string = 'apasubcom'
diff --git a/modules/authorization/policy-exemption/.test/rg.common/main.test.bicep b/modules/authorization/policy-exemption/.test/rg.common/main.test.bicep
index 929007e04f..af4faa0c25 100644
--- a/modules/authorization/policy-exemption/.test/rg.common/main.test.bicep
+++ b/modules/authorization/policy-exemption/.test/rg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.policyexemptions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.policyexemptions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/policy-exemption/.test/rg.min/main.test.bicep b/modules/authorization/policy-exemption/.test/rg.min/main.test.bicep
index 364f997c67..9f2269817c 100644
--- a/modules/authorization/policy-exemption/.test/rg.min/main.test.bicep
+++ b/modules/authorization/policy-exemption/.test/rg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.policyexemptions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.policyexemptions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/mg.common/main.test.bicep b/modules/authorization/role-assignment/.test/mg.common/main.test.bicep
index af85a59176..7e87bc88b2 100644
--- a/modules/authorization/role-assignment/.test/mg.common/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/mg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'managementGroup'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/mg.min/main.test.bicep b/modules/authorization/role-assignment/.test/mg.min/main.test.bicep
index 2b24b7d280..96d88fc845 100644
--- a/modules/authorization/role-assignment/.test/mg.min/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/mg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'managementGroup'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/rg.common/main.test.bicep b/modules/authorization/role-assignment/.test/rg.common/main.test.bicep
index 624ac5f4ec..57afbad937 100644
--- a/modules/authorization/role-assignment/.test/rg.common/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/rg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/rg.min/main.test.bicep b/modules/authorization/role-assignment/.test/rg.min/main.test.bicep
index 10bfd6db80..62cdccccac 100644
--- a/modules/authorization/role-assignment/.test/rg.min/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/rg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/sub.common/main.test.bicep b/modules/authorization/role-assignment/.test/sub.common/main.test.bicep
index 3eabd37a63..96f2dede38 100644
--- a/modules/authorization/role-assignment/.test/sub.common/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/sub.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-assignment/.test/sub.min/main.test.bicep b/modules/authorization/role-assignment/.test/sub.min/main.test.bicep
index 17643fa7ff..20fc2149a8 100644
--- a/modules/authorization/role-assignment/.test/sub.min/main.test.bicep
+++ b/modules/authorization/role-assignment/.test/sub.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roleassignments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roleassignments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-definition/.test/rg.common/main.test.bicep b/modules/authorization/role-definition/.test/rg.common/main.test.bicep
index 5c357b3ed5..56f0ddfaa3 100644
--- a/modules/authorization/role-definition/.test/rg.common/main.test.bicep
+++ b/modules/authorization/role-definition/.test/rg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roledefinitions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roledefinitions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/authorization/role-definition/.test/rg.min/main.test.bicep b/modules/authorization/role-definition/.test/rg.min/main.test.bicep
index fa9d1c9379..63ce946cc0 100644
--- a/modules/authorization/role-definition/.test/rg.min/main.test.bicep
+++ b/modules/authorization/role-definition/.test/rg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.authorization.roledefinitions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-authorization.roledefinitions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/automation/automation-account/.test/common/main.test.bicep b/modules/automation/automation-account/.test/common/main.test.bicep
index b0ae64aef0..4abb71d751 100644
--- a/modules/automation/automation-account/.test/common/main.test.bicep
+++ b/modules/automation/automation-account/.test/common/main.test.bicep
@@ -1,250 +1,250 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.automation.account-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'aacom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- gallerySolutions: [
- {
- name: 'Updates'
- product: 'OMSGallery'
- publisher: 'Microsoft'
- }
- ]
- jobSchedules: [
- {
- runbookName: 'TestRunbook'
- scheduleName: 'TestSchedule'
- }
- ]
- disableLocalAuth: true
- linkedWorkspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- modules: [
- {
- name: 'PSWindowsUpdate'
- uri: 'https://www.powershellgallery.com/api/v2/package'
- version: 'latest'
- }
- ]
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- service: 'Webhook'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- {
- privateDnsZoneResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- service: 'DSCAndHybridWorker'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- runbooks: [
- {
- description: 'Test runbook'
- name: 'TestRunbook'
- type: 'PowerShell'
- uri: 'https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.automation/101-automation/scripts/AzureAutomationTutorial.ps1'
- version: '1.0.0.0'
- }
- ]
- schedules: [
- {
- advancedSchedule: {}
- expiryTime: '9999-12-31T13:00'
- frequency: 'Hour'
- interval: 12
- name: 'TestSchedule'
- startTime: ''
- timeZone: 'Europe/Berlin'
- }
- ]
- softwareUpdateConfigurations: [
- {
- excludeUpdates: [
- '123456'
- ]
- frequency: 'Month'
- includeUpdates: [
- '654321'
- ]
- interval: 1
- maintenanceWindow: 'PT4H'
- monthlyOccurrences: [
- {
- day: 'Friday'
- occurrence: 3
- }
- ]
- name: 'Windows_ZeroDay'
- operatingSystem: 'Windows'
- rebootSetting: 'IfRequired'
- scopeByTags: {
- Update: [
- 'Automatic-Wave1'
- ]
- }
- startTime: '22:00'
- updateClassifications: [
- 'Critical'
- 'Definition'
- 'FeaturePack'
- 'Security'
- 'ServicePack'
- 'Tools'
- 'UpdateRollup'
- 'Updates'
- ]
- }
- {
- excludeUpdates: [
- 'icacls'
- ]
- frequency: 'OneTime'
- includeUpdates: [
- 'kernel'
- ]
- maintenanceWindow: 'PT4H'
- name: 'Linux_ZeroDay'
- operatingSystem: 'Linux'
- rebootSetting: 'IfRequired'
- startTime: '22:00'
- updateClassifications: [
- 'Critical'
- 'Other'
- 'Security'
- ]
- }
- ]
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- variables: [
- {
- description: 'TestStringDescription'
- name: 'TestString'
- value: '\'TestString\''
- }
- {
- description: 'TestIntegerDescription'
- name: 'TestInteger'
- value: '500'
- }
- {
- description: 'TestBooleanDescription'
- name: 'TestBoolean'
- value: 'false'
- }
- {
- description: 'TestDateTimeDescription'
- isEncrypted: false
- name: 'TestDateTime'
- value: '\'\\/Date(1637934042656)\\/\''
- }
- {
- description: 'TestEncryptedDescription'
- name: 'TestEncryptedVariable'
- value: '\'TestEncryptedValue\''
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-automation.account-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'aacom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ gallerySolutions: [
+ {
+ name: 'Updates'
+ product: 'OMSGallery'
+ publisher: 'Microsoft'
+ }
+ ]
+ jobSchedules: [
+ {
+ runbookName: 'TestRunbook'
+ scheduleName: 'TestSchedule'
+ }
+ ]
+ disableLocalAuth: true
+ linkedWorkspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ modules: [
+ {
+ name: 'PSWindowsUpdate'
+ uri: 'https://www.powershellgallery.com/api/v2/package'
+ version: 'latest'
+ }
+ ]
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
+ service: 'Webhook'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ {
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
+ service: 'DSCAndHybridWorker'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ runbooks: [
+ {
+ description: 'Test runbook'
+ name: 'TestRunbook'
+ type: 'PowerShell'
+ uri: 'https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.automation/101-automation/scripts/AzureAutomationTutorial.ps1'
+ version: '1.0.0.0'
+ }
+ ]
+ schedules: [
+ {
+ advancedSchedule: {}
+ expiryTime: '9999-12-31T13:00'
+ frequency: 'Hour'
+ interval: 12
+ name: 'TestSchedule'
+ startTime: ''
+ timeZone: 'Europe/Berlin'
+ }
+ ]
+ softwareUpdateConfigurations: [
+ {
+ excludeUpdates: [
+ '123456'
+ ]
+ frequency: 'Month'
+ includeUpdates: [
+ '654321'
+ ]
+ interval: 1
+ maintenanceWindow: 'PT4H'
+ monthlyOccurrences: [
+ {
+ day: 'Friday'
+ occurrence: 3
+ }
+ ]
+ name: 'Windows_ZeroDay'
+ operatingSystem: 'Windows'
+ rebootSetting: 'IfRequired'
+ scopeByTags: {
+ Update: [
+ 'Automatic-Wave1'
+ ]
+ }
+ startTime: '22:00'
+ updateClassifications: [
+ 'Critical'
+ 'Definition'
+ 'FeaturePack'
+ 'Security'
+ 'ServicePack'
+ 'Tools'
+ 'UpdateRollup'
+ 'Updates'
+ ]
+ }
+ {
+ excludeUpdates: [
+ 'icacls'
+ ]
+ frequency: 'OneTime'
+ includeUpdates: [
+ 'kernel'
+ ]
+ maintenanceWindow: 'PT4H'
+ name: 'Linux_ZeroDay'
+ operatingSystem: 'Linux'
+ rebootSetting: 'IfRequired'
+ startTime: '22:00'
+ updateClassifications: [
+ 'Critical'
+ 'Other'
+ 'Security'
+ ]
+ }
+ ]
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ variables: [
+ {
+ description: 'TestStringDescription'
+ name: 'TestString'
+ value: '\'TestString\''
+ }
+ {
+ description: 'TestIntegerDescription'
+ name: 'TestInteger'
+ value: '500'
+ }
+ {
+ description: 'TestBooleanDescription'
+ name: 'TestBoolean'
+ value: 'false'
+ }
+ {
+ description: 'TestDateTimeDescription'
+ isEncrypted: false
+ name: 'TestDateTime'
+ value: '\'\\/Date(1637934042656)\\/\''
+ }
+ {
+ description: 'TestEncryptedDescription'
+ name: 'TestEncryptedVariable'
+ value: '\'TestEncryptedValue\''
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/automation/automation-account/.test/encr/main.test.bicep b/modules/automation/automation-account/.test/encr/main.test.bicep
index 4a4e476170..8fa4abaa5d 100644
--- a/modules/automation/automation-account/.test/encr/main.test.bicep
+++ b/modules/automation/automation-account/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.automation.account-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-automation.account-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/automation/automation-account/.test/min/main.test.bicep b/modules/automation/automation-account/.test/min/main.test.bicep
index 3156e8971b..775f93260b 100644
--- a/modules/automation/automation-account/.test/min/main.test.bicep
+++ b/modules/automation/automation-account/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.automation.account-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-automation.account-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/batch/batch-account/.test/common/main.test.bicep b/modules/batch/batch-account/.test/common/main.test.bicep
index 0c9dc0bec0..f579e79863 100644
--- a/modules/batch/batch-account/.test/common/main.test.bicep
+++ b/modules/batch/batch-account/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.batch.batchaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-batch.batchaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/batch/batch-account/.test/encr/main.test.bicep b/modules/batch/batch-account/.test/encr/main.test.bicep
index 5aebae0710..19c638ffcc 100644
--- a/modules/batch/batch-account/.test/encr/main.test.bicep
+++ b/modules/batch/batch-account/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.batch.batchaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-batch.batchaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/batch/batch-account/.test/min/main.test.bicep b/modules/batch/batch-account/.test/min/main.test.bicep
index 8d213101ab..4e9f4bd0f4 100644
--- a/modules/batch/batch-account/.test/min/main.test.bicep
+++ b/modules/batch/batch-account/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.batch.batchaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-batch.batchaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cache/redis-enterprise/.test/common/main.test.bicep b/modules/cache/redis-enterprise/.test/common/main.test.bicep
index ec84ed832c..7e5df4fdfb 100644
--- a/modules/cache/redis-enterprise/.test/common/main.test.bicep
+++ b/modules/cache/redis-enterprise/.test/common/main.test.bicep
@@ -1,130 +1,131 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.cache.redisenterprise-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'crecom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- capacity: 2
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- diagnosticSettingsName: 'redisdiagnostics'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- minimumTlsVersion: '1.2'
- zoneRedundant: true
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
-
- nestedDependencies.outputs.privateDNSZoneResourceId
-
- ]
- service: 'redisEnterprise'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- databases: [
- {
- clusteringPolicy: 'EnterpriseCluster'
- evictionPolicy: 'AllKeysLFU'
- modules: [
- {
- name: 'RedisBloom'
- }
- {
- name: 'RedisTimeSeries'
- args: 'RETENTION_POLICY 20'
- }
- ]
- persistenceAofEnabled: true
- persistenceAofFrequency: '1s'
- persistenceRdbEnabled: false
- port: 10000
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- resourceType: 'Redis Cache Enterprise'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-cache.redisenterprise-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'crecom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ capacity: 2
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ diagnosticSettingsName: 'redisdiagnostics'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ minimumTlsVersion: '1.2'
+ zoneRedundant: true
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+
+ nestedDependencies.outputs.privateDNSZoneResourceId
+
+ ]
+ service: 'redisEnterprise'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ databases: [
+ {
+ clusteringPolicy: 'EnterpriseCluster'
+ evictionPolicy: 'AllKeysLFU'
+ modules: [
+ {
+ name: 'RedisBloom'
+ }
+ {
+ name: 'RedisTimeSeries'
+ args: 'RETENTION_POLICY 20'
+ }
+ ]
+ persistenceAofEnabled: true
+ persistenceAofFrequency: '1s'
+ persistenceRdbEnabled: false
+ port: 10000
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ resourceType: 'Redis Cache Enterprise'
+ }
+ }
+}
+
diff --git a/modules/cache/redis-enterprise/.test/geo/main.test.bicep b/modules/cache/redis-enterprise/.test/geo/main.test.bicep
index 492bd50848..6bf434e55f 100644
--- a/modules/cache/redis-enterprise/.test/geo/main.test.bicep
+++ b/modules/cache/redis-enterprise/.test/geo/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cache.redisenterprise-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cache.redisenterprise-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cache/redis-enterprise/.test/min/main.test.bicep b/modules/cache/redis-enterprise/.test/min/main.test.bicep
index 19ab84407e..768b4cb167 100644
--- a/modules/cache/redis-enterprise/.test/min/main.test.bicep
+++ b/modules/cache/redis-enterprise/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cache.redisenterprise-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cache.redisenterprise-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cache/redis/.test/common/main.test.bicep b/modules/cache/redis/.test/common/main.test.bicep
index 04f213bff5..2b0142168f 100644
--- a/modules/cache/redis/.test/common/main.test.bicep
+++ b/modules/cache/redis/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cache.redis-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cache.redis-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cache/redis/.test/min/main.test.bicep b/modules/cache/redis/.test/min/main.test.bicep
index 4ab171428a..f2bdf186e7 100644
--- a/modules/cache/redis/.test/min/main.test.bicep
+++ b/modules/cache/redis/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cache.redis-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cache.redis-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cdn/profile/.test/afd/main.test.bicep b/modules/cdn/profile/.test/afd/main.test.bicep
index 97e2a2db80..ea900ffaad 100644
--- a/modules/cdn/profile/.test/afd/main.test.bicep
+++ b/modules/cdn/profile/.test/afd/main.test.bicep
@@ -1,132 +1,132 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.cdn.profiles-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdnpafd'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}cdnstore${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- name: 'dep-${namePrefix}-test-${serviceShort}'
- location: 'global'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- originResponseTimeoutSeconds: 60
- sku: 'Standard_AzureFrontDoor'
- enableDefaultTelemetry: enableDefaultTelemetry
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- customDomains: [
- {
- name: 'dep-${namePrefix}-test-${serviceShort}-custom-domain'
- hostName: 'dep-${namePrefix}-test-${serviceShort}-custom-domain.azurewebsites.net'
- certificateType: 'ManagedCertificate'
- }
- ]
- origionGroups: [
- {
- name: 'dep-${namePrefix}-test-${serviceShort}-origin-group'
- loadBalancingSettings: {
- additionalLatencyInMilliseconds: 50
- sampleSize: 4
- successfulSamplesRequired: 3
- }
- origins: [
- {
- name: 'dep-${namePrefix}-test-${serviceShort}-origin'
- hostName: 'dep-${namePrefix}-test-${serviceShort}-origin.azurewebsites.net'
- }
- ]
- }
- ]
- ruleSets: [
- {
- name: 'dep${namePrefix}test${serviceShort}ruleset'
- rules: [
- {
- name: 'dep${namePrefix}test${serviceShort}rule'
- order: 1
- actions: [
- {
- name: 'UrlRedirect'
- parameters: {
- typeName: 'DeliveryRuleUrlRedirectActionParameters'
- redirectType: 'PermanentRedirect'
- destinationProtocol: 'Https'
- customPath: '/test123'
- customHostname: 'dev-etradefd.trade.azure.defra.cloud'
- }
- }
- ]
- }
- ]
- }
- ]
- afdEndpoints: [
- {
- name: 'dep-${namePrefix}-test-${serviceShort}-afd-endpoint'
- routes: [
- {
- name: 'dep-${namePrefix}-test-${serviceShort}-afd-route'
- originGroupName: 'dep-${namePrefix}-test-${serviceShort}-origin-group'
- customDomainName: 'dep-${namePrefix}-test-${serviceShort}-custom-domain'
- ruleSets: [
- {
- name: 'dep${namePrefix}test${serviceShort}ruleset'
- }
- ]
- }
- ]
- }
- ]
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-cdn.profiles-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdnpafd'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}cdnstore${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ name: 'dep-${namePrefix}-test-${serviceShort}'
+ location: 'global'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ originResponseTimeoutSeconds: 60
+ sku: 'Standard_AzureFrontDoor'
+ enableDefaultTelemetry: enableDefaultTelemetry
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ customDomains: [
+ {
+ name: 'dep-${namePrefix}-test-${serviceShort}-custom-domain'
+ hostName: 'dep-${namePrefix}-test-${serviceShort}-custom-domain.azurewebsites.net'
+ certificateType: 'ManagedCertificate'
+ }
+ ]
+ origionGroups: [
+ {
+ name: 'dep-${namePrefix}-test-${serviceShort}-origin-group'
+ loadBalancingSettings: {
+ additionalLatencyInMilliseconds: 50
+ sampleSize: 4
+ successfulSamplesRequired: 3
+ }
+ origins: [
+ {
+ name: 'dep-${namePrefix}-test-${serviceShort}-origin'
+ hostName: 'dep-${namePrefix}-test-${serviceShort}-origin.azurewebsites.net'
+ }
+ ]
+ }
+ ]
+ ruleSets: [
+ {
+ name: 'dep${namePrefix}test${serviceShort}ruleset'
+ rules: [
+ {
+ name: 'dep${namePrefix}test${serviceShort}rule'
+ order: 1
+ actions: [
+ {
+ name: 'UrlRedirect'
+ parameters: {
+ typeName: 'DeliveryRuleUrlRedirectActionParameters'
+ redirectType: 'PermanentRedirect'
+ destinationProtocol: 'Https'
+ customPath: '/test123'
+ customHostname: 'dev-etradefd.trade.azure.defra.cloud'
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ afdEndpoints: [
+ {
+ name: 'dep-${namePrefix}-test-${serviceShort}-afd-endpoint'
+ routes: [
+ {
+ name: 'dep-${namePrefix}-test-${serviceShort}-afd-route'
+ originGroupName: 'dep-${namePrefix}-test-${serviceShort}-origin-group'
+ customDomainName: 'dep-${namePrefix}-test-${serviceShort}-custom-domain'
+ ruleSets: [
+ {
+ name: 'dep${namePrefix}test${serviceShort}ruleset'
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/modules/cdn/profile/.test/common/main.test.bicep b/modules/cdn/profile/.test/common/main.test.bicep
index 6846ec0476..1bcb6228f0 100644
--- a/modules/cdn/profile/.test/common/main.test.bicep
+++ b/modules/cdn/profile/.test/common/main.test.bicep
@@ -1,102 +1,102 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.cdn.profiles-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdnpcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}cdnstore${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- name: 'dep-${namePrefix}-test-${serviceShort}'
- location: location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- originResponseTimeoutSeconds: 60
- sku: 'Standard_Verizon'
- enableDefaultTelemetry: enableDefaultTelemetry
- endpointProperties: {
- originHostHeader: '${nestedDependencies.outputs.storageAccountName}.blob.${environment().suffixes.storage}'
- contentTypesToCompress: [
- 'text/plain'
- 'text/html'
- 'text/css'
- 'text/javascript'
- 'application/x-javascript'
- 'application/javascript'
- 'application/json'
- 'application/xml'
- ]
- isCompressionEnabled: true
- isHttpAllowed: true
- isHttpsAllowed: true
- queryStringCachingBehavior: 'IgnoreQueryString'
- origins: [
- {
- name: 'dep-${namePrefix}-cdn-endpoint01'
- properties: {
- hostName: '${nestedDependencies.outputs.storageAccountName}.blob.${environment().suffixes.storage}'
- httpPort: 80
- httpsPort: 443
- enabled: true
- }
- }
- ]
- originGroups: []
- geoFilters: []
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-cdn.profiles-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdnpcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}cdnstore${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ name: 'dep-${namePrefix}-test-${serviceShort}'
+ location: location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ originResponseTimeoutSeconds: 60
+ sku: 'Standard_Verizon'
+ enableDefaultTelemetry: enableDefaultTelemetry
+ endpointProperties: {
+ originHostHeader: '${nestedDependencies.outputs.storageAccountName}.blob.${environment().suffixes.storage}'
+ contentTypesToCompress: [
+ 'text/plain'
+ 'text/html'
+ 'text/css'
+ 'text/javascript'
+ 'application/x-javascript'
+ 'application/javascript'
+ 'application/json'
+ 'application/xml'
+ ]
+ isCompressionEnabled: true
+ isHttpAllowed: true
+ isHttpsAllowed: true
+ queryStringCachingBehavior: 'IgnoreQueryString'
+ origins: [
+ {
+ name: 'dep-${namePrefix}-cdn-endpoint01'
+ properties: {
+ hostName: '${nestedDependencies.outputs.storageAccountName}.blob.${environment().suffixes.storage}'
+ httpPort: 80
+ httpsPort: 443
+ enabled: true
+ }
+ }
+ ]
+ originGroups: []
+ geoFilters: []
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ }
+}
diff --git a/modules/cognitive-services/account/.test/common/main.test.bicep b/modules/cognitive-services/account/.test/common/main.test.bicep
index 5f9a58f7df..3f94c31fd7 100644
--- a/modules/cognitive-services/account/.test/common/main.test.bicep
+++ b/modules/cognitive-services/account/.test/common/main.test.bicep
@@ -1,127 +1,127 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.cognitiveservices.accounts-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'csacom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- kind: 'Face'
- customSubDomainName: '${namePrefix}xdomain'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- networkAcls: {
- defaultAction: 'Deny'
- ipRules: [
- {
- value: '40.74.28.0/23'
- }
- ]
- virtualNetworkRules: [
- {
- id: nestedDependencies.outputs.subnetResourceId
- ignoreMissingVnetServiceEndpoint: false
- }
- ]
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sku: 'S0'
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- service: 'account'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-cognitiveservices.accounts-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'csacom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ kind: 'Face'
+ customSubDomainName: '${namePrefix}xdomain'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ networkAcls: {
+ defaultAction: 'Deny'
+ ipRules: [
+ {
+ value: '40.74.28.0/23'
+ }
+ ]
+ virtualNetworkRules: [
+ {
+ id: nestedDependencies.outputs.subnetResourceId
+ ignoreMissingVnetServiceEndpoint: false
+ }
+ ]
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sku: 'S0'
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
+ service: 'account'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/cognitive-services/account/.test/encr/main.test.bicep b/modules/cognitive-services/account/.test/encr/main.test.bicep
index 06468b33b2..ad4bdf6ad6 100644
--- a/modules/cognitive-services/account/.test/encr/main.test.bicep
+++ b/modules/cognitive-services/account/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cognitiveservices.accounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cognitiveservices.accounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cognitive-services/account/.test/min/main.test.bicep b/modules/cognitive-services/account/.test/min/main.test.bicep
index c24b67f868..82892d7e39 100644
--- a/modules/cognitive-services/account/.test/min/main.test.bicep
+++ b/modules/cognitive-services/account/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cognitiveservices.accounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cognitiveservices.accounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/cognitive-services/account/.test/speech/main.test.bicep b/modules/cognitive-services/account/.test/speech/main.test.bicep
index 7bb871851f..c341a3d3cb 100644
--- a/modules/cognitive-services/account/.test/speech/main.test.bicep
+++ b/modules/cognitive-services/account/.test/speech/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.cognitiveservices.accounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-cognitiveservices.accounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/availability-set/.test/common/main.test.bicep b/modules/compute/availability-set/.test/common/main.test.bicep
index a82280e4e5..e4d37ca872 100644
--- a/modules/compute/availability-set/.test/common/main.test.bicep
+++ b/modules/compute/availability-set/.test/common/main.test.bicep
@@ -1,75 +1,75 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.availabilitysets-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cascom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.availabilitysets-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cascom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/availability-set/.test/min/main.test.bicep b/modules/compute/availability-set/.test/min/main.test.bicep
index 9160e72cc4..0881b94536 100644
--- a/modules/compute/availability-set/.test/min/main.test.bicep
+++ b/modules/compute/availability-set/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.availabilitysets-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.availabilitysets-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep b/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep
index c3089e3cb5..3b0e1e4c7e 100644
--- a/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep
+++ b/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep
@@ -1,77 +1,77 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.diskencryptionsets-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdesap'
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- keyName: nestedDependencies.outputs.keyName
- keyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.diskencryptionsets-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdesap'
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ keyName: nestedDependencies.outputs.keyName
+ keyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/disk-encryption-set/.test/common/main.test.bicep b/modules/compute/disk-encryption-set/.test/common/main.test.bicep
index f098a1a7a3..6bea195aca 100644
--- a/modules/compute/disk-encryption-set/.test/common/main.test.bicep
+++ b/modules/compute/disk-encryption-set/.test/common/main.test.bicep
@@ -1,84 +1,84 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.diskencryptionsets-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdescom'
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- keyName: nestedDependencies.outputs.keyName
- keyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: false
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.diskencryptionsets-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdescom'
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ keyName: nestedDependencies.outputs.keyName
+ keyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: false
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/disk/.test/common/main.test.bicep b/modules/compute/disk/.test/common/main.test.bicep
index dfa0b2c401..6585ab265f 100644
--- a/modules/compute/disk/.test/common/main.test.bicep
+++ b/modules/compute/disk/.test/common/main.test.bicep
@@ -1,79 +1,79 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.images-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}-${serviceShort}001'
- sku: 'UltraSSD_LRS'
- diskIOPSReadWrite: 500
- diskMBpsReadWrite: 60
- diskSizeGB: 128
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- logicalSectorSize: 512
- osType: 'Windows'
- publicNetworkAccess: 'Enabled'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.images-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}-${serviceShort}001'
+ sku: 'UltraSSD_LRS'
+ diskIOPSReadWrite: 500
+ diskMBpsReadWrite: 60
+ diskSizeGB: 128
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ logicalSectorSize: 512
+ osType: 'Windows'
+ publicNetworkAccess: 'Enabled'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/disk/.test/image/main.test.bicep b/modules/compute/disk/.test/image/main.test.bicep
index faebcf95c8..d811fa984d 100644
--- a/modules/compute/disk/.test/image/main.test.bicep
+++ b/modules/compute/disk/.test/image/main.test.bicep
@@ -1,68 +1,68 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.images-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdimg'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}-${serviceShort}001'
- sku: 'Standard_LRS'
- createOption: 'FromImage'
- imageReferenceId: '${subscription().id}/Providers/Microsoft.Compute/Locations/westeurope/Publishers/MicrosoftWindowsServer/ArtifactTypes/VMImage/Offers/WindowsServer/Skus/2022-datacenter-azure-edition/Versions/20348.1006.220908'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.images-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdimg'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}-${serviceShort}001'
+ sku: 'Standard_LRS'
+ createOption: 'FromImage'
+ imageReferenceId: '${subscription().id}/Providers/Microsoft.Compute/Locations/westeurope/Publishers/MicrosoftWindowsServer/ArtifactTypes/VMImage/Offers/WindowsServer/Skus/2022-datacenter-azure-edition/Versions/20348.1006.220908'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/disk/.test/import/main.test.bicep b/modules/compute/disk/.test/import/main.test.bicep
index 5c55c1a820..bec7da7f0b 100644
--- a/modules/compute/disk/.test/import/main.test.bicep
+++ b/modules/compute/disk/.test/import/main.test.bicep
@@ -1,73 +1,73 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.images-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cdimp'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
- imageTemplateNamePrefix: 'dep-${namePrefix}-imgt-${serviceShort}'
- triggerImageDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-triggerImageTemplate'
- copyVhdDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-copyVhdToStorage'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}-${serviceShort}001'
- sku: 'Standard_LRS'
- createOption: 'Import'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sourceUri: nestedDependencies.outputs.vhdUri
- storageAccountId: nestedDependencies.outputs.storageAccountResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.images-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cdimp'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
+ imageTemplateNamePrefix: 'dep-${namePrefix}-imgt-${serviceShort}'
+ triggerImageDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-triggerImageTemplate'
+ copyVhdDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-copyVhdToStorage'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}-${serviceShort}001'
+ sku: 'Standard_LRS'
+ createOption: 'Import'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sourceUri: nestedDependencies.outputs.vhdUri
+ storageAccountId: nestedDependencies.outputs.storageAccountResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/disk/.test/min/main.test.bicep b/modules/compute/disk/.test/min/main.test.bicep
index 6a69bbe644..00ddc7f8c9 100644
--- a/modules/compute/disk/.test/min/main.test.bicep
+++ b/modules/compute/disk/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.images-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.images-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/gallery/.test/common/main.test.bicep b/modules/compute/gallery/.test/common/main.test.bicep
index 82c3104ba6..9cb9aa0b51 100644
--- a/modules/compute/gallery/.test/common/main.test.bicep
+++ b/modules/compute/gallery/.test/common/main.test.bicep
@@ -1,190 +1,195 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cgcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- applications: [
- {
- name: '${namePrefix}-${serviceShort}-appd-001'
- }
- {
- name: '${namePrefix}-${serviceShort}-appd-002'
- supportedOSType: 'Windows'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- }
- ]
- images: [
- {
- name: '${namePrefix}-az-imgd-ws-001'
- }
- {
- hyperVGeneration: 'V1'
- maxRecommendedMemory: 16
- maxRecommendedvCPUs: 8
- minRecommendedMemory: 4
- minRecommendedvCPUs: 2
- name: '${namePrefix}-az-imgd-ws-002'
- offer: 'WindowsServer'
- osState: 'Generalized'
- osType: 'Windows'
- publisher: 'MicrosoftWindowsServer'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sku: '2022-datacenter-azure-edition'
- }
- {
- hyperVGeneration: 'V2'
- isHibernateSupported: 'true'
- maxRecommendedMemory: 16
- maxRecommendedvCPUs: 8
- minRecommendedMemory: 4
- minRecommendedvCPUs: 2
- name: '${namePrefix}-az-imgd-ws-003'
- offer: 'WindowsServer'
- osState: 'Generalized'
- osType: 'Windows'
- publisher: 'MicrosoftWindowsServer'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sku: '2022-datacenter-azure-edition-hibernate'
- }
- {
- hyperVGeneration: 'V2'
- isAcceleratedNetworkSupported: 'true'
- maxRecommendedMemory: 16
- maxRecommendedvCPUs: 8
- minRecommendedMemory: 4
- minRecommendedvCPUs: 2
- name: '${namePrefix}-az-imgd-ws-004'
- offer: 'WindowsServer'
- osState: 'Generalized'
- osType: 'Windows'
- publisher: 'MicrosoftWindowsServer'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sku: '2022-datacenter-azure-edition-accnet'
- }
- {
- hyperVGeneration: 'V2'
- securityType: 'TrustedLaunch'
- maxRecommendedMemory: 16
- maxRecommendedvCPUs: 4
- minRecommendedMemory: 4
- minRecommendedvCPUs: 2
- name: '${namePrefix}-az-imgd-wdtl-002'
- offer: 'WindowsDesktop'
- osState: 'Generalized'
- osType: 'Windows'
- publisher: 'MicrosoftWindowsDesktop'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sku: 'Win11-21H2'
- }
- {
- hyperVGeneration: 'V2'
- maxRecommendedMemory: 32
- maxRecommendedvCPUs: 4
- minRecommendedMemory: 4
- minRecommendedvCPUs: 1
- name: '${namePrefix}-az-imgd-us-001'
- offer: '0001-com-ubuntu-server-focal'
- osState: 'Generalized'
- osType: 'Linux'
- publisher: 'canonical'
- sku: '20_04-lts-gen2'
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.galleries-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cgcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ applications: [
+ {
+ name: '${namePrefix}-${serviceShort}-appd-001'
+ }
+ {
+ name: '${namePrefix}-${serviceShort}-appd-002'
+ supportedOSType: 'Windows'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ }
+ ]
+ images: [
+ {
+ name: '${namePrefix}-az-imgd-ws-001'
+ }
+ {
+ hyperVGeneration: 'V1'
+ maxRecommendedMemory: 16
+ maxRecommendedvCPUs: 8
+ minRecommendedMemory: 4
+ minRecommendedvCPUs: 2
+ name: '${namePrefix}-az-imgd-ws-002'
+ offer: 'WindowsServer'
+ osState: 'Generalized'
+ osType: 'Windows'
+ publisher: 'MicrosoftWindowsServer'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sku: '2022-datacenter-azure-edition'
+ }
+ {
+ hyperVGeneration: 'V2'
+ isHibernateSupported: 'true'
+ maxRecommendedMemory: 16
+ maxRecommendedvCPUs: 8
+ minRecommendedMemory: 4
+ minRecommendedvCPUs: 2
+ name: '${namePrefix}-az-imgd-ws-003'
+ offer: 'WindowsServer'
+ osState: 'Generalized'
+ osType: 'Windows'
+ publisher: 'MicrosoftWindowsServer'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sku: '2022-datacenter-azure-edition-hibernate'
+ }
+ {
+ hyperVGeneration: 'V2'
+ isAcceleratedNetworkSupported: 'true'
+ maxRecommendedMemory: 16
+ maxRecommendedvCPUs: 8
+ minRecommendedMemory: 4
+ minRecommendedvCPUs: 2
+ name: '${namePrefix}-az-imgd-ws-004'
+ offer: 'WindowsServer'
+ osState: 'Generalized'
+ osType: 'Windows'
+ publisher: 'MicrosoftWindowsServer'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sku: '2022-datacenter-azure-edition-accnet'
+ }
+ {
+ hyperVGeneration: 'V2'
+ securityType: 'TrustedLaunch'
+ maxRecommendedMemory: 16
+ maxRecommendedvCPUs: 4
+ minRecommendedMemory: 4
+ minRecommendedvCPUs: 2
+ name: '${namePrefix}-az-imgd-wdtl-002'
+ offer: 'WindowsDesktop'
+ osState: 'Generalized'
+ osType: 'Windows'
+ publisher: 'MicrosoftWindowsDesktop'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sku: 'Win11-21H2'
+ }
+ {
+ hyperVGeneration: 'V2'
+ maxRecommendedMemory: 32
+ maxRecommendedvCPUs: 4
+ minRecommendedMemory: 4
+ minRecommendedvCPUs: 1
+ name: '${namePrefix}-az-imgd-us-001'
+ offer: '0001-com-ubuntu-server-focal'
+ osState: 'Generalized'
+ osType: 'Linux'
+ publisher: 'canonical'
+ sku: '20_04-lts-gen2'
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/gallery/.test/min/main.test.bicep b/modules/compute/gallery/.test/min/main.test.bicep
index 363ba87906..86f8f257b5 100644
--- a/modules/compute/gallery/.test/min/main.test.bicep
+++ b/modules/compute/gallery/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.galleries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/image/.test/common/main.test.bicep b/modules/compute/image/.test/common/main.test.bicep
index b7e33ae82f..14b3372fa4 100644
--- a/modules/compute/image/.test/common/main.test.bicep
+++ b/modules/compute/image/.test/common/main.test.bicep
@@ -1,87 +1,87 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.images-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cicom'
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
- imageTemplateNamePrefix: 'dep-${namePrefix}-imgt-${serviceShort}'
- triggerImageDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-triggerImageTemplate'
- copyVhdDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-copyVhdToStorage'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- osAccountType: 'Premium_LRS'
- osDiskBlobUri: nestedDependencies.outputs.vhdUri
- osDiskCaching: 'ReadWrite'
- osType: 'Windows'
- hyperVGeneration: 'V1'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- zoneResilient: true
- diskEncryptionSetResourceId: nestedDependencies.outputs.diskEncryptionSetResourceId
- osState: 'Generalized'
- diskSizeGB: 128
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- tagA: 'You\'re it'
- tagB: 'Player'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.images-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cicom'
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
+ imageTemplateNamePrefix: 'dep-${namePrefix}-imgt-${serviceShort}'
+ triggerImageDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-triggerImageTemplate'
+ copyVhdDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}-copyVhdToStorage'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ osAccountType: 'Premium_LRS'
+ osDiskBlobUri: nestedDependencies.outputs.vhdUri
+ osDiskCaching: 'ReadWrite'
+ osType: 'Windows'
+ hyperVGeneration: 'V1'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ zoneResilient: true
+ diskEncryptionSetResourceId: nestedDependencies.outputs.diskEncryptionSetResourceId
+ osState: 'Generalized'
+ diskSizeGB: 128
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ tagA: 'You\'re it'
+ tagB: 'Player'
+ }
+ }
+}
diff --git a/modules/compute/proximity-placement-group/.test/common/main.test.bicep b/modules/compute/proximity-placement-group/.test/common/main.test.bicep
index ebd18b054a..1afa2b0789 100644
--- a/modules/compute/proximity-placement-group/.test/common/main.test.bicep
+++ b/modules/compute/proximity-placement-group/.test/common/main.test.bicep
@@ -1,89 +1,89 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.proximityplacementgroups-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cppgcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- zones: [
- '1'
- ]
- type: 'Standard'
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- TagA: 'Would you kindly...'
- TagB: 'Tags for sale'
- }
- colocationStatus: {
- code: 'ColocationStatus/Aligned'
- displayStatus: 'Aligned'
- level: 'Info'
- message: 'I\'m a default error message'
- }
- intent: {
- vmSizes: [
- 'Standard_B1ms'
- 'Standard_B4ms'
- ]
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.proximityplacementgroups-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cppgcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ zones: [
+ '1'
+ ]
+ type: 'Standard'
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ TagA: 'Would you kindly...'
+ TagB: 'Tags for sale'
+ }
+ colocationStatus: {
+ code: 'ColocationStatus/Aligned'
+ displayStatus: 'Aligned'
+ level: 'Info'
+ message: 'I\'m a default error message'
+ }
+ intent: {
+ vmSizes: [
+ 'Standard_B1ms'
+ 'Standard_B4ms'
+ ]
+ }
+ }
+}
diff --git a/modules/compute/proximity-placement-group/.test/min/main.test.bicep b/modules/compute/proximity-placement-group/.test/min/main.test.bicep
index cb745a8bda..1805333d13 100644
--- a/modules/compute/proximity-placement-group/.test/min/main.test.bicep
+++ b/modules/compute/proximity-placement-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.proximityplacementgroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.proximityplacementgroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/ssh-public-key/.test/common/main.test.bicep b/modules/compute/ssh-public-key/.test/common/main.test.bicep
index f20494fb87..f40946b0cf 100644
--- a/modules/compute/ssh-public-key/.test/common/main.test.bicep
+++ b/modules/compute/ssh-public-key/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.sshPublicKeys-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.sshPublicKeys-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/ssh-public-key/.test/min/main.test.bicep b/modules/compute/ssh-public-key/.test/min/main.test.bicep
index dfc7cdd0ec..02a014853b 100644
--- a/modules/compute/ssh-public-key/.test/min/main.test.bicep
+++ b/modules/compute/ssh-public-key/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.sshPublicKeys-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.sshPublicKeys-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep
index da12188343..3e94abd26d 100644
--- a/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualmachinescalesets-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualmachinescalesets-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep
index ecd4107f17..e78d392469 100644
--- a/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualmachinescalesets-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualmachinescalesets-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep
index 66ed49e535..42e5492661 100644
--- a/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep
@@ -1,197 +1,197 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualmachinescalesets-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cvmsslin'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
- storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
- sshDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- sshKeyName: 'dep-${namePrefix}-ssh-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- adminUsername: 'scaleSetAdmin'
- imageReference: {
- publisher: 'Canonical'
- offer: '0001-com-ubuntu-server-jammy'
- sku: '22_04-lts-gen2'
- version: 'latest'
- }
- osDisk: {
- createOption: 'fromImage'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- osType: 'Linux'
- skuName: 'Standard_B12ms'
- availabilityZones: [
- '2'
- ]
- bootDiagnosticStorageAccountName: nestedDependencies.outputs.storageAccountName
- dataDisks: [
- {
- caching: 'ReadOnly'
- createOption: 'Empty'
- diskSizeGB: '256'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- {
- caching: 'ReadOnly'
- createOption: 'Empty'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- disablePasswordAuthentication: true
- encryptionAtHost: false
- extensionCustomScriptConfig: {
- enabled: true
- fileData: [
- {
- storageAccountId: nestedDependencies.outputs.storageAccountResourceId
- uri: nestedDependencies.outputs.storageAccountCSEFileUrl
- }
- ]
- protectedSettings: {
- commandToExecute: 'sudo apt-get update'
- }
- }
- extensionDependencyAgentConfig: {
- enabled: true
- }
- extensionAzureDiskEncryptionConfig: {
- enabled: true
- settings: {
- EncryptionOperation: 'EnableEncryption'
- KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyEncryptionAlgorithm: 'RSA-OAEP'
- KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
- KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
- ResizeOSDisk: 'false'
- VolumeType: 'All'
- }
- }
- extensionMonitoringAgentConfig: {
- enabled: true
- }
- extensionNetworkWatcherAgentConfig: {
- enabled: true
- }
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- nicConfigurations: [
- {
- ipConfigurations: [
- {
- name: 'ipconfig1'
- properties: {
- subnet: {
- id: nestedDependencies.outputs.subnetResourceId
- }
- }
- }
- ]
- nicSuffix: '-nic01'
- }
- ]
- publicKeys: [
- {
- keyData: nestedDependencies.outputs.SSHKeyPublicKey
- path: '/home/scaleSetAdmin/.ssh/authorized_keys'
- }
- ]
- roleAssignments: [
- {
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- roleDefinitionIdOrName: 'Reader'
- }
- ]
- scaleSetFaultDomain: 1
- skuCapacity: 1
- systemAssignedIdentity: true
- upgradePolicyMode: 'Manual'
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- vmNamePrefix: 'vmsslinvm'
- vmPriority: 'Regular'
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualmachinescalesets-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cvmsslin'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
+ storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
+ sshDeploymentScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ sshKeyName: 'dep-${namePrefix}-ssh-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ adminUsername: 'scaleSetAdmin'
+ imageReference: {
+ publisher: 'Canonical'
+ offer: '0001-com-ubuntu-server-jammy'
+ sku: '22_04-lts-gen2'
+ version: 'latest'
+ }
+ osDisk: {
+ createOption: 'fromImage'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ osType: 'Linux'
+ skuName: 'Standard_B12ms'
+ availabilityZones: [
+ '2'
+ ]
+ bootDiagnosticStorageAccountName: nestedDependencies.outputs.storageAccountName
+ dataDisks: [
+ {
+ caching: 'ReadOnly'
+ createOption: 'Empty'
+ diskSizeGB: '256'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ {
+ caching: 'ReadOnly'
+ createOption: 'Empty'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ disablePasswordAuthentication: true
+ encryptionAtHost: false
+ extensionCustomScriptConfig: {
+ enabled: true
+ fileData: [
+ {
+ storageAccountId: nestedDependencies.outputs.storageAccountResourceId
+ uri: nestedDependencies.outputs.storageAccountCSEFileUrl
+ }
+ ]
+ protectedSettings: {
+ commandToExecute: 'sudo apt-get update'
+ }
+ }
+ extensionDependencyAgentConfig: {
+ enabled: true
+ }
+ extensionAzureDiskEncryptionConfig: {
+ enabled: true
+ settings: {
+ EncryptionOperation: 'EnableEncryption'
+ KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyEncryptionAlgorithm: 'RSA-OAEP'
+ KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
+ KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
+ ResizeOSDisk: 'false'
+ VolumeType: 'All'
+ }
+ }
+ extensionMonitoringAgentConfig: {
+ enabled: true
+ }
+ extensionNetworkWatcherAgentConfig: {
+ enabled: true
+ }
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ nicConfigurations: [
+ {
+ ipConfigurations: [
+ {
+ name: 'ipconfig1'
+ properties: {
+ subnet: {
+ id: nestedDependencies.outputs.subnetResourceId
+ }
+ }
+ }
+ ]
+ nicSuffix: '-nic01'
+ }
+ ]
+ publicKeys: [
+ {
+ keyData: nestedDependencies.outputs.SSHKeyPublicKey
+ path: '/home/scaleSetAdmin/.ssh/authorized_keys'
+ }
+ ]
+ roleAssignments: [
+ {
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ roleDefinitionIdOrName: 'Reader'
+ }
+ ]
+ scaleSetFaultDomain: 1
+ skuCapacity: 1
+ systemAssignedIdentity: true
+ upgradePolicyMode: 'Manual'
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ vmNamePrefix: 'vmsslinvm'
+ vmPriority: 'Regular'
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep
index 9ca365743e..9beeb880a2 100644
--- a/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualmachinescalesets-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualmachinescalesets-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep
index b4e0eca794..ad9e06de2e 100644
--- a/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep
@@ -1,193 +1,193 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualmachinescalesets-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cvmsswin'
-
-@description('Optional. The password to leverage for the login.')
-@secure()
-param password string = newGuid()
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
- storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
- proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- adminUsername: 'localAdminUser'
- imageReference: {
- publisher: 'MicrosoftWindowsServer'
- offer: 'WindowsServer'
- sku: '2022-datacenter-azure-edition'
- version: 'latest'
- }
- osDisk: {
- createOption: 'fromImage'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- osType: 'Windows'
- skuName: 'Standard_B12ms'
- adminPassword: password
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- encryptionAtHost: false
- extensionAntiMalwareConfig: {
- enabled: true
- settings: {
- AntimalwareEnabled: true
- Exclusions: {
- Extensions: '.log;.ldf'
- Paths: 'D:\\IISlogs;D:\\DatabaseLogs'
- Processes: 'mssence.svc'
- }
- RealtimeProtectionEnabled: true
- ScheduledScanSettings: {
- day: '7'
- isEnabled: 'true'
- scanType: 'Quick'
- time: '120'
- }
- }
- }
- extensionCustomScriptConfig: {
- enabled: true
- fileData: [
- {
- storageAccountId: nestedDependencies.outputs.storageAccountResourceId
- uri: nestedDependencies.outputs.storageAccountCSEFileUrl
- }
- ]
- protectedSettings: {
- commandToExecute: 'powershell -ExecutionPolicy Unrestricted -Command "& ./${nestedDependencies.outputs.storageAccountCSEFileName}"'
- }
- }
- extensionDependencyAgentConfig: {
- enabled: true
- }
- extensionAzureDiskEncryptionConfig: {
- enabled: true
- settings: {
- EncryptionOperation: 'EnableEncryption'
- KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyEncryptionAlgorithm: 'RSA-OAEP'
- KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
- KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
- ResizeOSDisk: 'false'
- VolumeType: 'All'
- }
- }
- extensionDSCConfig: {
- enabled: true
- }
- extensionMonitoringAgentConfig: {
- enabled: true
- }
- extensionNetworkWatcherAgentConfig: {
- enabled: true
- }
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- nicConfigurations: [
- {
- ipConfigurations: [
- {
- name: 'ipconfig1'
- properties: {
- subnet: {
- id: nestedDependencies.outputs.subnetResourceId
- }
- }
- }
- ]
- nicSuffix: '-nic01'
- }
- ]
- proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
- roleAssignments: [
- {
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- roleDefinitionIdOrName: 'Reader'
- }
- ]
- skuCapacity: 1
- systemAssignedIdentity: true
- upgradePolicyMode: 'Manual'
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- vmNamePrefix: 'vmsswinvm'
- vmPriority: 'Regular'
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualmachinescalesets-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cvmsswin'
+
+@description('Optional. The password to leverage for the login.')
+@secure()
+param password string = newGuid()
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
+ storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
+ proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ adminUsername: 'localAdminUser'
+ imageReference: {
+ publisher: 'MicrosoftWindowsServer'
+ offer: 'WindowsServer'
+ sku: '2022-datacenter-azure-edition'
+ version: 'latest'
+ }
+ osDisk: {
+ createOption: 'fromImage'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ osType: 'Windows'
+ skuName: 'Standard_B12ms'
+ adminPassword: password
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ encryptionAtHost: false
+ extensionAntiMalwareConfig: {
+ enabled: true
+ settings: {
+ AntimalwareEnabled: true
+ Exclusions: {
+ Extensions: '.log;.ldf'
+ Paths: 'D:\\IISlogs;D:\\DatabaseLogs'
+ Processes: 'mssence.svc'
+ }
+ RealtimeProtectionEnabled: true
+ ScheduledScanSettings: {
+ day: '7'
+ isEnabled: 'true'
+ scanType: 'Quick'
+ time: '120'
+ }
+ }
+ }
+ extensionCustomScriptConfig: {
+ enabled: true
+ fileData: [
+ {
+ storageAccountId: nestedDependencies.outputs.storageAccountResourceId
+ uri: nestedDependencies.outputs.storageAccountCSEFileUrl
+ }
+ ]
+ protectedSettings: {
+ commandToExecute: 'powershell -ExecutionPolicy Unrestricted -Command "& ./${nestedDependencies.outputs.storageAccountCSEFileName}"'
+ }
+ }
+ extensionDependencyAgentConfig: {
+ enabled: true
+ }
+ extensionAzureDiskEncryptionConfig: {
+ enabled: true
+ settings: {
+ EncryptionOperation: 'EnableEncryption'
+ KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyEncryptionAlgorithm: 'RSA-OAEP'
+ KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
+ KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
+ ResizeOSDisk: 'false'
+ VolumeType: 'All'
+ }
+ }
+ extensionDSCConfig: {
+ enabled: true
+ }
+ extensionMonitoringAgentConfig: {
+ enabled: true
+ }
+ extensionNetworkWatcherAgentConfig: {
+ enabled: true
+ }
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ nicConfigurations: [
+ {
+ ipConfigurations: [
+ {
+ name: 'ipconfig1'
+ properties: {
+ subnet: {
+ id: nestedDependencies.outputs.subnetResourceId
+ }
+ }
+ }
+ ]
+ nicSuffix: '-nic01'
+ }
+ ]
+ proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
+ roleAssignments: [
+ {
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ roleDefinitionIdOrName: 'Reader'
+ }
+ ]
+ skuCapacity: 1
+ systemAssignedIdentity: true
+ upgradePolicyMode: 'Manual'
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ vmNamePrefix: 'vmsswinvm'
+ vmPriority: 'Regular'
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep
index 74894f3536..5bb0690a4e 100644
--- a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine/.test/linux.min/main.test.bicep
index f74fd4fcb4..6b00f10652 100644
--- a/modules/compute/virtual-machine/.test/linux.min/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/linux.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/linux/main.test.bicep b/modules/compute/virtual-machine/.test/linux/main.test.bicep
index bca0ffc1c5..ba5c8f714f 100644
--- a/modules/compute/virtual-machine/.test/linux/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/linux/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep
index 52c5e35db0..ccee52176b 100644
--- a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine/.test/windows.min/main.test.bicep
index efb300edf1..0d2a846d66 100644
--- a/modules/compute/virtual-machine/.test/windows.min/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/windows.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep
index b829bbcf1c..d20da897b7 100644
--- a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/compute/virtual-machine/.test/windows/main.test.bicep b/modules/compute/virtual-machine/.test/windows/main.test.bicep
index 568a50982e..51c37b16c6 100644
--- a/modules/compute/virtual-machine/.test/windows/main.test.bicep
+++ b/modules/compute/virtual-machine/.test/windows/main.test.bicep
@@ -1,297 +1,299 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.compute.virtualMachines-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'cvmwincom'
-
-@description('Optional. The password to leverage for the login.')
-@secure()
-param password string = newGuid()
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- location: location
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- applicationSecurityGroupName: 'dep-${namePrefix}-asg-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
- loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
- recoveryServicesVaultName: 'dep-${namePrefix}-rsv-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
- storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
- proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- location: location
- name: '${namePrefix}${serviceShort}'
- computerName: '${namePrefix}winvm1'
- adminUsername: 'VMAdmin'
- imageReference: {
- publisher: 'MicrosoftWindowsServer'
- offer: 'WindowsServer'
- sku: '2019-datacenter'
- version: 'latest'
- }
- nicConfigurations: [
- {
- deleteOption: 'Delete'
- ipConfigurations: [
- {
- applicationSecurityGroups: [
- {
- id: nestedDependencies.outputs.applicationSecurityGroupResourceId
- }
- ]
- loadBalancerBackendAddressPools: [
- {
- id: nestedDependencies.outputs.loadBalancerBackendPoolResourceId
- }
- ]
- name: 'ipconfig01'
- pipConfiguration: {
- publicIpNameSuffix: '-pip-01'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- }
- zones: [
- '1'
- '2'
- '3'
- ]
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- }
- ]
- nicSuffix: '-nic-01'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- }
- ]
- osDisk: {
- caching: 'None'
- createOption: 'fromImage'
- deleteOption: 'Delete'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- osType: 'Windows'
- vmSize: 'Standard_DS2_v2'
- adminPassword: password
- availabilityZone: 2
- backupPolicyName: nestedDependencies.outputs.recoveryServicesVaultBackupPolicyName
- backupVaultName: nestedDependencies.outputs.recoveryServicesVaultName
- backupVaultResourceGroup: nestedDependencies.outputs.recoveryServicesVaultResourceGroupName
- dataDisks: [
- {
- caching: 'None'
- createOption: 'Empty'
- deleteOption: 'Delete'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- {
- caching: 'None'
- createOption: 'Empty'
- deleteOption: 'Delete'
- diskSizeGB: '128'
- managedDisk: {
- storageAccountType: 'Premium_LRS'
- }
- }
- ]
- enableAutomaticUpdates: true
- patchMode: 'AutomaticByPlatform'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- encryptionAtHost: false
- extensionAntiMalwareConfig: {
- enabled: true
- settings: {
- AntimalwareEnabled: 'true'
- Exclusions: {
- Extensions: '.ext1;.ext2'
- Paths: 'c:\\excluded-path-1;c:\\excluded-path-2'
- Processes: 'excludedproc1.exe;excludedproc2.exe'
- }
- RealtimeProtectionEnabled: 'true'
- ScheduledScanSettings: {
- day: '7'
- isEnabled: 'true'
- scanType: 'Quick'
- time: '120'
- }
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionCustomScriptConfig: {
- enabled: true
- fileData: [
- {
- storageAccountId: nestedDependencies.outputs.storageAccountResourceId
- uri: nestedDependencies.outputs.storageAccountCSEFileUrl
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionCustomScriptProtectedSetting: {
- commandToExecute: 'powershell -ExecutionPolicy Unrestricted -Command "& ./${nestedDependencies.outputs.storageAccountCSEFileName}"'
- }
- extensionDependencyAgentConfig: {
- enabled: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionAzureDiskEncryptionConfig: {
- enabled: true
- settings: {
- EncryptionOperation: 'EnableEncryption'
- KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyEncryptionAlgorithm: 'RSA-OAEP'
- KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
- KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
- ResizeOSDisk: 'false'
- VolumeType: 'All'
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- }
- extensionAadJoinConfig: {
- enabled: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionDSCConfig: {
- enabled: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionMonitoringAgentConfig: {
- enabled: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- extensionNetworkWatcherAgentConfig: {
- enabled: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- monitoringWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-compute.virtualMachines-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'cvmwincom'
+
+@description('Optional. The password to leverage for the login.')
+@secure()
+param password string = newGuid()
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ location: location
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ applicationSecurityGroupName: 'dep-${namePrefix}-asg-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
+ loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
+ recoveryServicesVaultName: 'dep-${namePrefix}-rsv-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}01'
+ storageUploadDeploymentScriptName: 'dep-${namePrefix}-sads-${serviceShort}'
+ proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ location: location
+ name: '${namePrefix}${serviceShort}'
+ computerName: '${namePrefix}winvm1'
+ adminUsername: 'VMAdmin'
+ imageReference: {
+ publisher: 'MicrosoftWindowsServer'
+ offer: 'WindowsServer'
+ sku: '2019-datacenter'
+ version: 'latest'
+ }
+ nicConfigurations: [
+ {
+ deleteOption: 'Delete'
+ ipConfigurations: [
+ {
+ applicationSecurityGroups: [
+ {
+ id: nestedDependencies.outputs.applicationSecurityGroupResourceId
+ }
+ ]
+ loadBalancerBackendAddressPools: [
+ {
+ id: nestedDependencies.outputs.loadBalancerBackendPoolResourceId
+ }
+ ]
+ name: 'ipconfig01'
+ pipConfiguration: {
+ publicIpNameSuffix: '-pip-01'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ }
+ zones: [
+ '1'
+ '2'
+ '3'
+ ]
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ }
+ ]
+ nicSuffix: '-nic-01'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ }
+ ]
+ osDisk: {
+ caching: 'None'
+ createOption: 'fromImage'
+ deleteOption: 'Delete'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ osType: 'Windows'
+ vmSize: 'Standard_DS2_v2'
+ adminPassword: password
+ availabilityZone: 2
+ backupPolicyName: nestedDependencies.outputs.recoveryServicesVaultBackupPolicyName
+ backupVaultName: nestedDependencies.outputs.recoveryServicesVaultName
+ backupVaultResourceGroup: nestedDependencies.outputs.recoveryServicesVaultResourceGroupName
+ dataDisks: [
+ {
+ caching: 'None'
+ createOption: 'Empty'
+ deleteOption: 'Delete'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ {
+ caching: 'None'
+ createOption: 'Empty'
+ deleteOption: 'Delete'
+ diskSizeGB: '128'
+ managedDisk: {
+ storageAccountType: 'Premium_LRS'
+ }
+ }
+ ]
+ enableAutomaticUpdates: true
+ patchMode: 'AutomaticByPlatform'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ encryptionAtHost: false
+ extensionAntiMalwareConfig: {
+ enabled: true
+ settings: {
+ AntimalwareEnabled: 'true'
+ Exclusions: {
+ Extensions: '.ext1;.ext2'
+ Paths: 'c:\\excluded-path-1;c:\\excluded-path-2'
+ Processes: 'excludedproc1.exe;excludedproc2.exe'
+ }
+ RealtimeProtectionEnabled: 'true'
+ ScheduledScanSettings: {
+ day: '7'
+ isEnabled: 'true'
+ scanType: 'Quick'
+ time: '120'
+ }
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionCustomScriptConfig: {
+ enabled: true
+ fileData: [
+ {
+ storageAccountId: nestedDependencies.outputs.storageAccountResourceId
+ uri: nestedDependencies.outputs.storageAccountCSEFileUrl
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionCustomScriptProtectedSetting: {
+ commandToExecute: 'powershell -ExecutionPolicy Unrestricted -Command "& ./${nestedDependencies.outputs.storageAccountCSEFileName}"'
+ }
+ extensionDependencyAgentConfig: {
+ enabled: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionAzureDiskEncryptionConfig: {
+ enabled: true
+ settings: {
+ EncryptionOperation: 'EnableEncryption'
+ KekVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyEncryptionAlgorithm: 'RSA-OAEP'
+ KeyEncryptionKeyURL: nestedDependencies.outputs.keyVaultEncryptionKeyUrl
+ KeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ KeyVaultURL: nestedDependencies.outputs.keyVaultUrl
+ ResizeOSDisk: 'false'
+ VolumeType: 'All'
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ }
+ extensionAadJoinConfig: {
+ enabled: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionDSCConfig: {
+ enabled: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionMonitoringAgentConfig: {
+ enabled: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ extensionNetworkWatcherAgentConfig: {
+ enabled: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ monitoringWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/container-instance/container-group/.test/common/main.test.bicep b/modules/container-instance/container-group/.test/common/main.test.bicep
index 14ebfbb887..2dc87dd5b1 100644
--- a/modules/container-instance/container-group/.test/common/main.test.bicep
+++ b/modules/container-instance/container-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerinstance.containergroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerinstance.containergroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-instance/container-group/.test/encr/main.test.bicep b/modules/container-instance/container-group/.test/encr/main.test.bicep
index b86cfbfaf3..be4c18e369 100644
--- a/modules/container-instance/container-group/.test/encr/main.test.bicep
+++ b/modules/container-instance/container-group/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerinstance.containergroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerinstance.containergroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-instance/container-group/.test/min/main.test.bicep b/modules/container-instance/container-group/.test/min/main.test.bicep
index 240ce76d42..55144600d3 100644
--- a/modules/container-instance/container-group/.test/min/main.test.bicep
+++ b/modules/container-instance/container-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerinstance.containergroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerinstance.containergroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-instance/container-group/.test/private/main.test.bicep b/modules/container-instance/container-group/.test/private/main.test.bicep
index 84f4dc64ed..541422f6e5 100644
--- a/modules/container-instance/container-group/.test/private/main.test.bicep
+++ b/modules/container-instance/container-group/.test/private/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerinstance.containergroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerinstance.containergroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-registry/registry/.test/common/main.test.bicep b/modules/container-registry/registry/.test/common/main.test.bicep
index 8e52191585..826dfdd5ab 100644
--- a/modules/container-registry/registry/.test/common/main.test.bicep
+++ b/modules/container-registry/registry/.test/common/main.test.bicep
@@ -1,149 +1,149 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.containerregistry.registries-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'crrcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- location: location
- managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- acrAdminUserEnabled: false
- acrSku: 'Premium'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- exportPolicyStatus: 'enabled'
- azureADAuthenticationAsArmPolicyStatus: 'enabled'
- softDeletePolicyStatus: 'disabled'
- softDeletePolicyDays: 7
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- privateEndpoints: [
- {
- service: 'registry'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- privateDnsZoneResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- networkRuleSetIpRules: [
- {
- action: 'Allow'
- value: '40.74.28.0/23'
- }
- ]
- quarantinePolicyStatus: 'enabled'
- replications: [
- {
- location: nestedDependencies.outputs.pairedRegionName
- name: nestedDependencies.outputs.pairedRegionName
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- trustPolicyStatus: 'enabled'
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- cacheRules: [
- {
- name: 'customRule'
- sourceRepository: 'docker.io/library/hello-world'
- targetRepository: 'cached-docker-hub/hello-world'
- }
- {
- sourceRepository: 'docker.io/library/hello-world'
- }
- ]
- webhooks: [
- {
- name: '${namePrefix}acrx001webhook'
- serviceUri: 'https://www.contoso.com/webhook'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-containerregistry.registries-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'crrcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ location: location
+ managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ acrAdminUserEnabled: false
+ acrSku: 'Premium'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ exportPolicyStatus: 'enabled'
+ azureADAuthenticationAsArmPolicyStatus: 'enabled'
+ softDeletePolicyStatus: 'disabled'
+ softDeletePolicyDays: 7
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ privateEndpoints: [
+ {
+ service: 'registry'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ networkRuleSetIpRules: [
+ {
+ action: 'Allow'
+ value: '40.74.28.0/23'
+ }
+ ]
+ quarantinePolicyStatus: 'enabled'
+ replications: [
+ {
+ location: nestedDependencies.outputs.pairedRegionName
+ name: nestedDependencies.outputs.pairedRegionName
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ trustPolicyStatus: 'enabled'
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ cacheRules: [
+ {
+ name: 'customRule'
+ sourceRepository: 'docker.io/library/hello-world'
+ targetRepository: 'cached-docker-hub/hello-world'
+ }
+ {
+ sourceRepository: 'docker.io/library/hello-world'
+ }
+ ]
+ webhooks: [
+ {
+ name: '${namePrefix}acrx001webhook'
+ serviceUri: 'https://www.contoso.com/webhook'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/container-registry/registry/.test/encr/main.test.bicep b/modules/container-registry/registry/.test/encr/main.test.bicep
index f6b8fd3f61..3648f55a8f 100644
--- a/modules/container-registry/registry/.test/encr/main.test.bicep
+++ b/modules/container-registry/registry/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerregistry.registries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerregistry.registries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-registry/registry/.test/min/main.test.bicep b/modules/container-registry/registry/.test/min/main.test.bicep
index 0db5d24fdd..3d4f3030e4 100644
--- a/modules/container-registry/registry/.test/min/main.test.bicep
+++ b/modules/container-registry/registry/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerregistry.registries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerregistry.registries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-registry/registry/.test/pe/main.test.bicep b/modules/container-registry/registry/.test/pe/main.test.bicep
index 19f4dd9c96..a0708497ad 100644
--- a/modules/container-registry/registry/.test/pe/main.test.bicep
+++ b/modules/container-registry/registry/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerregistry.registries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerregistry.registries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-service/managed-cluster/.test/azure/main.test.bicep b/modules/container-service/managed-cluster/.test/azure/main.test.bicep
index 35a7bc0355..f438df827e 100644
--- a/modules/container-service/managed-cluster/.test/azure/main.test.bicep
+++ b/modules/container-service/managed-cluster/.test/azure/main.test.bicep
@@ -1,256 +1,256 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.containerservice.managedclusters-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'csmaz'
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- managedIdentityKubeletIdentityName: 'dep-${namePrefix}-msiki-${serviceShort}'
- diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
- proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- dnsZoneName: 'dep-${namePrefix}-dns-${serviceShort}.com'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- primaryAgentPoolProfile: [
- {
- availabilityZones: [
- '3'
- ]
- count: 1
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- mode: 'System'
- name: 'systempool'
- osDiskSizeGB: 0
- osType: 'Linux'
- serviceCidr: ''
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[0]
- }
- ]
- agentPools: [
- {
- availabilityZones: [
- '3'
- ]
- count: 2
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- minPods: 2
- mode: 'User'
- name: 'userpool1'
- nodeLabels: {}
- nodeTaints: [
- 'CriticalAddonsOnly=true:NoSchedule'
- ]
- osDiskSizeGB: 128
- osType: 'Linux'
- scaleSetEvictionPolicy: 'Delete'
- scaleSetPriority: 'Regular'
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[1]
- proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
- }
- {
- availabilityZones: [
- '3'
- ]
- count: 2
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- minPods: 2
- mode: 'User'
- name: 'userpool2'
- nodeLabels: {}
- nodeTaints: [
- 'CriticalAddonsOnly=true:NoSchedule'
- ]
- osDiskSizeGB: 128
- osType: 'Linux'
- scaleSetEvictionPolicy: 'Delete'
- scaleSetPriority: 'Regular'
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[2]
- }
- ]
- autoUpgradeProfileUpgradeChannel: 'stable'
- enableWorkloadIdentity: true
- enableOidcIssuerProfile: true
- networkPlugin: 'azure'
- networkDataplane: 'azure'
- networkPluginMode: 'overlay'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- diskEncryptionSetID: nestedDependencies.outputs.diskEncryptionSetResourceId
- openServiceMeshEnabled: true
- enableStorageProfileBlobCSIDriver: true
- enableStorageProfileDiskCSIDriver: true
- enableStorageProfileFileCSIDriver: true
- enableStorageProfileSnapshotController: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- identityProfile: {
- kubeletidentity: {
- resourceId: nestedDependencies.outputs.managedIdentityKubeletIdentityResourceId
- }
- }
- omsAgentEnabled: true
- monitoringWorkspaceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId
- enableAzureDefender: true
- enableKeyvaultSecretsProvider: true
- enablePodSecurityPolicy: false
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- fluxExtension: {
- configurationSettings: {
- 'helm-controller.enabled': 'true'
- 'source-controller.enabled': 'true'
- 'kustomize-controller.enabled': 'true'
- 'notification-controller.enabled': 'true'
- 'image-automation-controller.enabled': 'false'
- 'image-reflector-controller.enabled': 'false'
- }
- configurations: [
- {
- namespace: 'flux-system'
- scope: 'cluster'
- gitRepository: {
- repositoryRef: {
- branch: 'main'
- }
- sshKnownHosts: ''
- syncIntervalInSeconds: 300
- timeoutInSeconds: 180
- url: 'https://github.com/mspnp/aks-baseline'
- }
- }
- {
- namespace: 'flux-system-helm'
- scope: 'cluster'
- gitRepository: {
- repositoryRef: {
- branch: 'main'
- }
- sshKnownHosts: ''
- syncIntervalInSeconds: 300
- timeoutInSeconds: 180
- url: 'https://github.com/Azure/gitops-flux2-kustomize-helm-mt'
- }
- kustomizations: {
- infra: {
- path: './infrastructure'
- dependsOn: []
- timeoutInSeconds: 600
- syncIntervalInSeconds: 600
- validation: 'none'
- prune: true
- }
- apps: {
- path: './apps/staging'
- dependsOn: [
- 'infra'
- ]
- timeoutInSeconds: 600
- syncIntervalInSeconds: 600
- retryIntervalInSeconds: 120
- prune: true
- }
- }
- }
- ]
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-containerservice.managedclusters-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'csmaz'
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ managedIdentityKubeletIdentityName: 'dep-${namePrefix}-msiki-${serviceShort}'
+ diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
+ proximityPlacementGroupName: 'dep-${namePrefix}-ppg-${serviceShort}'
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ dnsZoneName: 'dep-${namePrefix}-dns-${serviceShort}.com'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ primaryAgentPoolProfile: [
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 1
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ mode: 'System'
+ name: 'systempool'
+ osDiskSizeGB: 0
+ osType: 'Linux'
+ serviceCidr: ''
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[0]
+ }
+ ]
+ agentPools: [
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 2
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ minPods: 2
+ mode: 'User'
+ name: 'userpool1'
+ nodeLabels: {}
+ nodeTaints: [
+ 'CriticalAddonsOnly=true:NoSchedule'
+ ]
+ osDiskSizeGB: 128
+ osType: 'Linux'
+ scaleSetEvictionPolicy: 'Delete'
+ scaleSetPriority: 'Regular'
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[1]
+ proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId
+ }
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 2
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ minPods: 2
+ mode: 'User'
+ name: 'userpool2'
+ nodeLabels: {}
+ nodeTaints: [
+ 'CriticalAddonsOnly=true:NoSchedule'
+ ]
+ osDiskSizeGB: 128
+ osType: 'Linux'
+ scaleSetEvictionPolicy: 'Delete'
+ scaleSetPriority: 'Regular'
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ vnetSubnetID: nestedDependencies.outputs.subnetResourceIds[2]
+ }
+ ]
+ autoUpgradeProfileUpgradeChannel: 'stable'
+ enableWorkloadIdentity: true
+ enableOidcIssuerProfile: true
+ networkPlugin: 'azure'
+ networkDataplane: 'azure'
+ networkPluginMode: 'overlay'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ diskEncryptionSetID: nestedDependencies.outputs.diskEncryptionSetResourceId
+ openServiceMeshEnabled: true
+ enableStorageProfileBlobCSIDriver: true
+ enableStorageProfileDiskCSIDriver: true
+ enableStorageProfileFileCSIDriver: true
+ enableStorageProfileSnapshotController: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ identityProfile: {
+ kubeletidentity: {
+ resourceId: nestedDependencies.outputs.managedIdentityKubeletIdentityResourceId
+ }
+ }
+ omsAgentEnabled: true
+ monitoringWorkspaceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId
+ enableAzureDefender: true
+ enableKeyvaultSecretsProvider: true
+ enablePodSecurityPolicy: false
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ fluxExtension: {
+ configurationSettings: {
+ 'helm-controller.enabled': 'true'
+ 'source-controller.enabled': 'true'
+ 'kustomize-controller.enabled': 'true'
+ 'notification-controller.enabled': 'true'
+ 'image-automation-controller.enabled': 'false'
+ 'image-reflector-controller.enabled': 'false'
+ }
+ configurations: [
+ {
+ namespace: 'flux-system'
+ scope: 'cluster'
+ gitRepository: {
+ repositoryRef: {
+ branch: 'main'
+ }
+ sshKnownHosts: ''
+ syncIntervalInSeconds: 300
+ timeoutInSeconds: 180
+ url: 'https://github.com/mspnp/aks-baseline'
+ }
+ }
+ {
+ namespace: 'flux-system-helm'
+ scope: 'cluster'
+ gitRepository: {
+ repositoryRef: {
+ branch: 'main'
+ }
+ sshKnownHosts: ''
+ syncIntervalInSeconds: 300
+ timeoutInSeconds: 180
+ url: 'https://github.com/Azure/gitops-flux2-kustomize-helm-mt'
+ }
+ kustomizations: {
+ infra: {
+ path: './infrastructure'
+ dependsOn: []
+ timeoutInSeconds: 600
+ syncIntervalInSeconds: 600
+ validation: 'none'
+ prune: true
+ }
+ apps: {
+ path: './apps/staging'
+ dependsOn: [
+ 'infra'
+ ]
+ timeoutInSeconds: 600
+ syncIntervalInSeconds: 600
+ retryIntervalInSeconds: 120
+ prune: true
+ }
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep b/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep
index 2f445e1328..8fb322a2b9 100644
--- a/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep
+++ b/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep
@@ -1,159 +1,159 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.containerservice.managedclusters-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'csmkube'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- dnsZoneName: 'dep-${namePrefix}-dns-${serviceShort}.com'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- primaryAgentPoolProfile: [
- {
- availabilityZones: [
- '3'
- ]
- count: 1
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- mode: 'System'
- name: 'systempool'
- osDiskSizeGB: 0
- osType: 'Linux'
- serviceCidr: ''
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- }
- ]
- agentPools: [
- {
- availabilityZones: [
- '3'
- ]
- count: 2
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- minPods: 2
- mode: 'User'
- name: 'userpool1'
- nodeLabels: {}
- nodeTaints: [
- 'CriticalAddonsOnly=true:NoSchedule'
- ]
- osDiskSizeGB: 128
- osType: 'Linux'
- scaleSetEvictionPolicy: 'Delete'
- scaleSetPriority: 'Regular'
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- }
- {
- availabilityZones: [
- '3'
- ]
- count: 2
- enableAutoScaling: true
- maxCount: 3
- maxPods: 30
- minCount: 1
- minPods: 2
- mode: 'User'
- name: 'userpool2'
- nodeLabels: {}
- nodeTaints: [
- 'CriticalAddonsOnly=true:NoSchedule'
- ]
- osDiskSizeGB: 128
- osType: 'Linux'
- scaleSetEvictionPolicy: 'Delete'
- scaleSetPriority: 'Regular'
- storageProfile: 'ManagedDisks'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_DS2_v2'
- }
- ]
- networkPlugin: 'kubenet'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-containerservice.managedclusters-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'csmkube'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ dnsZoneName: 'dep-${namePrefix}-dns-${serviceShort}.com'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ primaryAgentPoolProfile: [
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 1
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ mode: 'System'
+ name: 'systempool'
+ osDiskSizeGB: 0
+ osType: 'Linux'
+ serviceCidr: ''
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ }
+ ]
+ agentPools: [
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 2
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ minPods: 2
+ mode: 'User'
+ name: 'userpool1'
+ nodeLabels: {}
+ nodeTaints: [
+ 'CriticalAddonsOnly=true:NoSchedule'
+ ]
+ osDiskSizeGB: 128
+ osType: 'Linux'
+ scaleSetEvictionPolicy: 'Delete'
+ scaleSetPriority: 'Regular'
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ }
+ {
+ availabilityZones: [
+ '3'
+ ]
+ count: 2
+ enableAutoScaling: true
+ maxCount: 3
+ maxPods: 30
+ minCount: 1
+ minPods: 2
+ mode: 'User'
+ name: 'userpool2'
+ nodeLabels: {}
+ nodeTaints: [
+ 'CriticalAddonsOnly=true:NoSchedule'
+ ]
+ osDiskSizeGB: 128
+ osType: 'Linux'
+ scaleSetEvictionPolicy: 'Delete'
+ scaleSetPriority: 'Regular'
+ storageProfile: 'ManagedDisks'
+ type: 'VirtualMachineScaleSets'
+ vmSize: 'Standard_DS2_v2'
+ }
+ ]
+ networkPlugin: 'kubenet'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/container-service/managed-cluster/.test/min/main.test.bicep b/modules/container-service/managed-cluster/.test/min/main.test.bicep
index 477264b2e2..ec5bf9306f 100644
--- a/modules/container-service/managed-cluster/.test/min/main.test.bicep
+++ b/modules/container-service/managed-cluster/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerservice.managedclusters-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerservice.managedclusters-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/container-service/managed-cluster/.test/priv/main.test.bicep b/modules/container-service/managed-cluster/.test/priv/main.test.bicep
index aeeae2fbfc..26729a14da 100644
--- a/modules/container-service/managed-cluster/.test/priv/main.test.bicep
+++ b/modules/container-service/managed-cluster/.test/priv/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.containerservice.managedclusters-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-containerservice.managedclusters-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/data-factory/factory/.test/common/main.test.bicep b/modules/data-factory/factory/.test/common/main.test.bicep
index 07059a312f..6bea31ebf1 100644
--- a/modules/data-factory/factory/.test/common/main.test.bicep
+++ b/modules/data-factory/factory/.test/common/main.test.bicep
@@ -1,151 +1,151 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.datafactory.factories-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dffcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- storageAccountName: 'dep${namePrefix}st${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- cMKKeyName: nestedDependencies.outputs.keyVaultEncryptionKeyName
- cMKKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- cMKUserAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- gitConfigureLater: true
- globalParameters: {
- testParameter1: {
- type: 'String'
- value: 'testValue1'
- }
- }
- integrationRuntimes: [
- {
- managedVirtualNetworkName: 'default'
- name: 'AutoResolveIntegrationRuntime'
- type: 'Managed'
- typeProperties: {
- computeProperties: {
- location: 'AutoResolve'
- }
- }
- }
-
- {
- name: 'TestRuntime'
- type: 'SelfHosted'
- }
- ]
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- managedPrivateEndpoints: [
- {
- fqdns: [
- nestedDependencies.outputs.storageAccountBlobEndpoint
- ]
- groupId: 'blob'
- name: '${nestedDependencies.outputs.storageAccountName}-managed-privateEndpoint'
- privateLinkResourceId: nestedDependencies.outputs.storageAccountResourceId
- }
- ]
- managedVirtualNetworkName: 'default'
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
-
- nestedDependencies.outputs.privateDNSZoneResourceId
-
- ]
- service: 'dataFactory'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- application: 'CARML'
- }
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-datafactory.factories-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dffcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}st${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ cMKKeyName: nestedDependencies.outputs.keyVaultEncryptionKeyName
+ cMKKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ cMKUserAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ gitConfigureLater: true
+ globalParameters: {
+ testParameter1: {
+ type: 'String'
+ value: 'testValue1'
+ }
+ }
+ integrationRuntimes: [
+ {
+ managedVirtualNetworkName: 'default'
+ name: 'AutoResolveIntegrationRuntime'
+ type: 'Managed'
+ typeProperties: {
+ computeProperties: {
+ location: 'AutoResolve'
+ }
+ }
+ }
+
+ {
+ name: 'TestRuntime'
+ type: 'SelfHosted'
+ }
+ ]
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ managedPrivateEndpoints: [
+ {
+ fqdns: [
+ nestedDependencies.outputs.storageAccountBlobEndpoint
+ ]
+ groupId: 'blob'
+ name: '${nestedDependencies.outputs.storageAccountName}-managed-privateEndpoint'
+ privateLinkResourceId: nestedDependencies.outputs.storageAccountResourceId
+ }
+ ]
+ managedVirtualNetworkName: 'default'
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+
+ nestedDependencies.outputs.privateDNSZoneResourceId
+
+ ]
+ service: 'dataFactory'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ application: 'CARML'
+ }
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/data-factory/factory/.test/min/main.test.bicep b/modules/data-factory/factory/.test/min/main.test.bicep
index f5dadd9372..b182ddfc97 100644
--- a/modules/data-factory/factory/.test/min/main.test.bicep
+++ b/modules/data-factory/factory/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.datafactory.factories-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-datafactory.factories-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/data-protection/backup-vault/.test/common/main.test.bicep b/modules/data-protection/backup-vault/.test/common/main.test.bicep
index 05924632cf..fe1b319ceb 100644
--- a/modules/data-protection/backup-vault/.test/common/main.test.bicep
+++ b/modules/data-protection/backup-vault/.test/common/main.test.bicep
@@ -1,137 +1,137 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.dataprotection.backupvaults-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dpbvcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- azureMonitorAlertSettingsAlertsForAllJobFailures: 'Disabled'
- systemAssignedIdentity: true
- backupPolicies: [
- {
- name: 'DefaultPolicy'
- properties: {
- datasourceTypes: [
- 'Microsoft.Compute/disks'
- ]
- objectType: 'BackupPolicy'
- policyRules: [
- {
- backupParameters: {
- backupType: 'Incremental'
- objectType: 'AzureBackupParams'
- }
- dataStore: {
- dataStoreType: 'OperationalStore'
- objectType: 'DataStoreInfoBase'
- }
- name: 'BackupDaily'
- objectType: 'AzureBackupRule'
- trigger: {
- objectType: 'ScheduleBasedTriggerContext'
- schedule: {
- repeatingTimeIntervals: [
- 'R/2022-05-31T23:30:00+01:00/P1D'
- ]
- timeZone: 'W. Europe Standard Time'
- }
- taggingCriteria: [
- {
- isDefault: true
- taggingPriority: 99
- tagInfo: {
- id: 'Default_'
- tagName: 'Default'
- }
- }
- ]
- }
- }
- {
- isDefault: true
- lifecycles: [
- {
- deleteAfter: {
- duration: 'P7D'
- objectType: 'AbsoluteDeleteOption'
- }
- sourceDataStore: {
- dataStoreType: 'OperationalStore'
- objectType: 'DataStoreInfoBase'
- }
- targetDataStoreCopySettings: []
- }
- ]
- name: 'Default'
- objectType: 'AzureRetentionRule'
- }
- ]
- }
- }
- ]
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-dataprotection.backupvaults-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dpbvcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ azureMonitorAlertSettingsAlertsForAllJobFailures: 'Disabled'
+ systemAssignedIdentity: true
+ backupPolicies: [
+ {
+ name: 'DefaultPolicy'
+ properties: {
+ datasourceTypes: [
+ 'Microsoft.Compute/disks'
+ ]
+ objectType: 'BackupPolicy'
+ policyRules: [
+ {
+ backupParameters: {
+ backupType: 'Incremental'
+ objectType: 'AzureBackupParams'
+ }
+ dataStore: {
+ dataStoreType: 'OperationalStore'
+ objectType: 'DataStoreInfoBase'
+ }
+ name: 'BackupDaily'
+ objectType: 'AzureBackupRule'
+ trigger: {
+ objectType: 'ScheduleBasedTriggerContext'
+ schedule: {
+ repeatingTimeIntervals: [
+ 'R/2022-05-31T23:30:00+01:00/P1D'
+ ]
+ timeZone: 'W. Europe Standard Time'
+ }
+ taggingCriteria: [
+ {
+ isDefault: true
+ taggingPriority: 99
+ tagInfo: {
+ id: 'Default_'
+ tagName: 'Default'
+ }
+ }
+ ]
+ }
+ }
+ {
+ isDefault: true
+ lifecycles: [
+ {
+ deleteAfter: {
+ duration: 'P7D'
+ objectType: 'AbsoluteDeleteOption'
+ }
+ sourceDataStore: {
+ dataStoreType: 'OperationalStore'
+ objectType: 'DataStoreInfoBase'
+ }
+ targetDataStoreCopySettings: []
+ }
+ ]
+ name: 'Default'
+ objectType: 'AzureRetentionRule'
+ }
+ ]
+ }
+ }
+ ]
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/data-protection/backup-vault/.test/min/main.test.bicep b/modules/data-protection/backup-vault/.test/min/main.test.bicep
index e96ec60caf..28e222baca 100644
--- a/modules/data-protection/backup-vault/.test/min/main.test.bicep
+++ b/modules/data-protection/backup-vault/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.dataprotection.backupvaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-dataprotection.backupvaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/databricks/access-connector/.test/common/main.test.bicep b/modules/databricks/access-connector/.test/common/main.test.bicep
index 6395e13ed7..1ea97bd6c4 100644
--- a/modules/databricks/access-connector/.test/common/main.test.bicep
+++ b/modules/databricks/access-connector/.test/common/main.test.bicep
@@ -1,78 +1,78 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.databricks.accessconnectors-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'daccom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- systemAssignedIdentity: true
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- location: resourceGroup.location
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-databricks.accessconnectors-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'daccom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ systemAssignedIdentity: true
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ location: resourceGroup.location
+ }
+}
diff --git a/modules/databricks/access-connector/.test/min/main.test.bicep b/modules/databricks/access-connector/.test/min/main.test.bicep
index 1c8b923b29..b353cb47c5 100644
--- a/modules/databricks/access-connector/.test/min/main.test.bicep
+++ b/modules/databricks/access-connector/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.databricks.accessconnectors-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-databricks.accessconnectors-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/databricks/workspace/.test/common/main.test.bicep b/modules/databricks/workspace/.test/common/main.test.bicep
index b980001a04..39e8d023af 100644
--- a/modules/databricks/workspace/.test/common/main.test.bicep
+++ b/modules/databricks/workspace/.test/common/main.test.bicep
@@ -1,147 +1,147 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.databricks.workspaces-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dwcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- amlWorkspaceName: 'dep-${namePrefix}-aml-${serviceShort}'
- applicationInsightsName: 'dep-${namePrefix}-appi-${serviceShort}'
- loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}'
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- networkSecurityGroupName: 'dep-${namePrefix}-nsg-${serviceShort}'
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- keyVaultDiskName: 'dep-${namePrefix}-kve-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- cMKManagedServicesKeyName: nestedDependencies.outputs.keyVaultKeyName
- cMKManagedServicesKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- cMKManagedDisksKeyName: nestedDependencies.outputs.keyVaultDiskKeyName
- cMKManagedDisksKeyVaultResourceId: nestedDependencies.outputs.keyVaultDiskResourceId
- cMKManagedDisksKeyRotationToLatestKeyVersionEnabled: true
- storageAccountName: 'sa${namePrefix}${serviceShort}001'
- storageAccountSkuName: 'Standard_ZRS'
- publicIpName: 'nat-gw-public-ip'
- natGatewayName: 'nat-gateway'
- prepareEncryption: true
- requiredNsgRules: 'NoAzureDatabricksRules'
- skuName: 'premium'
- amlWorkspaceResourceId: nestedDependencies.outputs.machineLearningWorkspaceResourceId
- customPrivateSubnetName: nestedDependencies.outputs.customPrivateSubnetName
- customPublicSubnetName: nestedDependencies.outputs.customPublicSubnetName
- publicNetworkAccess: 'Disabled'
- disablePublicIp: true
- loadBalancerResourceId: nestedDependencies.outputs.loadBalancerResourceId
- loadBalancerBackendPoolName: nestedDependencies.outputs.loadBalancerBackendPoolName
- customVirtualNetworkResourceId: nestedDependencies.outputs.virtualNetworkResourceId
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
-
- nestedDependencies.outputs.privateDNSZoneResourceId
-
- ]
- service: 'databricks_ui_api'
- subnetResourceId: nestedDependencies.outputs.defaultSubnetResourceId
- tags: {
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- managedResourceGroupResourceId: '${subscription().id}/resourceGroups/rg-${resourceGroupName}-managed'
- diagnosticLogCategoriesToEnable: [
- 'jobs'
- 'notebook'
- ]
- diagnosticSettingsName: 'diag${namePrefix}${serviceShort}001'
- requireInfrastructureEncryption: true
- vnetAddressPrefix: '10.100'
- location: resourceGroup.location
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-databricks.workspaces-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dwcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ amlWorkspaceName: 'dep-${namePrefix}-aml-${serviceShort}'
+ applicationInsightsName: 'dep-${namePrefix}-appi-${serviceShort}'
+ loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}'
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ networkSecurityGroupName: 'dep-${namePrefix}-nsg-${serviceShort}'
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ keyVaultDiskName: 'dep-${namePrefix}-kve-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ cMKManagedServicesKeyName: nestedDependencies.outputs.keyVaultKeyName
+ cMKManagedServicesKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ cMKManagedDisksKeyName: nestedDependencies.outputs.keyVaultDiskKeyName
+ cMKManagedDisksKeyVaultResourceId: nestedDependencies.outputs.keyVaultDiskResourceId
+ cMKManagedDisksKeyRotationToLatestKeyVersionEnabled: true
+ storageAccountName: 'sa${namePrefix}${serviceShort}001'
+ storageAccountSkuName: 'Standard_ZRS'
+ publicIpName: 'nat-gw-public-ip'
+ natGatewayName: 'nat-gateway'
+ prepareEncryption: true
+ requiredNsgRules: 'NoAzureDatabricksRules'
+ skuName: 'premium'
+ amlWorkspaceResourceId: nestedDependencies.outputs.machineLearningWorkspaceResourceId
+ customPrivateSubnetName: nestedDependencies.outputs.customPrivateSubnetName
+ customPublicSubnetName: nestedDependencies.outputs.customPublicSubnetName
+ publicNetworkAccess: 'Disabled'
+ disablePublicIp: true
+ loadBalancerResourceId: nestedDependencies.outputs.loadBalancerResourceId
+ loadBalancerBackendPoolName: nestedDependencies.outputs.loadBalancerBackendPoolName
+ customVirtualNetworkResourceId: nestedDependencies.outputs.virtualNetworkResourceId
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+
+ nestedDependencies.outputs.privateDNSZoneResourceId
+
+ ]
+ service: 'databricks_ui_api'
+ subnetResourceId: nestedDependencies.outputs.defaultSubnetResourceId
+ tags: {
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ managedResourceGroupResourceId: '${subscription().id}/resourceGroups/rg-${resourceGroupName}-managed'
+ diagnosticLogCategoriesToEnable: [
+ 'jobs'
+ 'notebook'
+ ]
+ diagnosticSettingsName: 'diag${namePrefix}${serviceShort}001'
+ requireInfrastructureEncryption: true
+ vnetAddressPrefix: '10.100'
+ location: resourceGroup.location
+ }
+}
diff --git a/modules/databricks/workspace/.test/min/main.test.bicep b/modules/databricks/workspace/.test/min/main.test.bicep
index 00e0a9cd89..1ee4cd5c32 100644
--- a/modules/databricks/workspace/.test/min/main.test.bicep
+++ b/modules/databricks/workspace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.databricks.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-databricks.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep
index 61b5a01a27..55d2de2958 100644
--- a/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep
+++ b/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.dbformysql.flexibleservers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-dbformysql.flexibleservers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep
index 2b9182a40c..94e139af85 100644
--- a/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep
+++ b/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep
@@ -1,122 +1,122 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.dbformysql.flexibleservers-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dfmsfspvt'
-
-@description('Optional. The password to leverage for the login.')
-@secure()
-param password string = newGuid()
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- location: resourceGroup.location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- resourceType: 'MySQL Flexible Server'
- serverName: '${namePrefix}${serviceShort}001'
- }
- administratorLogin: 'adminUserName'
- administratorLoginPassword: password
- skuName: 'Standard_D2ds_v4'
- tier: 'GeneralPurpose'
- delegatedSubnetResourceId: nestedDependencies.outputs.subnetResourceId
- privateDnsZoneResourceId: nestedDependencies.outputs.privateDNSZoneResourceId
- storageAutoIoScaling: 'Enabled'
- storageSizeGB: 64
- storageIOPS: 400
- backupRetentionDays: 10
- databases: [
- {
-
- name: 'testdb1'
- }
- ]
- highAvailability: 'SameZone'
- storageAutoGrow: 'Enabled'
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- administrators: [
- {
- identityResourceId: nestedDependencies.outputs.managedIdentityResourceId
- login: nestedDependencies.outputs.managedIdentityName
- sid: nestedDependencies.outputs.managedIdentityPrincipalId
- }
- ]
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-dbformysql.flexibleservers-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dfmsfspvt'
+
+@description('Optional. The password to leverage for the login.')
+@secure()
+param password string = newGuid()
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ location: resourceGroup.location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ resourceType: 'MySQL Flexible Server'
+ serverName: '${namePrefix}${serviceShort}001'
+ }
+ administratorLogin: 'adminUserName'
+ administratorLoginPassword: password
+ skuName: 'Standard_D2ds_v4'
+ tier: 'GeneralPurpose'
+ delegatedSubnetResourceId: nestedDependencies.outputs.subnetResourceId
+ privateDnsZoneResourceId: nestedDependencies.outputs.privateDNSZoneResourceId
+ storageAutoIoScaling: 'Enabled'
+ storageSizeGB: 64
+ storageIOPS: 400
+ backupRetentionDays: 10
+ databases: [
+ {
+
+ name: 'testdb1'
+ }
+ ]
+ highAvailability: 'SameZone'
+ storageAutoGrow: 'Enabled'
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ administrators: [
+ {
+ identityResourceId: nestedDependencies.outputs.managedIdentityResourceId
+ login: nestedDependencies.outputs.managedIdentityName
+ sid: nestedDependencies.outputs.managedIdentityPrincipalId
+ }
+ ]
+ }
+}
diff --git a/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep
index 7684cbf777..fe359f406f 100644
--- a/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep
+++ b/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep
@@ -1,163 +1,163 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.dbformysql.flexibleservers-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dfmsfsp'
-
-@description('Optional. The password to leverage for the login.')
-@secure()
-param password string = newGuid()
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies1 'dependencies1.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies1'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- location: location
- managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-module nestedDependencies2 'dependencies2.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies2'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- geoBackupKeyVaultName: 'dep-${namePrefix}-kvp-${serviceShort}-${substring(uniqueString(baseTime), 0, 2)}'
- geoBackupManagedIdentityName: 'dep-${namePrefix}-msip-${serviceShort}'
- geoBackupLocation: nestedDependencies1.outputs.pairedRegionName
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- location: resourceGroup.location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies2.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- resourceType: 'MySQL Flexible Server'
- serverName: '${namePrefix}${serviceShort}001'
- }
- administratorLogin: 'adminUserName'
- administratorLoginPassword: password
- skuName: 'Standard_D2ds_v4'
- tier: 'GeneralPurpose'
- storageAutoIoScaling: 'Enabled'
- storageSizeGB: 32
- storageIOPS: 400
- backupRetentionDays: 20
- availabilityZone: '1'
- databases: [
- {
-
- name: 'testdb1'
- }
- {
- name: 'testdb2'
- charset: 'ascii'
- collation: 'ascii_general_ci'
- }
- ]
- firewallRules: [
- {
- endIpAddress: '0.0.0.0'
- name: 'AllowAllWindowsAzureIps'
- startIpAddress: '0.0.0.0'
- }
- {
- endIpAddress: '10.10.10.10'
- name: 'test-rule1'
- startIpAddress: '10.10.10.1'
- }
- {
- endIpAddress: '100.100.100.10'
- name: 'test-rule2'
- startIpAddress: '100.100.100.1'
- }
- ]
- highAvailability: 'SameZone'
- storageAutoGrow: 'Enabled'
- version: '8.0.21'
- cMKKeyVaultResourceId: nestedDependencies2.outputs.keyVaultResourceId
- cMKKeyName: nestedDependencies2.outputs.keyName
- cMKUserAssignedIdentityResourceId: nestedDependencies2.outputs.managedIdentityResourceId
- geoRedundantBackup: 'Enabled'
- geoBackupCMKKeyVaultResourceId: nestedDependencies2.outputs.geoBackupKeyVaultResourceId
- geoBackupCMKKeyName: nestedDependencies2.outputs.geoBackupKeyName
- geoBackupCMKUserAssignedIdentityResourceId: nestedDependencies2.outputs.geoBackupManagedIdentityResourceId
- userAssignedIdentities: {
- '${nestedDependencies2.outputs.managedIdentityResourceId}': {}
- '${nestedDependencies2.outputs.geoBackupManagedIdentityResourceId}': {}
- }
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-dbformysql.flexibleservers-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dfmsfsp'
+
+@description('Optional. The password to leverage for the login.')
+@secure()
+param password string = newGuid()
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies1 'dependencies1.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies1'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ location: location
+ managedIdentityName: 'dep-${namePrefix}-msi-ds-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+module nestedDependencies2 'dependencies2.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies2'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ geoBackupKeyVaultName: 'dep-${namePrefix}-kvp-${serviceShort}-${substring(uniqueString(baseTime), 0, 2)}'
+ geoBackupManagedIdentityName: 'dep-${namePrefix}-msip-${serviceShort}'
+ geoBackupLocation: nestedDependencies1.outputs.pairedRegionName
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ location: resourceGroup.location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies2.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ resourceType: 'MySQL Flexible Server'
+ serverName: '${namePrefix}${serviceShort}001'
+ }
+ administratorLogin: 'adminUserName'
+ administratorLoginPassword: password
+ skuName: 'Standard_D2ds_v4'
+ tier: 'GeneralPurpose'
+ storageAutoIoScaling: 'Enabled'
+ storageSizeGB: 32
+ storageIOPS: 400
+ backupRetentionDays: 20
+ availabilityZone: '1'
+ databases: [
+ {
+
+ name: 'testdb1'
+ }
+ {
+ name: 'testdb2'
+ charset: 'ascii'
+ collation: 'ascii_general_ci'
+ }
+ ]
+ firewallRules: [
+ {
+ endIpAddress: '0.0.0.0'
+ name: 'AllowAllWindowsAzureIps'
+ startIpAddress: '0.0.0.0'
+ }
+ {
+ endIpAddress: '10.10.10.10'
+ name: 'test-rule1'
+ startIpAddress: '10.10.10.1'
+ }
+ {
+ endIpAddress: '100.100.100.10'
+ name: 'test-rule2'
+ startIpAddress: '100.100.100.1'
+ }
+ ]
+ highAvailability: 'SameZone'
+ storageAutoGrow: 'Enabled'
+ version: '8.0.21'
+ cMKKeyVaultResourceId: nestedDependencies2.outputs.keyVaultResourceId
+ cMKKeyName: nestedDependencies2.outputs.keyName
+ cMKUserAssignedIdentityResourceId: nestedDependencies2.outputs.managedIdentityResourceId
+ geoRedundantBackup: 'Enabled'
+ geoBackupCMKKeyVaultResourceId: nestedDependencies2.outputs.geoBackupKeyVaultResourceId
+ geoBackupCMKKeyName: nestedDependencies2.outputs.geoBackupKeyName
+ geoBackupCMKUserAssignedIdentityResourceId: nestedDependencies2.outputs.geoBackupManagedIdentityResourceId
+ userAssignedIdentities: {
+ '${nestedDependencies2.outputs.managedIdentityResourceId}': {}
+ '${nestedDependencies2.outputs.geoBackupManagedIdentityResourceId}': {}
+ }
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ }
+}
diff --git a/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep
index 1386d47e69..6257b66663 100644
--- a/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep
+++ b/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.dbforpostgresql.flexibleservers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-dbforpostgresql.flexibleservers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep
index d5bd21da2c..da83caf5ac 100644
--- a/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep
+++ b/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.dbforpostgresql.flexibleservers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-dbforpostgresql.flexibleservers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep
index 93fdbb9416..ea31d8b80f 100644
--- a/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep
+++ b/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.dbforpostgresql.flexibleservers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-dbforpostgresql.flexibleservers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/desktop-virtualization/application-group/.test/common/main.test.bicep b/modules/desktop-virtualization/application-group/.test/common/main.test.bicep
index 62add5be1c..93431181fa 100644
--- a/modules/desktop-virtualization/application-group/.test/common/main.test.bicep
+++ b/modules/desktop-virtualization/application-group/.test/common/main.test.bicep
@@ -1,115 +1,115 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.applicationgroups-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dvagcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- hostPoolName: 'dep-${namePrefix}-hp-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- applicationGroupType: 'RemoteApp'
- hostpoolName: nestedDependencies.outputs.hostPoolName
- applications: [
- {
- commandLineArguments: ''
- commandLineSetting: 'DoNotAllow'
- description: 'Notepad by ARM template'
- filePath: 'C:\\Windows\\System32\\notepad.exe'
- friendlyName: 'Notepad'
- iconIndex: 0
- iconPath: 'C:\\Windows\\System32\\notepad.exe'
- name: 'notepad'
- showInPortal: true
- }
- {
- filePath: 'C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe'
- friendlyName: 'Wordpad'
- name: 'wordpad'
- }
- ]
- description: 'This is my first Remote Applications bundle'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- friendlyName: 'Remote Applications 1'
- location: location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.applicationgroups-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dvagcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ hostPoolName: 'dep-${namePrefix}-hp-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ applicationGroupType: 'RemoteApp'
+ hostpoolName: nestedDependencies.outputs.hostPoolName
+ applications: [
+ {
+ commandLineArguments: ''
+ commandLineSetting: 'DoNotAllow'
+ description: 'Notepad by ARM template'
+ filePath: 'C:\\Windows\\System32\\notepad.exe'
+ friendlyName: 'Notepad'
+ iconIndex: 0
+ iconPath: 'C:\\Windows\\System32\\notepad.exe'
+ name: 'notepad'
+ showInPortal: true
+ }
+ {
+ filePath: 'C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe'
+ friendlyName: 'Wordpad'
+ name: 'wordpad'
+ }
+ ]
+ description: 'This is my first Remote Applications bundle'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ friendlyName: 'Remote Applications 1'
+ location: location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/desktop-virtualization/application-group/.test/min/main.test.bicep b/modules/desktop-virtualization/application-group/.test/min/main.test.bicep
index 8dae8dc2d4..dc7a01bd2d 100644
--- a/modules/desktop-virtualization/application-group/.test/min/main.test.bicep
+++ b/modules/desktop-virtualization/application-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.applicationgroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.applicationgroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep b/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep
index 32ceebbc21..1f31acac55 100644
--- a/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep
+++ b/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep
@@ -1,131 +1,131 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.hostpools-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dvhpcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- customRdpProperty: 'audiocapturemode:i:1;audiomode:i:0;drivestoredirect:s:;redirectclipboard:i:1;redirectcomports:i:1;redirectprinters:i:1;redirectsmartcards:i:1;screen mode id:i:2;'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- description: 'My first AVD Host Pool'
- friendlyName: 'AVDv2'
- type: 'Pooled'
- loadBalancerType: 'BreadthFirst'
- location: location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- maxSessionLimit: 99999
- personalDesktopAssignmentType: 'Automatic'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- vmTemplate: {
- customImageId: null
- domain: 'domainname.onmicrosoft.com'
- galleryImageOffer: 'office-365'
- galleryImagePublisher: 'microsoftwindowsdesktop'
- galleryImageSKU: '20h1-evd-o365pp'
- imageType: 'Gallery'
- imageUri: null
- namePrefix: 'avdv2'
- osDiskType: 'StandardSSD_LRS'
- useManagedDisks: true
- vmSize: {
- cores: 2
- id: 'Standard_D2s_v3'
- ram: 8
- }
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- agentUpdate: {
- type: 'Scheduled'
- useSessionHostLocalTime: false
- maintenanceWindowTimeZone: 'Alaskan Standard Time'
- maintenanceWindows: [
- {
- hour: 7
- dayOfWeek: 'Friday'
- }
- {
- hour: 8
- dayOfWeek: 'Saturday'
- }
- ]
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.hostpools-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dvhpcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ customRdpProperty: 'audiocapturemode:i:1;audiomode:i:0;drivestoredirect:s:;redirectclipboard:i:1;redirectcomports:i:1;redirectprinters:i:1;redirectsmartcards:i:1;screen mode id:i:2;'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ description: 'My first AVD Host Pool'
+ friendlyName: 'AVDv2'
+ type: 'Pooled'
+ loadBalancerType: 'BreadthFirst'
+ location: location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ maxSessionLimit: 99999
+ personalDesktopAssignmentType: 'Automatic'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ vmTemplate: {
+ customImageId: null
+ domain: 'domainname.onmicrosoft.com'
+ galleryImageOffer: 'office-365'
+ galleryImagePublisher: 'microsoftwindowsdesktop'
+ galleryImageSKU: '20h1-evd-o365pp'
+ imageType: 'Gallery'
+ imageUri: null
+ namePrefix: 'avdv2'
+ osDiskType: 'StandardSSD_LRS'
+ useManagedDisks: true
+ vmSize: {
+ cores: 2
+ id: 'Standard_D2s_v3'
+ ram: 8
+ }
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ agentUpdate: {
+ type: 'Scheduled'
+ useSessionHostLocalTime: false
+ maintenanceWindowTimeZone: 'Alaskan Standard Time'
+ maintenanceWindows: [
+ {
+ hour: 7
+ dayOfWeek: 'Friday'
+ }
+ {
+ hour: 8
+ dayOfWeek: 'Saturday'
+ }
+ ]
+ }
+ }
+}
diff --git a/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep b/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep
index 7691ccaa51..2f46ec4302 100644
--- a/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep
+++ b/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.hostpools-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.hostpools-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep b/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep
index 8bac8f3c16..51db20c88f 100644
--- a/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep
+++ b/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep
@@ -1,129 +1,129 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.scalingplans-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dvspcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- hostPoolType: 'Pooled'
- friendlyName: 'My Scaling Plan'
- description: 'My Scaling Plan Description'
- schedules: [ {
- rampUpStartTime: {
- hour: 7
- minute: 0
- }
- peakStartTime: {
- hour: 9
- minute: 0
- }
- rampDownStartTime: {
- hour: 18
- minute: 0
- }
- offPeakStartTime: {
- hour: 20
- minute: 0
- }
- name: 'weekdays_schedule'
- daysOfWeek: [
- 'Monday'
- 'Tuesday'
- 'Wednesday'
- 'Thursday'
- 'Friday'
- ]
- rampUpLoadBalancingAlgorithm: 'DepthFirst'
- rampUpMinimumHostsPct: 20
- rampUpCapacityThresholdPct: 60
- peakLoadBalancingAlgorithm: 'DepthFirst'
- rampDownLoadBalancingAlgorithm: 'DepthFirst'
- rampDownMinimumHostsPct: 10
- rampDownCapacityThresholdPct: 90
- rampDownForceLogoffUsers: true
- rampDownWaitTimeMinutes: 30
- rampDownNotificationMessage: 'You will be logged off in 30 min. Make sure to save your work.'
- rampDownStopHostsWhen: 'ZeroSessions'
- offPeakLoadBalancingAlgorithm: 'DepthFirst'
- }
- ]
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.scalingplans-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dvspcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ hostPoolType: 'Pooled'
+ friendlyName: 'My Scaling Plan'
+ description: 'My Scaling Plan Description'
+ schedules: [ {
+ rampUpStartTime: {
+ hour: 7
+ minute: 0
+ }
+ peakStartTime: {
+ hour: 9
+ minute: 0
+ }
+ rampDownStartTime: {
+ hour: 18
+ minute: 0
+ }
+ offPeakStartTime: {
+ hour: 20
+ minute: 0
+ }
+ name: 'weekdays_schedule'
+ daysOfWeek: [
+ 'Monday'
+ 'Tuesday'
+ 'Wednesday'
+ 'Thursday'
+ 'Friday'
+ ]
+ rampUpLoadBalancingAlgorithm: 'DepthFirst'
+ rampUpMinimumHostsPct: 20
+ rampUpCapacityThresholdPct: 60
+ peakLoadBalancingAlgorithm: 'DepthFirst'
+ rampDownLoadBalancingAlgorithm: 'DepthFirst'
+ rampDownMinimumHostsPct: 10
+ rampDownCapacityThresholdPct: 90
+ rampDownForceLogoffUsers: true
+ rampDownWaitTimeMinutes: 30
+ rampDownNotificationMessage: 'You will be logged off in 30 min. Make sure to save your work.'
+ rampDownStopHostsWhen: 'ZeroSessions'
+ offPeakLoadBalancingAlgorithm: 'DepthFirst'
+ }
+ ]
+ }
+}
diff --git a/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep b/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep
index 9eac3af179..edfaf01186 100644
--- a/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep
+++ b/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.scalingplans-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.scalingplans-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/desktop-virtualization/workspace/.test/common/main.test.bicep b/modules/desktop-virtualization/workspace/.test/common/main.test.bicep
index 32f56ddeb9..15b19e5eeb 100644
--- a/modules/desktop-virtualization/workspace/.test/common/main.test.bicep
+++ b/modules/desktop-virtualization/workspace/.test/common/main.test.bicep
@@ -1,99 +1,99 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dvwcom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- applicationGroupName: 'dep-${namePrefix}-appGroup-${serviceShort}'
- hostPoolName: 'dep-${namePrefix}-hp-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- appGroupResourceIds: [
- nestedDependencies.outputs.applicationGroupResourceId
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- location: location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- description: 'This is my first AVD Workspace'
- friendlyName: 'My first AVD Workspace'
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.workspaces-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dvwcom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ applicationGroupName: 'dep-${namePrefix}-appGroup-${serviceShort}'
+ hostPoolName: 'dep-${namePrefix}-hp-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ appGroupResourceIds: [
+ nestedDependencies.outputs.applicationGroupResourceId
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ location: location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ description: 'This is my first AVD Workspace'
+ friendlyName: 'My first AVD Workspace'
+ }
+}
diff --git a/modules/desktop-virtualization/workspace/.test/min/main.test.bicep b/modules/desktop-virtualization/workspace/.test/min/main.test.bicep
index 78df110582..478c8a8f34 100644
--- a/modules/desktop-virtualization/workspace/.test/min/main.test.bicep
+++ b/modules/desktop-virtualization/workspace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-desktopvirtualization.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/dev-test-lab/lab/.test/common/main.test.bicep b/modules/dev-test-lab/lab/.test/common/main.test.bicep
index 2e1638c01f..8d2d71c3c4 100644
--- a/modules/dev-test-lab/lab/.test/common/main.test.bicep
+++ b/modules/dev-test-lab/lab/.test/common/main.test.bicep
@@ -1,285 +1,285 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.devtestlab.labs-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dtllcom'
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
- storageAccountName: 'dep${namePrefix}sa${serviceShort}'
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- location: resourceGroup.location
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- resourceType: 'DevTest Lab'
- labName: '${namePrefix}${serviceShort}001'
- }
- announcement: {
- enabled: 'Enabled'
- expirationDate: '2025-12-30T13:00:00.000Z'
- markdown: 'DevTest Lab announcement text.
New line. It also supports Markdown'
- title: 'DevTest announcement title'
- }
- environmentPermission: 'Contributor'
- extendedProperties: {
- RdpConnectionType: '7'
- }
- labStorageType: 'Premium'
- artifactsStorageAccount: nestedDependencies.outputs.storageAccountResourceId
- premiumDataDisks: 'Enabled'
- support: {
- enabled: 'Enabled'
- markdown: 'DevTest Lab support text.
New line. It also supports Markdown'
- }
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- managementIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- vmCreationResourceGroupId: resourceGroup.id
- browserConnect: 'Enabled'
- disableAutoUpgradeCseMinorVersion: true
- isolateLabResources: 'Enabled'
- encryptionType: 'EncryptionAtRestWithCustomerKey'
- encryptionDiskEncryptionSetId: nestedDependencies.outputs.diskEncryptionSetResourceId
- virtualnetworks: [
- {
- name: nestedDependencies.outputs.virtualNetworkName
- externalProviderResourceId: nestedDependencies.outputs.virtualNetworkResourceId
- description: 'lab virtual network description'
- allowedSubnets: [
- {
- labSubnetName: nestedDependencies.outputs.subnetName
- resourceId: nestedDependencies.outputs.subnetResourceId
- allowPublicIp: 'Allow'
- }
- ]
- subnetOverrides: [
- {
- labSubnetName: nestedDependencies.outputs.subnetName
- resourceId: nestedDependencies.outputs.subnetResourceId
- useInVmCreationPermission: 'Allow'
- usePublicIpAddressPermission: 'Allow'
- sharedPublicIpAddressConfiguration: {
- allowedPorts: [
- {
- transportProtocol: 'Tcp'
- backendPort: 3389
- }
- {
- transportProtocol: 'Tcp'
- backendPort: 22
- }
- ]
- }
- }
- ]
- }
- ]
- policies: [
- {
- name: nestedDependencies.outputs.subnetName
- evaluatorType: 'MaxValuePolicy'
- factData: nestedDependencies.outputs.subnetResourceId
- factName: 'UserOwnedLabVmCountInSubnet'
- threshold: '1'
- }
- {
- name: 'MaxVmsAllowedPerUser'
- evaluatorType: 'MaxValuePolicy'
- factName: 'UserOwnedLabVmCount'
- threshold: '2'
- }
- {
- name: 'MaxPremiumVmsAllowedPerUser'
- evaluatorType: 'MaxValuePolicy'
- factName: 'UserOwnedLabPremiumVmCount'
- status: 'Disabled'
- threshold: '1'
- }
- {
- name: 'MaxVmsAllowedPerLab'
- evaluatorType: 'MaxValuePolicy'
- factName: 'LabVmCount'
- threshold: '3'
- }
- {
- name: 'MaxPremiumVmsAllowedPerLab'
- evaluatorType: 'MaxValuePolicy'
- factName: 'LabPremiumVmCount'
- threshold: '2'
- }
- {
- name: 'AllowedVmSizesInLab'
- evaluatorType: 'AllowedValuesPolicy'
- factData: ''
- factName: 'LabVmSize'
- threshold: ' ${string('["Basic_A0","Basic_A1"]')}'
- status: 'Enabled'
- }
- {
- name: 'ScheduleEditPermission'
- evaluatorType: 'AllowedValuesPolicy'
- factName: 'ScheduleEditPermission'
- threshold: ' ${string('["None","Modify"]')}'
- }
- {
- name: 'GalleryImage'
- evaluatorType: 'AllowedValuesPolicy'
- factName: 'GalleryImage'
- threshold: ' ${string('["{\\"offer\\":\\"WindowsServer\\",\\"publisher\\":\\"MicrosoftWindowsServer\\",\\"sku\\":\\"2019-Datacenter-smalldisk\\",\\"osType\\":\\"Windows\\",\\"version\\":\\"latest\\"}","{\\"offer\\":\\"WindowsServer\\",\\"publisher\\":\\"MicrosoftWindowsServer\\",\\"sku\\":\\"2022-datacenter-smalldisk\\",\\"osType\\":\\"Windows\\",\\"version\\":\\"latest\\"}"]')}'
- }
- {
- name: 'EnvironmentTemplate'
- description: 'Public Environment Policy'
- evaluatorType: 'AllowedValuesPolicy'
- factName: 'EnvironmentTemplate'
- threshold: ' ${string('[""]')}'
- }
- ]
- schedules: [
- {
- name: 'LabVmsShutdown'
- taskType: 'LabVmsShutdownTask'
- status: 'Enabled'
- timeZoneId: 'AUS Eastern Standard Time'
- dailyRecurrence: {
- time: '0000'
- }
- notificationSettingsStatus: 'Enabled'
- notificationSettingsTimeInMinutes: 30
- }
- {
- name: 'LabVmAutoStart'
- taskType: 'LabVmsStartupTask'
- status: 'Enabled'
- timeZoneId: 'AUS Eastern Standard Time'
- weeklyRecurrence: {
- time: '0700'
- weekdays: [
- 'Monday'
- 'Tuesday'
- 'Wednesday'
- 'Thursday'
- 'Friday'
- ]
- }
- }
- ]
- notificationchannels: [
- {
- name: 'autoShutdown'
- description: 'Integration configured for auto-shutdown'
- events: [
- {
- eventName: 'AutoShutdown'
- }
- ]
- emailRecipient: 'mail@contosodtlmail.com'
- webHookUrl: 'https://webhook.contosotest.com'
- notificationLocale: 'en'
- }
- {
- name: 'costThreshold'
- events: [
- {
- eventName: 'Cost'
- }
- ]
- webHookUrl: 'https://webhook.contosotest.com'
- }
- ]
- artifactsources: [
- {
- name: 'Public Repo'
- displayName: 'Public Artifact Repo'
- status: 'Disabled'
- uri: 'https://github.com/Azure/azure-devtestlab.git'
- sourceType: 'GitHub'
- branchRef: 'master'
- folderPath: '/Artifacts'
- }
- {
- name: 'Public Environment Repo'
- displayName: 'Public Environment Repo'
- status: 'Disabled'
- uri: 'https://github.com/Azure/azure-devtestlab.git'
- sourceType: 'GitHub'
- branchRef: 'master'
- armTemplateFolderPath: '/Environments'
- }
- ]
- costs: {
- status: 'Enabled'
- cycleType: 'CalendarMonth'
- target: 450
- thresholdValue100DisplayOnChart: 'Enabled'
- thresholdValue100SendNotificationWhenExceeded: 'Enabled'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-devtestlab.labs-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dtllcom'
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ diskEncryptionSetName: 'dep-${namePrefix}-des-${serviceShort}'
+ storageAccountName: 'dep${namePrefix}sa${serviceShort}'
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ location: resourceGroup.location
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ resourceType: 'DevTest Lab'
+ labName: '${namePrefix}${serviceShort}001'
+ }
+ announcement: {
+ enabled: 'Enabled'
+ expirationDate: '2025-12-30T13:00:00.000Z'
+ markdown: 'DevTest Lab announcement text.
New line. It also supports Markdown'
+ title: 'DevTest announcement title'
+ }
+ environmentPermission: 'Contributor'
+ extendedProperties: {
+ RdpConnectionType: '7'
+ }
+ labStorageType: 'Premium'
+ artifactsStorageAccount: nestedDependencies.outputs.storageAccountResourceId
+ premiumDataDisks: 'Enabled'
+ support: {
+ enabled: 'Enabled'
+ markdown: 'DevTest Lab support text.
New line. It also supports Markdown'
+ }
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ managementIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ vmCreationResourceGroupId: resourceGroup.id
+ browserConnect: 'Enabled'
+ disableAutoUpgradeCseMinorVersion: true
+ isolateLabResources: 'Enabled'
+ encryptionType: 'EncryptionAtRestWithCustomerKey'
+ encryptionDiskEncryptionSetId: nestedDependencies.outputs.diskEncryptionSetResourceId
+ virtualnetworks: [
+ {
+ name: nestedDependencies.outputs.virtualNetworkName
+ externalProviderResourceId: nestedDependencies.outputs.virtualNetworkResourceId
+ description: 'lab virtual network description'
+ allowedSubnets: [
+ {
+ labSubnetName: nestedDependencies.outputs.subnetName
+ resourceId: nestedDependencies.outputs.subnetResourceId
+ allowPublicIp: 'Allow'
+ }
+ ]
+ subnetOverrides: [
+ {
+ labSubnetName: nestedDependencies.outputs.subnetName
+ resourceId: nestedDependencies.outputs.subnetResourceId
+ useInVmCreationPermission: 'Allow'
+ usePublicIpAddressPermission: 'Allow'
+ sharedPublicIpAddressConfiguration: {
+ allowedPorts: [
+ {
+ transportProtocol: 'Tcp'
+ backendPort: 3389
+ }
+ {
+ transportProtocol: 'Tcp'
+ backendPort: 22
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ policies: [
+ {
+ name: nestedDependencies.outputs.subnetName
+ evaluatorType: 'MaxValuePolicy'
+ factData: nestedDependencies.outputs.subnetResourceId
+ factName: 'UserOwnedLabVmCountInSubnet'
+ threshold: '1'
+ }
+ {
+ name: 'MaxVmsAllowedPerUser'
+ evaluatorType: 'MaxValuePolicy'
+ factName: 'UserOwnedLabVmCount'
+ threshold: '2'
+ }
+ {
+ name: 'MaxPremiumVmsAllowedPerUser'
+ evaluatorType: 'MaxValuePolicy'
+ factName: 'UserOwnedLabPremiumVmCount'
+ status: 'Disabled'
+ threshold: '1'
+ }
+ {
+ name: 'MaxVmsAllowedPerLab'
+ evaluatorType: 'MaxValuePolicy'
+ factName: 'LabVmCount'
+ threshold: '3'
+ }
+ {
+ name: 'MaxPremiumVmsAllowedPerLab'
+ evaluatorType: 'MaxValuePolicy'
+ factName: 'LabPremiumVmCount'
+ threshold: '2'
+ }
+ {
+ name: 'AllowedVmSizesInLab'
+ evaluatorType: 'AllowedValuesPolicy'
+ factData: ''
+ factName: 'LabVmSize'
+ threshold: ' ${string('["Basic_A0","Basic_A1"]')}'
+ status: 'Enabled'
+ }
+ {
+ name: 'ScheduleEditPermission'
+ evaluatorType: 'AllowedValuesPolicy'
+ factName: 'ScheduleEditPermission'
+ threshold: ' ${string('["None","Modify"]')}'
+ }
+ {
+ name: 'GalleryImage'
+ evaluatorType: 'AllowedValuesPolicy'
+ factName: 'GalleryImage'
+ threshold: ' ${string('["{\\"offer\\":\\"WindowsServer\\",\\"publisher\\":\\"MicrosoftWindowsServer\\",\\"sku\\":\\"2019-Datacenter-smalldisk\\",\\"osType\\":\\"Windows\\",\\"version\\":\\"latest\\"}","{\\"offer\\":\\"WindowsServer\\",\\"publisher\\":\\"MicrosoftWindowsServer\\",\\"sku\\":\\"2022-datacenter-smalldisk\\",\\"osType\\":\\"Windows\\",\\"version\\":\\"latest\\"}"]')}'
+ }
+ {
+ name: 'EnvironmentTemplate'
+ description: 'Public Environment Policy'
+ evaluatorType: 'AllowedValuesPolicy'
+ factName: 'EnvironmentTemplate'
+ threshold: ' ${string('[""]')}'
+ }
+ ]
+ schedules: [
+ {
+ name: 'LabVmsShutdown'
+ taskType: 'LabVmsShutdownTask'
+ status: 'Enabled'
+ timeZoneId: 'AUS Eastern Standard Time'
+ dailyRecurrence: {
+ time: '0000'
+ }
+ notificationSettingsStatus: 'Enabled'
+ notificationSettingsTimeInMinutes: 30
+ }
+ {
+ name: 'LabVmAutoStart'
+ taskType: 'LabVmsStartupTask'
+ status: 'Enabled'
+ timeZoneId: 'AUS Eastern Standard Time'
+ weeklyRecurrence: {
+ time: '0700'
+ weekdays: [
+ 'Monday'
+ 'Tuesday'
+ 'Wednesday'
+ 'Thursday'
+ 'Friday'
+ ]
+ }
+ }
+ ]
+ notificationchannels: [
+ {
+ name: 'autoShutdown'
+ description: 'Integration configured for auto-shutdown'
+ events: [
+ {
+ eventName: 'AutoShutdown'
+ }
+ ]
+ emailRecipient: 'mail@contosodtlmail.com'
+ webHookUrl: 'https://webhook.contosotest.com'
+ notificationLocale: 'en'
+ }
+ {
+ name: 'costThreshold'
+ events: [
+ {
+ eventName: 'Cost'
+ }
+ ]
+ webHookUrl: 'https://webhook.contosotest.com'
+ }
+ ]
+ artifactsources: [
+ {
+ name: 'Public Repo'
+ displayName: 'Public Artifact Repo'
+ status: 'Disabled'
+ uri: 'https://github.com/Azure/azure-devtestlab.git'
+ sourceType: 'GitHub'
+ branchRef: 'master'
+ folderPath: '/Artifacts'
+ }
+ {
+ name: 'Public Environment Repo'
+ displayName: 'Public Environment Repo'
+ status: 'Disabled'
+ uri: 'https://github.com/Azure/azure-devtestlab.git'
+ sourceType: 'GitHub'
+ branchRef: 'master'
+ armTemplateFolderPath: '/Environments'
+ }
+ ]
+ costs: {
+ status: 'Enabled'
+ cycleType: 'CalendarMonth'
+ target: 450
+ thresholdValue100DisplayOnChart: 'Enabled'
+ thresholdValue100SendNotificationWhenExceeded: 'Enabled'
+ }
+ }
+}
diff --git a/modules/dev-test-lab/lab/.test/min/main.test.bicep b/modules/dev-test-lab/lab/.test/min/main.test.bicep
index 7989d9f4d2..d78c982d07 100644
--- a/modules/dev-test-lab/lab/.test/min/main.test.bicep
+++ b/modules/dev-test-lab/lab/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.devtestlab.labs-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-devtestlab.labs-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep b/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep
index c22b836915..f8d12541d5 100644
--- a/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep
+++ b/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep
@@ -1,126 +1,126 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.digitaltwins.digitaltwinsinstances-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dtdticom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- eventHubName: 'dt-${uniqueString(serviceShort)}-evh-01'
- eventHubNamespaceName: 'dt-${uniqueString(serviceShort)}-evhns-01'
- serviceBusName: 'dt-${uniqueString(serviceShort)}-sb-01'
- eventGridDomainName: 'dt-${uniqueString(serviceShort)}-evg-01'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}03'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${uniqueString(serviceShort)}-evh-01'
- eventHubNamespaceName: 'dep-${uniqueString(serviceShort)}-evh-01'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- eventHubEndpoint: {
- authenticationType: 'IdentityBased'
- endpointUri: 'sb://${nestedDependencies.outputs.eventhubNamespaceName}.servicebus.windows.net/'
- entityPath: nestedDependencies.outputs.eventhubName
- userAssignedIdentity: nestedDependencies.outputs.managedIdentityResourceId
- }
- serviceBusEndpoint: {
- authenticationType: 'IdentityBased'
- endpointUri: 'sb://${nestedDependencies.outputs.serviceBusName}.servicebus.windows.net/'
- entityPath: nestedDependencies.outputs.serviceBusTopicName
- userAssignedIdentity: nestedDependencies.outputs.managedIdentityResourceId
- }
- eventGridEndpoint: {
- eventGridDomainId: nestedDependencies.outputs.eventGridDomainResourceId
- topicEndpoint: nestedDependencies.outputs.eventGridEndpoint
- }
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
-
- nestedDependencies.outputs.privateDNSZoneResourceId
-
- ]
- service: 'API'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalResourceId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-digitaltwins.digitaltwinsinstances-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dtdticom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ eventHubName: 'dt-${uniqueString(serviceShort)}-evh-01'
+ eventHubNamespaceName: 'dt-${uniqueString(serviceShort)}-evhns-01'
+ serviceBusName: 'dt-${uniqueString(serviceShort)}-sb-01'
+ eventGridDomainName: 'dt-${uniqueString(serviceShort)}-evg-01'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}03'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${uniqueString(serviceShort)}-evh-01'
+ eventHubNamespaceName: 'dep-${uniqueString(serviceShort)}-evh-01'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ eventHubEndpoint: {
+ authenticationType: 'IdentityBased'
+ endpointUri: 'sb://${nestedDependencies.outputs.eventhubNamespaceName}.servicebus.windows.net/'
+ entityPath: nestedDependencies.outputs.eventhubName
+ userAssignedIdentity: nestedDependencies.outputs.managedIdentityResourceId
+ }
+ serviceBusEndpoint: {
+ authenticationType: 'IdentityBased'
+ endpointUri: 'sb://${nestedDependencies.outputs.serviceBusName}.servicebus.windows.net/'
+ entityPath: nestedDependencies.outputs.serviceBusTopicName
+ userAssignedIdentity: nestedDependencies.outputs.managedIdentityResourceId
+ }
+ eventGridEndpoint: {
+ eventGridDomainId: nestedDependencies.outputs.eventGridDomainResourceId
+ topicEndpoint: nestedDependencies.outputs.eventGridEndpoint
+ }
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+
+ nestedDependencies.outputs.privateDNSZoneResourceId
+
+ ]
+ service: 'API'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalResourceId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep b/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep
index f970096185..7d9b327dc3 100644
--- a/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep
+++ b/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.digitaltwins.digitaltwinsinstances-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-digitaltwins.digitaltwinsinstances-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/document-db/database-account/.test/gremlindb/main.test.bicep b/modules/document-db/database-account/.test/gremlindb/main.test.bicep
index 2e866cecf8..19b9e89bce 100644
--- a/modules/document-db/database-account/.test/gremlindb/main.test.bicep
+++ b/modules/document-db/database-account/.test/gremlindb/main.test.bicep
@@ -1,150 +1,150 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.documentdb.databaseaccounts-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dddagrm'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}002'
- locations: [
- {
- failoverPriority: 0
- isZoneRedundant: false
- locationName: location
- }
- {
- failoverPriority: 1
- isZoneRedundant: false
- locationName: nestedDependencies.outputs.pairedRegionName
- }
- ]
- capabilitiesToAdd: [
- 'EnableGremlin'
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- gremlinDatabases: [
- {
- graphs: [
- {
- indexingPolicy: {
- automatic: true
- }
- name: 'car_collection'
- partitionKeyPaths: [
- '/car_id'
- ]
- }
- {
- indexingPolicy: {
- automatic: true
- }
- name: 'truck_collection'
- partitionKeyPaths: [
- '/truck_id'
- ]
- }
- ]
- name: '${namePrefix}-gdb-${serviceShort}-001'
- }
- {
- collections: [
- {
- indexingPolicy: {
- automatic: true
- }
- name: 'bike_collection'
- partitionKeyPaths: [
- '/bike_id'
- ]
- }
- {
- indexingPolicy: {
- automatic: true
- }
- name: 'bicycle_collection'
- partitionKeyPaths: [
- '/bicycle_id'
- ]
- }
- ]
- name: '${namePrefix}-gdb-${serviceShort}-002'
- }
- ]
- location: location
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-documentdb.databaseaccounts-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dddagrm'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}002'
+ locations: [
+ {
+ failoverPriority: 0
+ isZoneRedundant: false
+ locationName: location
+ }
+ {
+ failoverPriority: 1
+ isZoneRedundant: false
+ locationName: nestedDependencies.outputs.pairedRegionName
+ }
+ ]
+ capabilitiesToAdd: [
+ 'EnableGremlin'
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ gremlinDatabases: [
+ {
+ graphs: [
+ {
+ indexingPolicy: {
+ automatic: true
+ }
+ name: 'car_collection'
+ partitionKeyPaths: [
+ '/car_id'
+ ]
+ }
+ {
+ indexingPolicy: {
+ automatic: true
+ }
+ name: 'truck_collection'
+ partitionKeyPaths: [
+ '/truck_id'
+ ]
+ }
+ ]
+ name: '${namePrefix}-gdb-${serviceShort}-001'
+ }
+ {
+ collections: [
+ {
+ indexingPolicy: {
+ automatic: true
+ }
+ name: 'bike_collection'
+ partitionKeyPaths: [
+ '/bike_id'
+ ]
+ }
+ {
+ indexingPolicy: {
+ automatic: true
+ }
+ name: 'bicycle_collection'
+ partitionKeyPaths: [
+ '/bicycle_id'
+ ]
+ }
+ ]
+ name: '${namePrefix}-gdb-${serviceShort}-002'
+ }
+ ]
+ location: location
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/document-db/database-account/.test/mongodb/main.test.bicep b/modules/document-db/database-account/.test/mongodb/main.test.bicep
index ced367df7d..f035b3a833 100644
--- a/modules/document-db/database-account/.test/mongodb/main.test.bicep
+++ b/modules/document-db/database-account/.test/mongodb/main.test.bicep
@@ -1,283 +1,283 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.documentdb.databaseaccounts-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dddamng'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- locations: [
- {
- failoverPriority: 0
- isZoneRedundant: false
- locationName: location
- }
- {
- failoverPriority: 1
- isZoneRedundant: false
- locationName: nestedDependencies.outputs.pairedRegionName
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- location: location
- mongodbDatabases: [
- {
- collections: [
- {
- indexes: [
- {
- key: {
- keys: [
- '_id'
- ]
- }
- }
- {
- key: {
- keys: [
- '$**'
- ]
- }
- }
- {
- key: {
- keys: [
- 'car_id'
- 'car_model'
- ]
- }
- options: {
- unique: true
- }
- }
- {
- key: {
- keys: [
- '_ts'
- ]
- }
- options: {
- expireAfterSeconds: 2629746
- }
- }
- ]
- name: 'car_collection'
- shardKey: {
- car_id: 'Hash'
- }
- }
- {
- indexes: [
- {
- key: {
- keys: [
- '_id'
- ]
- }
- }
- {
- key: {
- keys: [
- '$**'
- ]
- }
- }
- {
- key: {
- keys: [
- 'truck_id'
- 'truck_model'
- ]
- }
- options: {
- unique: true
- }
- }
- {
- key: {
- keys: [
- '_ts'
- ]
- }
- options: {
- expireAfterSeconds: 2629746
- }
- }
- ]
- name: 'truck_collection'
- shardKey: {
- truck_id: 'Hash'
- }
- }
- ]
- name: '${namePrefix}-mdb-${serviceShort}-001'
- }
- {
- collections: [
- {
- indexes: [
- {
- key: {
- keys: [
- '_id'
- ]
- }
- }
- {
- key: {
- keys: [
- '$**'
- ]
- }
- }
- {
- key: {
- keys: [
- 'bike_id'
- 'bike_model'
- ]
- }
- options: {
- unique: true
- }
- }
- {
- key: {
- keys: [
- '_ts'
- ]
- }
- options: {
- expireAfterSeconds: 2629746
- }
- }
- ]
- name: 'bike_collection'
- shardKey: {
- bike_id: 'Hash'
- }
- }
- {
- indexes: [
- {
- key: {
- keys: [
- '_id'
- ]
- }
- }
- {
- key: {
- keys: [
- '$**'
- ]
- }
- }
- {
- key: {
- keys: [
- 'bicycle_id'
- 'bicycle_model'
- ]
- }
- options: {
- unique: true
- }
- }
- {
- key: {
- keys: [
- '_ts'
- ]
- }
- options: {
- expireAfterSeconds: 2629746
- }
- }
- ]
- name: 'bicycle_collection'
- shardKey: {
- bicycle_id: 'Hash'
- }
- }
- ]
- name: '${namePrefix}-mdb-${serviceShort}-002'
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- systemAssignedIdentity: true
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-documentdb.databaseaccounts-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dddamng'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ locations: [
+ {
+ failoverPriority: 0
+ isZoneRedundant: false
+ locationName: location
+ }
+ {
+ failoverPriority: 1
+ isZoneRedundant: false
+ locationName: nestedDependencies.outputs.pairedRegionName
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ location: location
+ mongodbDatabases: [
+ {
+ collections: [
+ {
+ indexes: [
+ {
+ key: {
+ keys: [
+ '_id'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ '$**'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ 'car_id'
+ 'car_model'
+ ]
+ }
+ options: {
+ unique: true
+ }
+ }
+ {
+ key: {
+ keys: [
+ '_ts'
+ ]
+ }
+ options: {
+ expireAfterSeconds: 2629746
+ }
+ }
+ ]
+ name: 'car_collection'
+ shardKey: {
+ car_id: 'Hash'
+ }
+ }
+ {
+ indexes: [
+ {
+ key: {
+ keys: [
+ '_id'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ '$**'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ 'truck_id'
+ 'truck_model'
+ ]
+ }
+ options: {
+ unique: true
+ }
+ }
+ {
+ key: {
+ keys: [
+ '_ts'
+ ]
+ }
+ options: {
+ expireAfterSeconds: 2629746
+ }
+ }
+ ]
+ name: 'truck_collection'
+ shardKey: {
+ truck_id: 'Hash'
+ }
+ }
+ ]
+ name: '${namePrefix}-mdb-${serviceShort}-001'
+ }
+ {
+ collections: [
+ {
+ indexes: [
+ {
+ key: {
+ keys: [
+ '_id'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ '$**'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ 'bike_id'
+ 'bike_model'
+ ]
+ }
+ options: {
+ unique: true
+ }
+ }
+ {
+ key: {
+ keys: [
+ '_ts'
+ ]
+ }
+ options: {
+ expireAfterSeconds: 2629746
+ }
+ }
+ ]
+ name: 'bike_collection'
+ shardKey: {
+ bike_id: 'Hash'
+ }
+ }
+ {
+ indexes: [
+ {
+ key: {
+ keys: [
+ '_id'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ '$**'
+ ]
+ }
+ }
+ {
+ key: {
+ keys: [
+ 'bicycle_id'
+ 'bicycle_model'
+ ]
+ }
+ options: {
+ unique: true
+ }
+ }
+ {
+ key: {
+ keys: [
+ '_ts'
+ ]
+ }
+ options: {
+ expireAfterSeconds: 2629746
+ }
+ }
+ ]
+ name: 'bicycle_collection'
+ shardKey: {
+ bicycle_id: 'Hash'
+ }
+ }
+ ]
+ name: '${namePrefix}-mdb-${serviceShort}-002'
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ systemAssignedIdentity: true
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/document-db/database-account/.test/plain/main.test.bicep b/modules/document-db/database-account/.test/plain/main.test.bicep
index d04162c5a2..498377bc47 100644
--- a/modules/document-db/database-account/.test/plain/main.test.bicep
+++ b/modules/document-db/database-account/.test/plain/main.test.bicep
@@ -1,101 +1,101 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.documentdb.databaseaccounts-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dddapln'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- locations: [
- {
- failoverPriority: 0
- isZoneRedundant: false
- locationName: location
- }
- {
- failoverPriority: 1
- isZoneRedundant: false
- locationName: nestedDependencies.outputs.pairedRegionName
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-documentdb.databaseaccounts-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dddapln'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ locations: [
+ {
+ failoverPriority: 0
+ isZoneRedundant: false
+ locationName: location
+ }
+ {
+ failoverPriority: 1
+ isZoneRedundant: false
+ locationName: nestedDependencies.outputs.pairedRegionName
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/document-db/database-account/.test/sqldb/main.test.bicep b/modules/document-db/database-account/.test/sqldb/main.test.bicep
index 1f3bf9433f..1ab334873d 100644
--- a/modules/document-db/database-account/.test/sqldb/main.test.bicep
+++ b/modules/document-db/database-account/.test/sqldb/main.test.bicep
@@ -1,194 +1,194 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.documentdb.databaseaccounts-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'dddasql'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- locations: [
- {
- failoverPriority: 0
- isZoneRedundant: false
- locationName: location
- }
- {
- failoverPriority: 1
- isZoneRedundant: false
- locationName: nestedDependencies.outputs.pairedRegionName
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- location: location
- privateEndpoints: [
- {
- privateDnsZoneResourceIds: [
-
- nestedDependencies.outputs.privateDNSZoneResourceId
-
- ]
- service: 'Sql'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
- ]
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- sqlDatabases: [
- {
- containers: [
- {
- kind: 'Hash'
- name: 'container-001'
- indexingPolicy: {
- automatic: true
- }
- paths: [
- '/myPartitionKey'
- ]
- analyticalStorageTtl: 0
- conflictResolutionPolicy: {
- conflictResolutionPath: '/myCustomId'
- mode: 'LastWriterWins'
- }
- defaultTtl: 1000
- uniqueKeyPolicyKeys: [
- {
- paths: [
- '/firstName'
- ]
- }
- {
- paths: [
- '/lastName'
- ]
- }
- ]
- throughput: 600
- }
- ]
- name: '${namePrefix}-sql-${serviceShort}-001'
- throughput: 1000
- }
- {
- containers: []
- name: '${namePrefix}-sql-${serviceShort}-002'
- }
- {
- containers: [
- {
- kind: 'Hash'
- name: 'container-003'
- autoscaleSettingsMaxThroughput: 1000
- indexingPolicy: {
- automatic: true
- }
- paths: [
- '/myPartitionKey'
- ]
- analyticalStorageTtl: 0
- conflictResolutionPolicy: {
- conflictResolutionPath: '/myCustomId'
- mode: 'LastWriterWins'
- }
- defaultTtl: 1000
- uniqueKeyPolicyKeys: [
- {
- paths: [
- '/firstName'
- ]
- }
- {
- paths: [
- '/lastName'
- ]
- }
- ]
- }
- ]
- name: '${namePrefix}-sql-${serviceShort}-003'
- autoscaleSettingsMaxThroughput: 1000
- }
- ]
- userAssignedIdentities: {
- '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-documentdb.databaseaccounts-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'dddasql'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ pairedRegionScriptName: 'dep-${namePrefix}-ds-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ locations: [
+ {
+ failoverPriority: 0
+ isZoneRedundant: false
+ locationName: location
+ }
+ {
+ failoverPriority: 1
+ isZoneRedundant: false
+ locationName: nestedDependencies.outputs.pairedRegionName
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ location: location
+ privateEndpoints: [
+ {
+ privateDnsZoneResourceIds: [
+
+ nestedDependencies.outputs.privateDNSZoneResourceId
+
+ ]
+ service: 'Sql'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ sqlDatabases: [
+ {
+ containers: [
+ {
+ kind: 'Hash'
+ name: 'container-001'
+ indexingPolicy: {
+ automatic: true
+ }
+ paths: [
+ '/myPartitionKey'
+ ]
+ analyticalStorageTtl: 0
+ conflictResolutionPolicy: {
+ conflictResolutionPath: '/myCustomId'
+ mode: 'LastWriterWins'
+ }
+ defaultTtl: 1000
+ uniqueKeyPolicyKeys: [
+ {
+ paths: [
+ '/firstName'
+ ]
+ }
+ {
+ paths: [
+ '/lastName'
+ ]
+ }
+ ]
+ throughput: 600
+ }
+ ]
+ name: '${namePrefix}-sql-${serviceShort}-001'
+ throughput: 1000
+ }
+ {
+ containers: []
+ name: '${namePrefix}-sql-${serviceShort}-002'
+ }
+ {
+ containers: [
+ {
+ kind: 'Hash'
+ name: 'container-003'
+ autoscaleSettingsMaxThroughput: 1000
+ indexingPolicy: {
+ automatic: true
+ }
+ paths: [
+ '/myPartitionKey'
+ ]
+ analyticalStorageTtl: 0
+ conflictResolutionPolicy: {
+ conflictResolutionPath: '/myCustomId'
+ mode: 'LastWriterWins'
+ }
+ defaultTtl: 1000
+ uniqueKeyPolicyKeys: [
+ {
+ paths: [
+ '/firstName'
+ ]
+ }
+ {
+ paths: [
+ '/lastName'
+ ]
+ }
+ ]
+ }
+ ]
+ name: '${namePrefix}-sql-${serviceShort}-003'
+ autoscaleSettingsMaxThroughput: 1000
+ }
+ ]
+ userAssignedIdentities: {
+ '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/event-grid/domain/.test/common/main.test.bicep b/modules/event-grid/domain/.test/common/main.test.bicep
index 373d3bee63..c823327b94 100644
--- a/modules/event-grid/domain/.test/common/main.test.bicep
+++ b/modules/event-grid/domain/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.domains-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.domains-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/domain/.test/min/main.test.bicep b/modules/event-grid/domain/.test/min/main.test.bicep
index f7238a4aaa..a531c4d003 100644
--- a/modules/event-grid/domain/.test/min/main.test.bicep
+++ b/modules/event-grid/domain/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.domains-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.domains-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/domain/.test/pe/main.test.bicep b/modules/event-grid/domain/.test/pe/main.test.bicep
index 5cf831f7c2..cd166546be 100644
--- a/modules/event-grid/domain/.test/pe/main.test.bicep
+++ b/modules/event-grid/domain/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.domains-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.domains-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/system-topic/.test/common/main.test.bicep b/modules/event-grid/system-topic/.test/common/main.test.bicep
index 0c4c9c5284..94540717ab 100644
--- a/modules/event-grid/system-topic/.test/common/main.test.bicep
+++ b/modules/event-grid/system-topic/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.systemtopics-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.systemtopics-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/system-topic/.test/min/main.test.bicep b/modules/event-grid/system-topic/.test/min/main.test.bicep
index 52ccd0b7bc..c8767d484b 100644
--- a/modules/event-grid/system-topic/.test/min/main.test.bicep
+++ b/modules/event-grid/system-topic/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.systemtopics-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.systemtopics-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/topic/.test/common/main.test.bicep b/modules/event-grid/topic/.test/common/main.test.bicep
index 1e9e0bec23..a8b73d8fb5 100644
--- a/modules/event-grid/topic/.test/common/main.test.bicep
+++ b/modules/event-grid/topic/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.topics-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.topics-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/topic/.test/min/main.test.bicep b/modules/event-grid/topic/.test/min/main.test.bicep
index 6e3cc70796..f8ec16cb64 100644
--- a/modules/event-grid/topic/.test/min/main.test.bicep
+++ b/modules/event-grid/topic/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.topics-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.topics-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-grid/topic/.test/pe/main.test.bicep b/modules/event-grid/topic/.test/pe/main.test.bicep
index a5c992940d..377965d0ec 100644
--- a/modules/event-grid/topic/.test/pe/main.test.bicep
+++ b/modules/event-grid/topic/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventgrid.topics-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventgrid.topics-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-hub/namespace/.test/common/main.test.bicep b/modules/event-hub/namespace/.test/common/main.test.bicep
index 4d6819b790..f136c3226c 100644
--- a/modules/event-hub/namespace/.test/common/main.test.bicep
+++ b/modules/event-hub/namespace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventhub.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventhub.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-hub/namespace/.test/encr/main.test.bicep b/modules/event-hub/namespace/.test/encr/main.test.bicep
index 1a5985d41c..39a945d650 100644
--- a/modules/event-hub/namespace/.test/encr/main.test.bicep
+++ b/modules/event-hub/namespace/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventhub.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventhub.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-hub/namespace/.test/min/main.test.bicep b/modules/event-hub/namespace/.test/min/main.test.bicep
index 282a233685..5b731169d3 100644
--- a/modules/event-hub/namespace/.test/min/main.test.bicep
+++ b/modules/event-hub/namespace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventhub.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventhub.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/event-hub/namespace/.test/pe/main.test.bicep b/modules/event-hub/namespace/.test/pe/main.test.bicep
index 73335efe06..66d56ba9f6 100644
--- a/modules/event-hub/namespace/.test/pe/main.test.bicep
+++ b/modules/event-hub/namespace/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.eventhub.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-eventhub.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/health-bot/health-bot/.test/common/main.test.bicep b/modules/health-bot/health-bot/.test/common/main.test.bicep
index 256cebfa4e..c749c0fb14 100644
--- a/modules/health-bot/health-bot/.test/common/main.test.bicep
+++ b/modules/health-bot/health-bot/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.healthbot.healthbots-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-healthbot.healthbots-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/health-bot/health-bot/.test/min/main.test.bicep b/modules/health-bot/health-bot/.test/min/main.test.bicep
index 6c9996b611..29b0984187 100644
--- a/modules/health-bot/health-bot/.test/min/main.test.bicep
+++ b/modules/health-bot/health-bot/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.healthbot.healthbots-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-healthbot.healthbots-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/healthcare-apis/workspace/.test/common/main.test.bicep b/modules/healthcare-apis/workspace/.test/common/main.test.bicep
index dbc8e30330..9c8387d95f 100644
--- a/modules/healthcare-apis/workspace/.test/common/main.test.bicep
+++ b/modules/healthcare-apis/workspace/.test/common/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with most of its featur
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.healthcareapis.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-healthcareapis.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/healthcare-apis/workspace/.test/min/main.test.bicep b/modules/healthcare-apis/workspace/.test/min/main.test.bicep
index 95061177c5..cc3b068314 100644
--- a/modules/healthcare-apis/workspace/.test/min/main.test.bicep
+++ b/modules/healthcare-apis/workspace/.test/min/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with the minimum set of
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.healthcareapis.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-healthcareapis.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/action-group/.test/common/main.test.bicep b/modules/insights/action-group/.test/common/main.test.bicep
index 4f4d8071b8..0e979a0e1e 100644
--- a/modules/insights/action-group/.test/common/main.test.bicep
+++ b/modules/insights/action-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.actiongroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.actiongroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/action-group/.test/min/main.test.bicep b/modules/insights/action-group/.test/min/main.test.bicep
index 22938cd7a3..51ccd12b5c 100644
--- a/modules/insights/action-group/.test/min/main.test.bicep
+++ b/modules/insights/action-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.actiongroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.actiongroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/activity-log-alert/.test/common/main.test.bicep b/modules/insights/activity-log-alert/.test/common/main.test.bicep
index 49d570477c..d69c866a34 100644
--- a/modules/insights/activity-log-alert/.test/common/main.test.bicep
+++ b/modules/insights/activity-log-alert/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.activityLogAlerts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.activityLogAlerts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/component/.test/common/main.test.bicep b/modules/insights/component/.test/common/main.test.bicep
index 31b26886ab..a4d4b19f86 100644
--- a/modules/insights/component/.test/common/main.test.bicep
+++ b/modules/insights/component/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.components-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.components-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/component/.test/min/main.test.bicep b/modules/insights/component/.test/min/main.test.bicep
index 965482d24d..15a5d43c53 100644
--- a/modules/insights/component/.test/min/main.test.bicep
+++ b/modules/insights/component/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.components-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.components-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-endpoint/.test/common/main.test.bicep b/modules/insights/data-collection-endpoint/.test/common/main.test.bicep
index 38434e41b8..8eaa84fa6d 100644
--- a/modules/insights/data-collection-endpoint/.test/common/main.test.bicep
+++ b/modules/insights/data-collection-endpoint/.test/common/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with most of its featur
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionEndpoints-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionEndpoints-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-endpoint/.test/min/main.test.bicep b/modules/insights/data-collection-endpoint/.test/min/main.test.bicep
index 0ac9115755..39a8e35586 100644
--- a/modules/insights/data-collection-endpoint/.test/min/main.test.bicep
+++ b/modules/insights/data-collection-endpoint/.test/min/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with the minimum set of
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionEndpoints-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionEndpoints-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/customadv/main.test.bicep b/modules/insights/data-collection-rule/.test/customadv/main.test.bicep
index c4481adbbf..622b276f22 100644
--- a/modules/insights/data-collection-rule/.test/customadv/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/customadv/main.test.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep b/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep
index 541899d269..945b688f12 100644
--- a/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/customiis/main.test.bicep b/modules/insights/data-collection-rule/.test/customiis/main.test.bicep
index a128245e24..3d2c5bd603 100644
--- a/modules/insights/data-collection-rule/.test/customiis/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/customiis/main.test.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/linux/main.test.bicep b/modules/insights/data-collection-rule/.test/linux/main.test.bicep
index 685aae6520..781cf7f52e 100644
--- a/modules/insights/data-collection-rule/.test/linux/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/linux/main.test.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/min/main.test.bicep b/modules/insights/data-collection-rule/.test/min/main.test.bicep
index e18f5d9ef8..01cff01377 100644
--- a/modules/insights/data-collection-rule/.test/min/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/min/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with the minimum set of
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/data-collection-rule/.test/windows/main.test.bicep b/modules/insights/data-collection-rule/.test/windows/main.test.bicep
index 0c1b810c6b..cb9e2f49ab 100644
--- a/modules/insights/data-collection-rule/.test/windows/main.test.bicep
+++ b/modules/insights/data-collection-rule/.test/windows/main.test.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.dataCollectionRules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.dataCollectionRules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/diagnostic-setting/.test/common/main.test.bicep b/modules/insights/diagnostic-setting/.test/common/main.test.bicep
index 4fdfbd0770..8bca17ef33 100644
--- a/modules/insights/diagnostic-setting/.test/common/main.test.bicep
+++ b/modules/insights/diagnostic-setting/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.diagnosticsettings-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.diagnosticsettings-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/metric-alert/.test/common/main.test.bicep b/modules/insights/metric-alert/.test/common/main.test.bicep
index a5fcd52873..7d7b2bdf99 100644
--- a/modules/insights/metric-alert/.test/common/main.test.bicep
+++ b/modules/insights/metric-alert/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.metricalerts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.metricalerts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/private-link-scope/.test/common/main.test.bicep b/modules/insights/private-link-scope/.test/common/main.test.bicep
index 3e9e0ea69c..92f4e840e6 100644
--- a/modules/insights/private-link-scope/.test/common/main.test.bicep
+++ b/modules/insights/private-link-scope/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.privatelinkscopes-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.privatelinkscopes-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/private-link-scope/.test/min/main.test.bicep b/modules/insights/private-link-scope/.test/min/main.test.bicep
index 38e1bad335..a9a01570d3 100644
--- a/modules/insights/private-link-scope/.test/min/main.test.bicep
+++ b/modules/insights/private-link-scope/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.privatelinkscopes-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.privatelinkscopes-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/scheduled-query-rule/.test/common/main.test.bicep b/modules/insights/scheduled-query-rule/.test/common/main.test.bicep
index 225e5a94d4..7a197f090c 100644
--- a/modules/insights/scheduled-query-rule/.test/common/main.test.bicep
+++ b/modules/insights/scheduled-query-rule/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.scheduledqueryrules-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.scheduledqueryrules-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/webtest/.test/common/main.test.bicep b/modules/insights/webtest/.test/common/main.test.bicep
index 6e4f1097cd..ec14cb0b5c 100644
--- a/modules/insights/webtest/.test/common/main.test.bicep
+++ b/modules/insights/webtest/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.webtests-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.webtests-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/insights/webtest/.test/min/main.test.bicep b/modules/insights/webtest/.test/min/main.test.bicep
index b5fd4f6831..7a0273b7e4 100644
--- a/modules/insights/webtest/.test/min/main.test.bicep
+++ b/modules/insights/webtest/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.insights.webtests-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-insights.webtests-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/key-vault/vault/.test/accesspolicies/main.test.bicep b/modules/key-vault/vault/.test/accesspolicies/main.test.bicep
index f51833d1cb..cbca9f9b04 100644
--- a/modules/key-vault/vault/.test/accesspolicies/main.test.bicep
+++ b/modules/key-vault/vault/.test/accesspolicies/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.keyvault.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-keyvault.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/key-vault/vault/.test/common/main.test.bicep b/modules/key-vault/vault/.test/common/main.test.bicep
index 54db495112..f1d6ac03e3 100644
--- a/modules/key-vault/vault/.test/common/main.test.bicep
+++ b/modules/key-vault/vault/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.keyvault.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-keyvault.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/key-vault/vault/.test/min/main.test.bicep b/modules/key-vault/vault/.test/min/main.test.bicep
index 1fe0290488..0e27563ae4 100644
--- a/modules/key-vault/vault/.test/min/main.test.bicep
+++ b/modules/key-vault/vault/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.keyvault.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-keyvault.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/key-vault/vault/.test/pe/main.test.bicep b/modules/key-vault/vault/.test/pe/main.test.bicep
index 32078f69a2..10a68eca40 100644
--- a/modules/key-vault/vault/.test/pe/main.test.bicep
+++ b/modules/key-vault/vault/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.keyvault.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-keyvault.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/kubernetes-configuration/extension/.test/common/main.test.bicep b/modules/kubernetes-configuration/extension/.test/common/main.test.bicep
index aed37f7e01..1d954e3c6a 100644
--- a/modules/kubernetes-configuration/extension/.test/common/main.test.bicep
+++ b/modules/kubernetes-configuration/extension/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.kubernetesconfiguration.extensions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-kubernetesconfiguration.extensions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/kubernetes-configuration/extension/.test/min/main.test.bicep b/modules/kubernetes-configuration/extension/.test/min/main.test.bicep
index e387fdf629..96b7926186 100644
--- a/modules/kubernetes-configuration/extension/.test/min/main.test.bicep
+++ b/modules/kubernetes-configuration/extension/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.kubernetesconfiguration.extensions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-kubernetesconfiguration.extensions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep
index fc42c880db..4f1883372b 100644
--- a/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep
+++ b/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.kubernetesconfiguration.fluxconfigurations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-kubernetesconfiguration.fluxconfigurations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep
index deffae3122..f7f5c7191b 100644
--- a/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep
+++ b/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.kubernetesconfiguration.fluxconfigurations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-kubernetesconfiguration.fluxconfigurations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/logic/workflow/.test/common/main.test.bicep b/modules/logic/workflow/.test/common/main.test.bicep
index 9442a3a726..08510b7dc2 100644
--- a/modules/logic/workflow/.test/common/main.test.bicep
+++ b/modules/logic/workflow/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.logic.workflows-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-logic.workflows-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/machine-learning-services/workspace/.test/common/main.test.bicep b/modules/machine-learning-services/workspace/.test/common/main.test.bicep
index 497b86c749..00428ae7bd 100644
--- a/modules/machine-learning-services/workspace/.test/common/main.test.bicep
+++ b/modules/machine-learning-services/workspace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.machinelearningservices.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-machinelearningservices.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/machine-learning-services/workspace/.test/encr/main.test.bicep b/modules/machine-learning-services/workspace/.test/encr/main.test.bicep
index 195155da41..fcf4a6a6b1 100644
--- a/modules/machine-learning-services/workspace/.test/encr/main.test.bicep
+++ b/modules/machine-learning-services/workspace/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.machinelearningservices.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-machinelearningservices.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/machine-learning-services/workspace/.test/min/main.test.bicep b/modules/machine-learning-services/workspace/.test/min/main.test.bicep
index 65a73dfd4d..8c8e79eeae 100644
--- a/modules/machine-learning-services/workspace/.test/min/main.test.bicep
+++ b/modules/machine-learning-services/workspace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.machinelearningservices.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-machinelearningservices.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep b/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep
index a7ae7e0b34..6467bd54d7 100644
--- a/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep
+++ b/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.maintenance.maintenanceconfigurations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-maintenance.maintenanceconfigurations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep b/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep
index 1120f4565b..f23eada34d 100644
--- a/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep
+++ b/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.maintenance.maintenanceconfigurations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-maintenance.maintenanceconfigurations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep b/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep
index 87518c8a84..48a1d41af0 100644
--- a/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep
+++ b/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.managedidentity.userassignedidentities-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-managedidentity.userassignedidentities-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep b/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep
index 4a83660c9c..d7da3a5c01 100644
--- a/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep
+++ b/modules/managed-identity/user-assigned-identity/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.managedidentity.userassignedidentities-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-managedidentity.userassignedidentities-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
@@ -20,6 +20,9 @@ param serviceShort string = 'miuaimin'
@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
// ============ //
// Dependencies //
// ============ //
diff --git a/modules/managed-services/registration-definition/.test/rg/main.test.bicep b/modules/managed-services/registration-definition/.test/rg/main.test.bicep
index 990d3cf1ef..e6d5fe9145 100644
--- a/modules/managed-services/registration-definition/.test/rg/main.test.bicep
+++ b/modules/managed-services/registration-definition/.test/rg/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.managedservices.registrationdefinitions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-managedservices.registrationdefinitions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/net-app/net-app-account/.test/min/main.test.bicep b/modules/net-app/net-app-account/.test/min/main.test.bicep
index 509217aef3..8c3ceb52c3 100644
--- a/modules/net-app/net-app-account/.test/min/main.test.bicep
+++ b/modules/net-app/net-app-account/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-netapp.netappaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/net-app/net-app-account/.test/nfs3/main.test.bicep b/modules/net-app/net-app-account/.test/nfs3/main.test.bicep
index c5db1e5500..25924e73f9 100644
--- a/modules/net-app/net-app-account/.test/nfs3/main.test.bicep
+++ b/modules/net-app/net-app-account/.test/nfs3/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-netapp.netappaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/net-app/net-app-account/.test/nfs41/main.test.bicep b/modules/net-app/net-app-account/.test/nfs41/main.test.bicep
index f87ae67141..bc1413283d 100644
--- a/modules/net-app/net-app-account/.test/nfs41/main.test.bicep
+++ b/modules/net-app/net-app-account/.test/nfs41/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-netapp.netappaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
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/.test/common/main.test.bicep
index 0c71d78598..0c7f1fe7f3 100644
--- a/modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep
+++ b/modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.applicationGatewayWebApplicationFirewallPolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.applicationGatewayWebApplicationFirewallPolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/application-gateway/.test/common/main.test.bicep b/modules/network/application-gateway/.test/common/main.test.bicep
index 0b726f6d54..039dd1b2a6 100644
--- a/modules/network/application-gateway/.test/common/main.test.bicep
+++ b/modules/network/application-gateway/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.applicationgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.applicationgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/application-security-group/.test/common/main.test.bicep b/modules/network/application-security-group/.test/common/main.test.bicep
index 8783a868c4..2d7c4f2f95 100644
--- a/modules/network/application-security-group/.test/common/main.test.bicep
+++ b/modules/network/application-security-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.applicationsecuritygroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.applicationsecuritygroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/addpip/main.test.bicep b/modules/network/azure-firewall/.test/addpip/main.test.bicep
index b1117edf58..3406fcf6b3 100644
--- a/modules/network/azure-firewall/.test/addpip/main.test.bicep
+++ b/modules/network/azure-firewall/.test/addpip/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/common/main.test.bicep b/modules/network/azure-firewall/.test/common/main.test.bicep
index cf719551ab..9d72856614 100644
--- a/modules/network/azure-firewall/.test/common/main.test.bicep
+++ b/modules/network/azure-firewall/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/custompip/main.test.bicep b/modules/network/azure-firewall/.test/custompip/main.test.bicep
index a1f03ffaa9..44717d83cf 100644
--- a/modules/network/azure-firewall/.test/custompip/main.test.bicep
+++ b/modules/network/azure-firewall/.test/custompip/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/hubcommon/main.test.bicep b/modules/network/azure-firewall/.test/hubcommon/main.test.bicep
index eff51c688e..24f9abf6d4 100644
--- a/modules/network/azure-firewall/.test/hubcommon/main.test.bicep
+++ b/modules/network/azure-firewall/.test/hubcommon/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/hubmin/main.test.bicep b/modules/network/azure-firewall/.test/hubmin/main.test.bicep
index 862f32d241..85056db679 100644
--- a/modules/network/azure-firewall/.test/hubmin/main.test.bicep
+++ b/modules/network/azure-firewall/.test/hubmin/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/azure-firewall/.test/min/main.test.bicep b/modules/network/azure-firewall/.test/min/main.test.bicep
index 28620b7046..c0d9f84edc 100644
--- a/modules/network/azure-firewall/.test/min/main.test.bicep
+++ b/modules/network/azure-firewall/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.azurefirewalls-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.azurefirewalls-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/bastion-host/.test/common/main.test.bicep b/modules/network/bastion-host/.test/common/main.test.bicep
index 02f6497c2d..3688f87735 100644
--- a/modules/network/bastion-host/.test/common/main.test.bicep
+++ b/modules/network/bastion-host/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.bastionhosts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.bastionhosts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/bastion-host/.test/custompip/main.test.bicep b/modules/network/bastion-host/.test/custompip/main.test.bicep
index 4d9c25e73d..9cf1ef28dc 100644
--- a/modules/network/bastion-host/.test/custompip/main.test.bicep
+++ b/modules/network/bastion-host/.test/custompip/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.bastionhosts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.bastionhosts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/bastion-host/.test/min/main.test.bicep b/modules/network/bastion-host/.test/min/main.test.bicep
index 8292377077..0c178876f0 100644
--- a/modules/network/bastion-host/.test/min/main.test.bicep
+++ b/modules/network/bastion-host/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.bastionhosts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.bastionhosts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/connection/.test/vnet2vnet/main.test.bicep b/modules/network/connection/.test/vnet2vnet/main.test.bicep
index 9450e5be59..4a3da829cf 100644
--- a/modules/network/connection/.test/vnet2vnet/main.test.bicep
+++ b/modules/network/connection/.test/vnet2vnet/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.connections-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.connections-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/ddos-protection-plan/.test/common/main.test.bicep b/modules/network/ddos-protection-plan/.test/common/main.test.bicep
index 5f76122a56..7aeecb00c5 100644
--- a/modules/network/ddos-protection-plan/.test/common/main.test.bicep
+++ b/modules/network/ddos-protection-plan/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.ddosprotectionplans-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.ddosprotectionplans-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/ddos-protection-plan/.test/min/main.test.bicep b/modules/network/ddos-protection-plan/.test/min/main.test.bicep
index 3f06befe16..ca85cb56f0 100644
--- a/modules/network/ddos-protection-plan/.test/min/main.test.bicep
+++ b/modules/network/ddos-protection-plan/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.ddosprotectionplans-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.ddosprotectionplans-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep b/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep
index e3c7eb4a8e..43cb92fd4d 100644
--- a/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep
+++ b/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.dnsForwardingRuleset-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.dnsForwardingRuleset-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep b/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep
index 0d95972412..ed1fc457c5 100644
--- a/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep
+++ b/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.dnsForwardingRuleset-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.dnsForwardingRuleset-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/dns-resolver/.test/common/main.test.bicep b/modules/network/dns-resolver/.test/common/main.test.bicep
index 10ca18a16f..b7c060dd2f 100644
--- a/modules/network/dns-resolver/.test/common/main.test.bicep
+++ b/modules/network/dns-resolver/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.dnsResolvers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.dnsResolvers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/dns-zone/.test/common/main.test.bicep b/modules/network/dns-zone/.test/common/main.test.bicep
index 667e7e4e00..ed751afbbd 100644
--- a/modules/network/dns-zone/.test/common/main.test.bicep
+++ b/modules/network/dns-zone/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.dnszones-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.dnszones-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/dns-zone/.test/min/main.test.bicep b/modules/network/dns-zone/.test/min/main.test.bicep
index 99dd5b9612..3e13b00238 100644
--- a/modules/network/dns-zone/.test/min/main.test.bicep
+++ b/modules/network/dns-zone/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.dnszones-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.dnszones-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/express-route-circuit/.test/common/main.test.bicep b/modules/network/express-route-circuit/.test/common/main.test.bicep
index befce2285b..ab72f6d9c0 100644
--- a/modules/network/express-route-circuit/.test/common/main.test.bicep
+++ b/modules/network/express-route-circuit/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.expressroutecircuits-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.expressroutecircuits-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/express-route-circuit/.test/min/main.test.bicep b/modules/network/express-route-circuit/.test/min/main.test.bicep
index 9023c41dfe..6bc6b2b580 100644
--- a/modules/network/express-route-circuit/.test/min/main.test.bicep
+++ b/modules/network/express-route-circuit/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.expressroutecircuits-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.expressroutecircuits-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/express-route-gateway/.test/common/main.test.bicep b/modules/network/express-route-gateway/.test/common/main.test.bicep
index d99873cd46..72ddf4c851 100644
--- a/modules/network/express-route-gateway/.test/common/main.test.bicep
+++ b/modules/network/express-route-gateway/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.expressRouteGateway-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.expressRouteGateway-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/express-route-gateway/.test/min/main.test.bicep b/modules/network/express-route-gateway/.test/min/main.test.bicep
index b410608160..49b5c52596 100644
--- a/modules/network/express-route-gateway/.test/min/main.test.bicep
+++ b/modules/network/express-route-gateway/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.expressRouteGateway-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.expressRouteGateway-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/firewall-policy/.test/common/main.test.bicep b/modules/network/firewall-policy/.test/common/main.test.bicep
index b0f3e73de8..f3447f4ce4 100644
--- a/modules/network/firewall-policy/.test/common/main.test.bicep
+++ b/modules/network/firewall-policy/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.firewallpolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.firewallpolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/firewall-policy/.test/min/main.test.bicep b/modules/network/firewall-policy/.test/min/main.test.bicep
index 2efbeaeead..e5ce72720a 100644
--- a/modules/network/firewall-policy/.test/min/main.test.bicep
+++ b/modules/network/firewall-policy/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.firewallpolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.firewallpolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
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/.test/common/main.test.bicep
index 9473957b31..368546b37b 100644
--- a/modules/network/front-door-web-application-firewall-policy/.test/common/main.test.bicep
+++ b/modules/network/front-door-web-application-firewall-policy/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.frontdoorWebApplicationFirewallPolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.frontdoorWebApplicationFirewallPolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
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/.test/min/main.test.bicep
index e6dc94614a..833631084c 100644
--- a/modules/network/front-door-web-application-firewall-policy/.test/min/main.test.bicep
+++ b/modules/network/front-door-web-application-firewall-policy/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.frontdoorWebApplicationFirewallPolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.frontdoorWebApplicationFirewallPolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/front-door/.test/common/main.test.bicep b/modules/network/front-door/.test/common/main.test.bicep
index 485d7f052f..c914c6eb8b 100644
--- a/modules/network/front-door/.test/common/main.test.bicep
+++ b/modules/network/front-door/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.frontdoors-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.frontdoors-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/front-door/.test/min/main.test.bicep b/modules/network/front-door/.test/min/main.test.bicep
index d924dcbb25..347cd6dbd1 100644
--- a/modules/network/front-door/.test/min/main.test.bicep
+++ b/modules/network/front-door/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.frontdoors-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.frontdoors-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/ip-group/.test/common/main.test.bicep b/modules/network/ip-group/.test/common/main.test.bicep
index e58ccd5a53..739303e9a1 100644
--- a/modules/network/ip-group/.test/common/main.test.bicep
+++ b/modules/network/ip-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.ipgroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.ipgroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/ip-group/.test/min/main.test.bicep b/modules/network/ip-group/.test/min/main.test.bicep
index 174c87ae38..e9bc5c3f60 100644
--- a/modules/network/ip-group/.test/min/main.test.bicep
+++ b/modules/network/ip-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.ipgroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.ipgroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/load-balancer/.test/common/main.test.bicep b/modules/network/load-balancer/.test/common/main.test.bicep
index 190d42404e..e08dc8a218 100644
--- a/modules/network/load-balancer/.test/common/main.test.bicep
+++ b/modules/network/load-balancer/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.loadbalancers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.loadbalancers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/load-balancer/.test/internal/main.test.bicep b/modules/network/load-balancer/.test/internal/main.test.bicep
index 0e828f0415..bf22fa5b0c 100644
--- a/modules/network/load-balancer/.test/internal/main.test.bicep
+++ b/modules/network/load-balancer/.test/internal/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.loadbalancers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.loadbalancers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/load-balancer/.test/min/main.test.bicep b/modules/network/load-balancer/.test/min/main.test.bicep
index dbb4ca6571..d5d20d4d72 100644
--- a/modules/network/load-balancer/.test/min/main.test.bicep
+++ b/modules/network/load-balancer/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.loadbalancers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.loadbalancers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/local-network-gateway/.test/common/main.test.bicep b/modules/network/local-network-gateway/.test/common/main.test.bicep
index 0d7e13410f..877aee9a00 100644
--- a/modules/network/local-network-gateway/.test/common/main.test.bicep
+++ b/modules/network/local-network-gateway/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.localnetworkgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.localnetworkgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/local-network-gateway/.test/min/main.test.bicep b/modules/network/local-network-gateway/.test/min/main.test.bicep
index b9577924ea..738c5439e1 100644
--- a/modules/network/local-network-gateway/.test/min/main.test.bicep
+++ b/modules/network/local-network-gateway/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.localnetworkgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.localnetworkgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/nat-gateway/.test/common/main.test.bicep b/modules/network/nat-gateway/.test/common/main.test.bicep
index f999e3cb3a..2bbf68f7cd 100644
--- a/modules/network/nat-gateway/.test/common/main.test.bicep
+++ b/modules/network/nat-gateway/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.natgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.natgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/network-interface/.test/common/main.test.bicep b/modules/network/network-interface/.test/common/main.test.bicep
index 980dbff520..71462f0114 100644
--- a/modules/network/network-interface/.test/common/main.test.bicep
+++ b/modules/network/network-interface/.test/common/main.test.bicep
@@ -1,118 +1,118 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.network.networkinterfaces-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'nnicom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- applicationSecurityGroupName: 'dep-${namePrefix}-asg-${serviceShort}'
- loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- ipConfigurations: [
- {
- applicationSecurityGroups: [
- {
- id: nestedDependencies.outputs.applicationSecurityGroupResourceId
- }
- ]
- loadBalancerBackendAddressPools: [
- {
- id: nestedDependencies.outputs.loadBalancerBackendPoolResourceId
- }
- ]
- name: 'ipconfig01'
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- }
- {
- subnetResourceId: nestedDependencies.outputs.subnetResourceId
- applicationSecurityGroups: [
- {
- id: nestedDependencies.outputs.applicationSecurityGroupResourceId
- }
- ]
- }
- ]
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-network.networkinterfaces-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'nnicom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ virtualNetworkName: 'dep-${namePrefix}-vnet-${serviceShort}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ applicationSecurityGroupName: 'dep-${namePrefix}-asg-${serviceShort}'
+ loadBalancerName: 'dep-${namePrefix}-lb-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ ipConfigurations: [
+ {
+ applicationSecurityGroups: [
+ {
+ id: nestedDependencies.outputs.applicationSecurityGroupResourceId
+ }
+ ]
+ loadBalancerBackendAddressPools: [
+ {
+ id: nestedDependencies.outputs.loadBalancerBackendPoolResourceId
+ }
+ ]
+ name: 'ipconfig01'
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ }
+ {
+ subnetResourceId: nestedDependencies.outputs.subnetResourceId
+ applicationSecurityGroups: [
+ {
+ id: nestedDependencies.outputs.applicationSecurityGroupResourceId
+ }
+ ]
+ }
+ ]
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/network/network-interface/.test/min/main.test.bicep b/modules/network/network-interface/.test/min/main.test.bicep
index 8a045fec44..a5d77cf3cb 100644
--- a/modules/network/network-interface/.test/min/main.test.bicep
+++ b/modules/network/network-interface/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.networkinterfaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.networkinterfaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/network-manager/.test/common/main.test.bicep b/modules/network/network-manager/.test/common/main.test.bicep
index 25ba582f7c..d1d30c49f1 100644
--- a/modules/network/network-manager/.test/common/main.test.bicep
+++ b/modules/network/network-manager/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.networkmanagers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.networkmanagers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/network-security-group/.test/common/main.test.bicep b/modules/network/network-security-group/.test/common/main.test.bicep
index 66532c02ae..a82db647c3 100644
--- a/modules/network/network-security-group/.test/common/main.test.bicep
+++ b/modules/network/network-security-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.networksecuritygroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.networksecuritygroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/network-security-group/.test/min/main.test.bicep b/modules/network/network-security-group/.test/min/main.test.bicep
index 225b630945..5408cedcc5 100644
--- a/modules/network/network-security-group/.test/min/main.test.bicep
+++ b/modules/network/network-security-group/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.networksecuritygroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.networksecuritygroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-dns-zone/.test/common/main.test.bicep b/modules/network/private-dns-zone/.test/common/main.test.bicep
index b8fd61f780..523554c445 100644
--- a/modules/network/private-dns-zone/.test/common/main.test.bicep
+++ b/modules/network/private-dns-zone/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privatednszones-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-dns-zone/.test/min/main.test.bicep b/modules/network/private-dns-zone/.test/min/main.test.bicep
index db60e58143..0426b7b5d0 100644
--- a/modules/network/private-dns-zone/.test/min/main.test.bicep
+++ b/modules/network/private-dns-zone/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privatednszones-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-endpoint/.test/common/main.test.bicep b/modules/network/private-endpoint/.test/common/main.test.bicep
index 8b0abeaf5c..a5f036c296 100644
--- a/modules/network/private-endpoint/.test/common/main.test.bicep
+++ b/modules/network/private-endpoint/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privateendpoints-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privateendpoints-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-endpoint/.test/min/main.test.bicep b/modules/network/private-endpoint/.test/min/main.test.bicep
index 6d5c80f1b3..95f011a2b2 100644
--- a/modules/network/private-endpoint/.test/min/main.test.bicep
+++ b/modules/network/private-endpoint/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privateendpoints-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privateendpoints-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-link-service/.test/common/main.test.bicep b/modules/network/private-link-service/.test/common/main.test.bicep
index b7cbc93723..f8f5819498 100644
--- a/modules/network/private-link-service/.test/common/main.test.bicep
+++ b/modules/network/private-link-service/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privatelinkservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privatelinkservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/private-link-service/.test/min/main.test.bicep b/modules/network/private-link-service/.test/min/main.test.bicep
index d56543c89b..d7e063e3d4 100644
--- a/modules/network/private-link-service/.test/min/main.test.bicep
+++ b/modules/network/private-link-service/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.privatelinkservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.privatelinkservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/public-ip-address/.test/common/main.test.bicep b/modules/network/public-ip-address/.test/common/main.test.bicep
index 36ef8bc40a..b61ac3a4aa 100644
--- a/modules/network/public-ip-address/.test/common/main.test.bicep
+++ b/modules/network/public-ip-address/.test/common/main.test.bicep
@@ -1,98 +1,98 @@
-targetScope = 'subscription'
-
-metadata name = 'Using large parameter set'
-metadata description = 'This instance deploys the module with most of its features enabled.'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'ms.network.publicipaddresses-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'npiacom'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
- params: {
- storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
- logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
- eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
- eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
- location: location
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
- diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
- diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
- diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
- lock: {
- kind: 'CanNotDelete'
- name: 'myCustomLockName'
- }
- publicIPAllocationMethod: 'Static'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- skuName: 'Standard'
- zones: [
- '1'
- '2'
- '3'
- ]
- tags: {
- 'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- }
-}
-
+targetScope = 'subscription'
+
+metadata name = 'Using large parameter set'
+metadata description = 'This instance deploys the module with most of its features enabled.'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-network.publicipaddresses-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'npiacom'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+ params: {
+ storageAccountName: 'dep${namePrefix}diasa${serviceShort}01'
+ logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+ eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+ eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+ location: location
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+ diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+ diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+ diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+ lock: {
+ kind: 'CanNotDelete'
+ name: 'myCustomLockName'
+ }
+ publicIPAllocationMethod: 'Static'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+ principalType: 'ServicePrincipal'
+ }
+ ]
+ skuName: 'Standard'
+ zones: [
+ '1'
+ '2'
+ '3'
+ ]
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+ Role: 'DeploymentValidation'
+ }
+ }
+}
diff --git a/modules/network/public-ip-address/.test/min/main.test.bicep b/modules/network/public-ip-address/.test/min/main.test.bicep
index e0f4f0d87d..b759ba4dda 100644
--- a/modules/network/public-ip-address/.test/min/main.test.bicep
+++ b/modules/network/public-ip-address/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.publicipaddresses-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.publicipaddresses-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/public-ip-prefix/.test/common/main.test.bicep b/modules/network/public-ip-prefix/.test/common/main.test.bicep
index 86dba8a94f..c69da59569 100644
--- a/modules/network/public-ip-prefix/.test/common/main.test.bicep
+++ b/modules/network/public-ip-prefix/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.publicipprefixes-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.publicipprefixes-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/public-ip-prefix/.test/min/main.test.bicep b/modules/network/public-ip-prefix/.test/min/main.test.bicep
index 8115e852ed..979dc0e0af 100644
--- a/modules/network/public-ip-prefix/.test/min/main.test.bicep
+++ b/modules/network/public-ip-prefix/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.publicipprefixes-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.publicipprefixes-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/route-table/.test/common/main.test.bicep b/modules/network/route-table/.test/common/main.test.bicep
index cab828e429..a14ec3fb4b 100644
--- a/modules/network/route-table/.test/common/main.test.bicep
+++ b/modules/network/route-table/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.routetables-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.routetables-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/route-table/.test/min/main.test.bicep b/modules/network/route-table/.test/min/main.test.bicep
index 1515b9a8fb..a5b93df8a8 100644
--- a/modules/network/route-table/.test/min/main.test.bicep
+++ b/modules/network/route-table/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.routetables-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.routetables-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/service-endpoint-policy/.test/common/main.test.bicep b/modules/network/service-endpoint-policy/.test/common/main.test.bicep
index 82ee681383..3a0c8c2c75 100644
--- a/modules/network/service-endpoint-policy/.test/common/main.test.bicep
+++ b/modules/network/service-endpoint-policy/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.serviceendpointpolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.serviceendpointpolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/service-endpoint-policy/.test/min/main.test.bicep b/modules/network/service-endpoint-policy/.test/min/main.test.bicep
index 7ac8d7747a..154fe68b53 100644
--- a/modules/network/service-endpoint-policy/.test/min/main.test.bicep
+++ b/modules/network/service-endpoint-policy/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.serviceendpointpolicies-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.serviceendpointpolicies-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/trafficmanagerprofile/.test/common/main.test.bicep b/modules/network/trafficmanagerprofile/.test/common/main.test.bicep
index 9a466dd925..0c00e5b2b8 100644
--- a/modules/network/trafficmanagerprofile/.test/common/main.test.bicep
+++ b/modules/network/trafficmanagerprofile/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.trafficmanagerprofiles-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.trafficmanagerprofiles-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/trafficmanagerprofile/.test/min/main.test.bicep b/modules/network/trafficmanagerprofile/.test/min/main.test.bicep
index b0100513d4..78292ead79 100644
--- a/modules/network/trafficmanagerprofile/.test/min/main.test.bicep
+++ b/modules/network/trafficmanagerprofile/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.trafficmanagerprofiles-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.trafficmanagerprofiles-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-hub/.test/common/main.test.bicep b/modules/network/virtual-hub/.test/common/main.test.bicep
index 52f78ecbb6..3686e52eb7 100644
--- a/modules/network/virtual-hub/.test/common/main.test.bicep
+++ b/modules/network/virtual-hub/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualHub-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualHub-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-hub/.test/min/main.test.bicep b/modules/network/virtual-hub/.test/min/main.test.bicep
index 56a53cb235..be7e2a2955 100644
--- a/modules/network/virtual-hub/.test/min/main.test.bicep
+++ b/modules/network/virtual-hub/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualHub-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualHub-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep b/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep
index fe61f76c04..d02d24dcbf 100644
--- a/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep
+++ b/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworkgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworkgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep b/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep
index c2bc8286c6..7b706acf5e 100644
--- a/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep
+++ b/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworkgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworkgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep b/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep
index 1845a4fff4..4bb4048a26 100644
--- a/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep
+++ b/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworkgateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworkgateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network/.test/common/main.test.bicep b/modules/network/virtual-network/.test/common/main.test.bicep
index 766e2acdb0..cc944f6070 100644
--- a/modules/network/virtual-network/.test/common/main.test.bicep
+++ b/modules/network/virtual-network/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworks-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworks-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network/.test/min/main.test.bicep b/modules/network/virtual-network/.test/min/main.test.bicep
index 1cd5b5d90a..5d77b3ccee 100644
--- a/modules/network/virtual-network/.test/min/main.test.bicep
+++ b/modules/network/virtual-network/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworks-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworks-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-network/.test/vnetPeering/main.test.bicep b/modules/network/virtual-network/.test/vnetPeering/main.test.bicep
index f1c57ad4c6..34df29c754 100644
--- a/modules/network/virtual-network/.test/vnetPeering/main.test.bicep
+++ b/modules/network/virtual-network/.test/vnetPeering/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualnetworks-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualnetworks-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-wan/.test/common/main.test.bicep b/modules/network/virtual-wan/.test/common/main.test.bicep
index cc243543eb..b253f9af0a 100644
--- a/modules/network/virtual-wan/.test/common/main.test.bicep
+++ b/modules/network/virtual-wan/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualwans-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualwans-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/virtual-wan/.test/min/main.test.bicep b/modules/network/virtual-wan/.test/min/main.test.bicep
index 8247a6e863..da77dcc8fc 100644
--- a/modules/network/virtual-wan/.test/min/main.test.bicep
+++ b/modules/network/virtual-wan/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.virtualwans-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.virtualwans-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/vpn-gateway/.test/common/main.test.bicep b/modules/network/vpn-gateway/.test/common/main.test.bicep
index 9c12de8234..857d52c3a2 100644
--- a/modules/network/vpn-gateway/.test/common/main.test.bicep
+++ b/modules/network/vpn-gateway/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.vpngateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.vpngateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/vpn-gateway/.test/min/main.test.bicep b/modules/network/vpn-gateway/.test/min/main.test.bicep
index f050ca9adc..959c3c8182 100644
--- a/modules/network/vpn-gateway/.test/min/main.test.bicep
+++ b/modules/network/vpn-gateway/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.vpngateways-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.vpngateways-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/vpn-site/.test/common/main.test.bicep b/modules/network/vpn-site/.test/common/main.test.bicep
index 2bdea975b3..d51318aff1 100644
--- a/modules/network/vpn-site/.test/common/main.test.bicep
+++ b/modules/network/vpn-site/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.vpnSites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.vpnSites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/network/vpn-site/.test/min/main.test.bicep b/modules/network/vpn-site/.test/min/main.test.bicep
index 7a564ddcfa..e452f365d1 100644
--- a/modules/network/vpn-site/.test/min/main.test.bicep
+++ b/modules/network/vpn-site/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.network.vpnSites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-network.vpnSites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operational-insights/workspace/.test/adv/main.test.bicep b/modules/operational-insights/workspace/.test/adv/main.test.bicep
index b18387c3af..f898f556e3 100644
--- a/modules/operational-insights/workspace/.test/adv/main.test.bicep
+++ b/modules/operational-insights/workspace/.test/adv/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationalinsights.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationalinsights.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operational-insights/workspace/.test/common/main.test.bicep b/modules/operational-insights/workspace/.test/common/main.test.bicep
index 8f4ef65925..b55b5e3dbd 100644
--- a/modules/operational-insights/workspace/.test/common/main.test.bicep
+++ b/modules/operational-insights/workspace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationalinsights.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationalinsights.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operational-insights/workspace/.test/min/main.test.bicep b/modules/operational-insights/workspace/.test/min/main.test.bicep
index cb56d8a1a8..efb01b22ac 100644
--- a/modules/operational-insights/workspace/.test/min/main.test.bicep
+++ b/modules/operational-insights/workspace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationalinsights.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationalinsights.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operations-management/solution/.test/min/main.test.bicep b/modules/operations-management/solution/.test/min/main.test.bicep
index 0fea432bd3..b59040e411 100644
--- a/modules/operations-management/solution/.test/min/main.test.bicep
+++ b/modules/operations-management/solution/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationsmanagement.solutions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationsmanagement.solutions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operations-management/solution/.test/ms/main.test.bicep b/modules/operations-management/solution/.test/ms/main.test.bicep
index dd3a506108..a055a0c15a 100644
--- a/modules/operations-management/solution/.test/ms/main.test.bicep
+++ b/modules/operations-management/solution/.test/ms/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationsmanagement.solutions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationsmanagement.solutions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/operations-management/solution/.test/nonms/main.test.bicep b/modules/operations-management/solution/.test/nonms/main.test.bicep
index f37927d1e9..e3e4e9d126 100644
--- a/modules/operations-management/solution/.test/nonms/main.test.bicep
+++ b/modules/operations-management/solution/.test/nonms/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.operationsmanagement.solutions-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-operationsmanagement.solutions-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/policy-insights/remediation/.test/rg.common/main.test.bicep b/modules/policy-insights/remediation/.test/rg.common/main.test.bicep
index 62590b7dce..7052879293 100644
--- a/modules/policy-insights/remediation/.test/rg.common/main.test.bicep
+++ b/modules/policy-insights/remediation/.test/rg.common/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.policyinsights.remediations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-policyinsights.remediations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/policy-insights/remediation/.test/rg.min/main.test.bicep b/modules/policy-insights/remediation/.test/rg.min/main.test.bicep
index 7f67473575..8d80250f13 100644
--- a/modules/policy-insights/remediation/.test/rg.min/main.test.bicep
+++ b/modules/policy-insights/remediation/.test/rg.min/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.policyinsights.remediations-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-policyinsights.remediations-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep b/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep
index 9492810703..813c5ed01a 100644
--- a/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep
+++ b/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.powerbidedicated.capacities-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-powerbidedicated.capacities-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep b/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep
index dea599ae13..3cbc57c794 100644
--- a/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep
+++ b/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.powerbidedicated.capacities-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-powerbidedicated.capacities-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/purview/account/.test/common/main.test.bicep b/modules/purview/account/.test/common/main.test.bicep
index 1db2c2caf0..2e89ea8f5b 100644
--- a/modules/purview/account/.test/common/main.test.bicep
+++ b/modules/purview/account/.test/common/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with most of its featur
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.purview-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-purview-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = 'eastus' // Only available in selected locations: eastus, eastus2, southcentralus, westcentralus, westus, westus2, westus3
diff --git a/modules/purview/account/.test/min/main.test.bicep b/modules/purview/account/.test/min/main.test.bicep
index 8cf13684b3..085922c251 100644
--- a/modules/purview/account/.test/min/main.test.bicep
+++ b/modules/purview/account/.test/min/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This instance deploys the module with the minimum set of
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.purview-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-purview-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = 'eastus' // Only available in selected locations: eastus, eastus2, southcentralus, westcentralus, westus, westus2, westus3
diff --git a/modules/recovery-services/vault/.test/common/main.test.bicep b/modules/recovery-services/vault/.test/common/main.test.bicep
index 9dff63f908..8303605f63 100644
--- a/modules/recovery-services/vault/.test/common/main.test.bicep
+++ b/modules/recovery-services/vault/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.recoveryservices.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-recoveryservices.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/recovery-services/vault/.test/dr/main.test.bicep b/modules/recovery-services/vault/.test/dr/main.test.bicep
index 4e4ad6096d..ab0df3f202 100644
--- a/modules/recovery-services/vault/.test/dr/main.test.bicep
+++ b/modules/recovery-services/vault/.test/dr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.recoveryservices.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-recoveryservices.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/recovery-services/vault/.test/min/main.test.bicep b/modules/recovery-services/vault/.test/min/main.test.bicep
index 8477f9fb08..84b52bfe7b 100644
--- a/modules/recovery-services/vault/.test/min/main.test.bicep
+++ b/modules/recovery-services/vault/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.recoveryservices.vaults-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-recoveryservices.vaults-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/relay/namespace/.test/common/main.test.bicep b/modules/relay/namespace/.test/common/main.test.bicep
index 6aedc4696c..0a7b794cc7 100644
--- a/modules/relay/namespace/.test/common/main.test.bicep
+++ b/modules/relay/namespace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.relay.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-relay.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/relay/namespace/.test/min/main.test.bicep b/modules/relay/namespace/.test/min/main.test.bicep
index 25c3225ee0..b58e52706a 100644
--- a/modules/relay/namespace/.test/min/main.test.bicep
+++ b/modules/relay/namespace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.relay.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-relay.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/relay/namespace/.test/pe/main.test.bicep b/modules/relay/namespace/.test/pe/main.test.bicep
index 30ac3bfaba..380e33d618 100644
--- a/modules/relay/namespace/.test/pe/main.test.bicep
+++ b/modules/relay/namespace/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.relay.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-relay.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resource-graph/query/.test/common/main.test.bicep b/modules/resource-graph/query/.test/common/main.test.bicep
index a898c05ab8..2d657d504c 100644
--- a/modules/resource-graph/query/.test/common/main.test.bicep
+++ b/modules/resource-graph/query/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resourcegraph.queries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resourcegraph.queries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resource-graph/query/.test/min/main.test.bicep b/modules/resource-graph/query/.test/min/main.test.bicep
index f03ce1a8a9..662a8d6a1b 100644
--- a/modules/resource-graph/query/.test/min/main.test.bicep
+++ b/modules/resource-graph/query/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resourcegraph.queries-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resourcegraph.queries-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resources/deployment-script/.test/cli/main.test.bicep b/modules/resources/deployment-script/.test/cli/main.test.bicep
index fe7f95dc0d..9c2194b2cc 100644
--- a/modules/resources/deployment-script/.test/cli/main.test.bicep
+++ b/modules/resources/deployment-script/.test/cli/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resources.deploymentscripts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resources.deploymentscripts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resources/deployment-script/.test/ps/main.test.bicep b/modules/resources/deployment-script/.test/ps/main.test.bicep
index e3a9c55382..00cea68eaf 100644
--- a/modules/resources/deployment-script/.test/ps/main.test.bicep
+++ b/modules/resources/deployment-script/.test/ps/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resources.deploymentscripts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resources.deploymentscripts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resources/resource-group/.test/common/main.test.bicep b/modules/resources/resource-group/.test/common/main.test.bicep
index 6a47e86bce..d5b9883a8d 100644
--- a/modules/resources/resource-group/.test/common/main.test.bicep
+++ b/modules/resources/resource-group/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resources.resourcegroups-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resources.resourcegroups-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/resources/tags/.test/rg/main.test.bicep b/modules/resources/tags/.test/rg/main.test.bicep
index 3827831870..ef95040057 100644
--- a/modules/resources/tags/.test/rg/main.test.bicep
+++ b/modules/resources/tags/.test/rg/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.resources.tags-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-resources.tags-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
@@ -17,6 +17,9 @@ param serviceShort string = 'rtrg'
@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
// ============ //
// Dependencies //
// ============ //
diff --git a/modules/search/search-service/.test/common/main.test.bicep b/modules/search/search-service/.test/common/main.test.bicep
index d975b5f231..25eb01eb67 100644
--- a/modules/search/search-service/.test/common/main.test.bicep
+++ b/modules/search/search-service/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.search.searchservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-search.searchservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/search/search-service/.test/min/main.test.bicep b/modules/search/search-service/.test/min/main.test.bicep
index 4f66e7b2e4..3383746985 100644
--- a/modules/search/search-service/.test/min/main.test.bicep
+++ b/modules/search/search-service/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.search.searchservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-search.searchservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/search/search-service/.test/pe/main.test.bicep b/modules/search/search-service/.test/pe/main.test.bicep
index 8c0b99b109..0c4ab94004 100644
--- a/modules/search/search-service/.test/pe/main.test.bicep
+++ b/modules/search/search-service/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.search.searchservices-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-search.searchservices-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/security/azure-security-center/.test/common/main.test.bicep b/modules/security/azure-security-center/.test/common/main.test.bicep
index a1caae0519..e3621cd32f 100644
--- a/modules/security/azure-security-center/.test/common/main.test.bicep
+++ b/modules/security/azure-security-center/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.security.azureSecurityCenter-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-security.azureSecurityCenter-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-bus/namespace/.test/common/main.test.bicep b/modules/service-bus/namespace/.test/common/main.test.bicep
index 8e60f2b946..9cb9283457 100644
--- a/modules/service-bus/namespace/.test/common/main.test.bicep
+++ b/modules/service-bus/namespace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicebus.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicebus.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-bus/namespace/.test/encr/main.test.bicep b/modules/service-bus/namespace/.test/encr/main.test.bicep
index adede3e81f..1d7dc3802b 100644
--- a/modules/service-bus/namespace/.test/encr/main.test.bicep
+++ b/modules/service-bus/namespace/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicebus.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicebus.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-bus/namespace/.test/min/main.test.bicep b/modules/service-bus/namespace/.test/min/main.test.bicep
index 81c5af272a..b11f92b41e 100644
--- a/modules/service-bus/namespace/.test/min/main.test.bicep
+++ b/modules/service-bus/namespace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicebus.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicebus.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-bus/namespace/.test/pe/main.test.bicep b/modules/service-bus/namespace/.test/pe/main.test.bicep
index a8152faa4b..936692a3b1 100644
--- a/modules/service-bus/namespace/.test/pe/main.test.bicep
+++ b/modules/service-bus/namespace/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicebus.namespaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicebus.namespaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-fabric/cluster/.test/cert/main.test.bicep b/modules/service-fabric/cluster/.test/cert/main.test.bicep
index 92318e7b59..edd7a2d36a 100644
--- a/modules/service-fabric/cluster/.test/cert/main.test.bicep
+++ b/modules/service-fabric/cluster/.test/cert/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicefabric.clusters-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-fabric/cluster/.test/common/main.test.bicep b/modules/service-fabric/cluster/.test/common/main.test.bicep
index a84afa9e53..642a4e2882 100644
--- a/modules/service-fabric/cluster/.test/common/main.test.bicep
+++ b/modules/service-fabric/cluster/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicefabric.clusters-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/service-fabric/cluster/.test/min/main.test.bicep b/modules/service-fabric/cluster/.test/min/main.test.bicep
index e7bf07187d..49d19006fd 100644
--- a/modules/service-fabric/cluster/.test/min/main.test.bicep
+++ b/modules/service-fabric/cluster/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-servicefabric.clusters-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/signal-r-service/signal-r/.test/common/main.test.bicep b/modules/signal-r-service/signal-r/.test/common/main.test.bicep
index 0724522270..8364d963e6 100644
--- a/modules/signal-r-service/signal-r/.test/common/main.test.bicep
+++ b/modules/signal-r-service/signal-r/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.signalrservice.signalr-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-signalrservice.signalr-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/signal-r-service/signal-r/.test/min/main.test.bicep b/modules/signal-r-service/signal-r/.test/min/main.test.bicep
index 3f7d469ad1..b8d61468f3 100644
--- a/modules/signal-r-service/signal-r/.test/min/main.test.bicep
+++ b/modules/signal-r-service/signal-r/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.signalrservice.signalr-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-signalrservice.signalr-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep b/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep
index ede9095527..9205abc457 100644
--- a/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.signalrservice.webpubsub-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-signalrservice.webpubsub-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep b/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep
index 0afc1a7936..ac0f2990f4 100644
--- a/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.signalrservice.webpubsub-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-signalrservice.webpubsub-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep b/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep
index f3e03b566e..cff16d9528 100644
--- a/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.signalrservice.webpubsub-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-signalrservice.webpubsub-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/managed-instance/.test/common/main.test.bicep b/modules/sql/managed-instance/.test/common/main.test.bicep
index fe67a03897..4d81f21d66 100644
--- a/modules/sql/managed-instance/.test/common/main.test.bicep
+++ b/modules/sql/managed-instance/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.managedinstances-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.managedinstances-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/managed-instance/.test/min/main.test.bicep b/modules/sql/managed-instance/.test/min/main.test.bicep
index 0c9d4bbe75..a9d1d45a88 100644
--- a/modules/sql/managed-instance/.test/min/main.test.bicep
+++ b/modules/sql/managed-instance/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.managedinstances-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.managedinstances-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep b/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep
index 1238ce7a47..aecb08b1b7 100644
--- a/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep
+++ b/modules/sql/managed-instance/.test/vulnAssm/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.managedinstances-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.managedinstances-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/server/.test/admin/main.test.bicep b/modules/sql/server/.test/admin/main.test.bicep
index 0f6850169f..72d7db6de4 100644
--- a/modules/sql/server/.test/admin/main.test.bicep
+++ b/modules/sql/server/.test/admin/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.servers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/server/.test/common/main.test.bicep b/modules/sql/server/.test/common/main.test.bicep
index c6bf91abb0..ff55dde98d 100644
--- a/modules/sql/server/.test/common/main.test.bicep
+++ b/modules/sql/server/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.servers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/server/.test/pe/main.test.bicep b/modules/sql/server/.test/pe/main.test.bicep
index b0c7032988..f813715f36 100644
--- a/modules/sql/server/.test/pe/main.test.bicep
+++ b/modules/sql/server/.test/pe/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.servers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/sql/server/.test/secondary/main.test.bicep b/modules/sql/server/.test/secondary/main.test.bicep
index 6fef08a476..c88c13fcef 100644
--- a/modules/sql/server/.test/secondary/main.test.bicep
+++ b/modules/sql/server/.test/secondary/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.sql.servers-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/storage/storage-account/.test/common/main.test.bicep b/modules/storage/storage-account/.test/common/main.test.bicep
index 7a14f34337..2e90efc8b5 100644
--- a/modules/storage/storage-account/.test/common/main.test.bicep
+++ b/modules/storage/storage-account/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.storage.storageaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-storage.storageaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/storage/storage-account/.test/encr/main.test.bicep b/modules/storage/storage-account/.test/encr/main.test.bicep
index 8d2d24e464..acdcccd5d9 100644
--- a/modules/storage/storage-account/.test/encr/main.test.bicep
+++ b/modules/storage/storage-account/.test/encr/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.storage.storageaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-storage.storageaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/storage/storage-account/.test/min/main.test.bicep b/modules/storage/storage-account/.test/min/main.test.bicep
index c96293aff1..24b565b8b6 100644
--- a/modules/storage/storage-account/.test/min/main.test.bicep
+++ b/modules/storage/storage-account/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.storage.storageaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-storage.storageaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/storage/storage-account/.test/nfs/main.test.bicep b/modules/storage/storage-account/.test/nfs/main.test.bicep
index 8403155a98..9f42e517d7 100644
--- a/modules/storage/storage-account/.test/nfs/main.test.bicep
+++ b/modules/storage/storage-account/.test/nfs/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.storage.storageaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-storage.storageaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/storage/storage-account/.test/v1/main.test.bicep b/modules/storage/storage-account/.test/v1/main.test.bicep
index 96023bdd36..554750255f 100644
--- a/modules/storage/storage-account/.test/v1/main.test.bicep
+++ b/modules/storage/storage-account/.test/v1/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.storage.storageaccounts-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-storage.storageaccounts-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/private-link-hub/.test/common/main.test.bicep b/modules/synapse/private-link-hub/.test/common/main.test.bicep
index 86db3ae553..84d8dd7b87 100644
--- a/modules/synapse/private-link-hub/.test/common/main.test.bicep
+++ b/modules/synapse/private-link-hub/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.privatelinkhubs-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.privatelinkhubs-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/private-link-hub/.test/min/main.test.bicep b/modules/synapse/private-link-hub/.test/min/main.test.bicep
index 6c1e056048..8256ac8c67 100644
--- a/modules/synapse/private-link-hub/.test/min/main.test.bicep
+++ b/modules/synapse/private-link-hub/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.privatelinkhubs-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.privatelinkhubs-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/workspace/.test/common/main.test.bicep b/modules/synapse/workspace/.test/common/main.test.bicep
index a18415d374..ec666fb633 100644
--- a/modules/synapse/workspace/.test/common/main.test.bicep
+++ b/modules/synapse/workspace/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/workspace/.test/encrwsai/main.test.bicep b/modules/synapse/workspace/.test/encrwsai/main.test.bicep
index 1637803f58..31ef9e1a20 100644
--- a/modules/synapse/workspace/.test/encrwsai/main.test.bicep
+++ b/modules/synapse/workspace/.test/encrwsai/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/workspace/.test/encrwuai/main.test.bicep b/modules/synapse/workspace/.test/encrwuai/main.test.bicep
index d21ce8959f..85911c61ec 100644
--- a/modules/synapse/workspace/.test/encrwuai/main.test.bicep
+++ b/modules/synapse/workspace/.test/encrwuai/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/workspace/.test/managedvnet/main.test.bicep b/modules/synapse/workspace/.test/managedvnet/main.test.bicep
index 545c90ea67..fdf11b38c7 100644
--- a/modules/synapse/workspace/.test/managedvnet/main.test.bicep
+++ b/modules/synapse/workspace/.test/managedvnet/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/synapse/workspace/.test/min/main.test.bicep b/modules/synapse/workspace/.test/min/main.test.bicep
index 9354fa703e..66e9c02a88 100644
--- a/modules/synapse/workspace/.test/min/main.test.bicep
+++ b/modules/synapse/workspace/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.synapse.workspaces-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-synapse.workspaces-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/virtual-machine-images/image-template/.test/common/main.test.bicep b/modules/virtual-machine-images/image-template/.test/common/main.test.bicep
index 3844885f12..d3f2bab602 100644
--- a/modules/virtual-machine-images/image-template/.test/common/main.test.bicep
+++ b/modules/virtual-machine-images/image-template/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.virtualmachineimages.imagetemplates-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-virtualmachineimages.imagetemplates-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/virtual-machine-images/image-template/.test/min/main.test.bicep b/modules/virtual-machine-images/image-template/.test/min/main.test.bicep
index 491e1f25c6..ed5cb3f858 100644
--- a/modules/virtual-machine-images/image-template/.test/min/main.test.bicep
+++ b/modules/virtual-machine-images/image-template/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.virtualmachineimages.imagetemplates-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-virtualmachineimages.imagetemplates-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/connection/.test/common/main.test.bicep b/modules/web/connection/.test/common/main.test.bicep
index 73975fe689..28a802c0df 100644
--- a/modules/web/connection/.test/common/main.test.bicep
+++ b/modules/web/connection/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.connections-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.connections-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/hosting-environment/.test/asev2/main.test.bicep b/modules/web/hosting-environment/.test/asev2/main.test.bicep
index 144e9687c2..a19d8a4384 100644
--- a/modules/web/hosting-environment/.test/asev2/main.test.bicep
+++ b/modules/web/hosting-environment/.test/asev2/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.hostingenvironments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.hostingenvironments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/hosting-environment/.test/asev3/main.test.bicep b/modules/web/hosting-environment/.test/asev3/main.test.bicep
index 230dc541a7..e2a1a47b59 100644
--- a/modules/web/hosting-environment/.test/asev3/main.test.bicep
+++ b/modules/web/hosting-environment/.test/asev3/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.hostingenvironments-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.hostingenvironments-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/serverfarm/.test/common/main.test.bicep b/modules/web/serverfarm/.test/common/main.test.bicep
index e01036dec7..e9f7a02483 100644
--- a/modules/web/serverfarm/.test/common/main.test.bicep
+++ b/modules/web/serverfarm/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.serverfarms-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.serverfarms-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/site/.test/functionAppCommon/main.test.bicep b/modules/web/site/.test/functionAppCommon/main.test.bicep
index 9bebb6ca35..56ecd15412 100644
--- a/modules/web/site/.test/functionAppCommon/main.test.bicep
+++ b/modules/web/site/.test/functionAppCommon/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.sites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.sites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/site/.test/functionAppMin/main.test.bicep b/modules/web/site/.test/functionAppMin/main.test.bicep
index 9890f4842f..9fe64f0fdc 100644
--- a/modules/web/site/.test/functionAppMin/main.test.bicep
+++ b/modules/web/site/.test/functionAppMin/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.sites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.sites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/site/.test/webAppCommon/main.test.bicep b/modules/web/site/.test/webAppCommon/main.test.bicep
index 93369c3ed2..5ab87a1473 100644
--- a/modules/web/site/.test/webAppCommon/main.test.bicep
+++ b/modules/web/site/.test/webAppCommon/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.sites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.sites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/site/.test/webAppMin/main.test.bicep b/modules/web/site/.test/webAppMin/main.test.bicep
index b056ec67eb..1446d9d389 100644
--- a/modules/web/site/.test/webAppMin/main.test.bicep
+++ b/modules/web/site/.test/webAppMin/main.test.bicep
@@ -6,7 +6,7 @@ targetScope = 'subscription'
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.sites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.sites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/static-site/.test/common/main.test.bicep b/modules/web/static-site/.test/common/main.test.bicep
index 7b07cd7f76..356108e612 100644
--- a/modules/web/static-site/.test/common/main.test.bicep
+++ b/modules/web/static-site/.test/common/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with most of its featur
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.staticsites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location
diff --git a/modules/web/static-site/.test/min/main.test.bicep b/modules/web/static-site/.test/min/main.test.bicep
index 393f828b3a..9f31a0d7a0 100644
--- a/modules/web/static-site/.test/min/main.test.bicep
+++ b/modules/web/static-site/.test/min/main.test.bicep
@@ -9,7 +9,7 @@ metadata description = 'This instance deploys the module with the minimum set of
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
-param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg'
+param resourceGroupName string = 'dep-${namePrefix}-web.staticsites-${serviceShort}-rg'
@description('Optional. The location to deploy resources to.')
param location string = deployment().location